Commit 5c684c1acbf5def8233d905410e315aa2bddd5ab

Authored by nbm
1 parent 7965b2d3

Use KTUtil::addQueryString if given a URL and a query string.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4443 c91229c3-7414-0410-bfa2-8a42b809f60b
lib/templating/kt3template.inc.php
@@ -252,7 +252,12 @@ class KTPage { @@ -252,7 +252,12 @@ class KTPage {
252 if ($aActionTuple["action"]) { 252 if ($aActionTuple["action"]) {
253 $aTuple["url"] = generateControllerLink($aActionTuple["action"], $aActionTuple["query"]); 253 $aTuple["url"] = generateControllerLink($aActionTuple["action"], $aActionTuple["query"]);
254 } else if ($aActionTuple["url"]) { 254 } else if ($aActionTuple["url"]) {
255 - $aTuple["url"] = $aActionTuple["url"]; 255 + $sUrl = $aActionTuple["url"];
  256 + $sQuery = KTUtil::arrayGet($aActionTuple, 'query');
  257 + if ($sQuery) {
  258 + $sUrl = KTUtil::addQueryString($sUrl, $sQuery);
  259 + }
  260 + $aTuple["url"] = $sUrl;
256 } else { 261 } else {
257 $aTuple["url"] = false; 262 $aTuple["url"] = false;
258 } 263 }