Peter M. Groen / knowledgetree

Commit 45ae8326484a2657427a0395661b487171725d0f

Authored by nbm
1 parent c4cf5bf9

Use KTUtil::addQueryString to create URLs 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4761 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 3 additions and 9 deletions
plugins/ktcore/KTDocumentActions.php
  View file @45ae832
@@ -394,13 +394,7 @@ class KTDocumentMoveColumn extends TitleColumn { @@ -394,13 +394,7 @@ class KTDocumentMoveColumn extends TitleColumn {
394 parent::TitleColumn($sLabel, $sName); 394 parent::TitleColumn($sLabel, $sName);
395 } 395 }
396 function buildFolderLink($aDataRow) { 396 function buildFolderLink($aDataRow) {
397 - $baseurl = KTUtil::arrayGet($this->aOptions, "folderurl", "");  
398 - $kt_path_info = KTUtil::arrayGet($_REQUEST, 'kt_path_info');  
399 - if (empty($kt_path_info)) {  
400 - return sprintf('%s?fDocumentId=%d&fFolderId=%d', $baseurl, $this->oDocument->getId(), $aDataRow["folder"]->getId());  
401 - } else {  
402 - return sprintf('%s?kt_path_info=%s&fDocumentId=%d&fFolderId=%d', $baseurl, $kt_path_info, $this->oDocument->getId(), $aDataRow["folder"]->getId());  
403 - } 397 + return KTUtil::addQueryString($_SERVER['PHP_SELF'], sprintf('fDocumentId=%d&fFolderId=%d', $this->oDocument->getId(), $aDataRow["folder"]->getId()));
404 } 398 }
405 } 399 }
406 400
@@ -451,7 +445,7 @@ class KTDocumentMoveAction extends KTDocumentAction { @@ -451,7 +445,7 @@ class KTDocumentMoveAction extends KTDocumentAction {
451 $batchPage = (int) KTUtil::arrayGet($_REQUEST, "page", 0); 445 $batchPage = (int) KTUtil::arrayGet($_REQUEST, "page", 0);
452 $batchSize = 20; 446 $batchSize = 20;
453 447
454 - $resultURL = sprintf("?fDocumentId=%d&fFolderId=%d", $this->oDocument->getId(), $this->oFolder->getId()); 448 + $resultURL = KTUtil::addQueryString($_SERVER['PHP_SELF'], sprintf("fDocumentId=%d&fFolderId=%d", $this->oDocument->getId(), $this->oFolder->getId()));
455 $collection->setBatching($resultURL, $batchPage, $batchSize); 449 $collection->setBatching($resultURL, $batchPage, $batchSize);
456 450
457 // ordering. (direction and column) 451 // ordering. (direction and column)
@@ -473,7 +467,7 @@ class KTDocumentMoveAction extends KTDocumentAction { @@ -473,7 +467,7 @@ class KTDocumentMoveAction extends KTDocumentAction {
473 467
474 foreach (range(0, count($folder_path_ids) - 1) as $index) { 468 foreach (range(0, count($folder_path_ids) - 1) as $index) {
475 $id = $folder_path_ids[$index]; 469 $id = $folder_path_ids[$index];
476 - $url = sprintf("?fDocumentId=%d&fFolderId=%d", $this->oDocument->getId(), $id); 470 + $url = KTUtil::addQueryString($_SERVER['PHP_SELF'], sprintf("fDocumentId=%d&fFolderId=%d", $this->oDocument->getId(), $id));
477 $aBreadcrumbs[] = array("url" => $url, "name" => $folder_path_names[$index]); 471 $aBreadcrumbs[] = array("url" => $url, "name" => $folder_path_names[$index]);
478 } 472 }
479 473