From 5c684c1acbf5def8233d905410e315aa2bddd5ab Mon Sep 17 00:00:00 2001
From: nbm <nbm@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Wed, 14 Dec 2005 13:30:07 +0000
Subject: [PATCH] Use KTUtil::addQueryString if given a URL and a query string.

---
 lib/templating/kt3template.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/templating/kt3template.inc.php b/lib/templating/kt3template.inc.php
index 50a6680..f75a036 100644
--- a/lib/templating/kt3template.inc.php
+++ b/lib/templating/kt3template.inc.php
@@ -252,7 +252,12 @@ class KTPage {
         if ($aActionTuple["action"]) {        
            $aTuple["url"] = generateControllerLink($aActionTuple["action"], $aActionTuple["query"]);
         } else if ($aActionTuple["url"]) {
-		   $aTuple["url"] = $aActionTuple["url"];
+           $sUrl = $aActionTuple["url"];
+           $sQuery = KTUtil::arrayGet($aActionTuple, 'query');
+           if ($sQuery) {
+               $sUrl = KTUtil::addQueryString($sUrl, $sQuery);
+           }
+		   $aTuple["url"] = $sUrl;
 		} else {
 		   $aTuple["url"] = false;
 		}
--
libgit2 0.21.4