From aac4d1b7c480e75b68e22e133f8a75f80b4f3549 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 2 Sep 2010 12:26:10 -0600
Subject: [PATCH] Add query string to URL, if it exists

---
 framework/Core/lib/Horde.php                 | 4 ++++
 framework/Core/lib/Horde/Core/Ajax/Imple.php | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index ee7a6db62..b5d02d337 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -961,6 +961,10 @@ HTML;
             $url .= '/' . ltrim($webroot, '/') . '/' . $puri['path'];
         }
 
+        if (isset($puri['query'])) {
+            $url .= '?' . $puri['query'];
+        }
+
         $ob = new Horde_Url($url, $full);
 
         if (empty($GLOBALS['conf']['session']['use_only_cookies']) &&
diff --git a/framework/Core/lib/Horde/Core/Ajax/Imple.php b/framework/Core/lib/Horde/Core/Ajax/Imple.php
index 360ffd556..6048f7686 100644
--- a/framework/Core/lib/Horde/Core/Ajax/Imple.php
+++ b/framework/Core/lib/Horde/Core/Ajax/Imple.php
@@ -66,8 +66,7 @@ abstract class Horde_Core_Ajax_Imple
             $qstring .= '/' . $key . '=' . rawurlencode($val);
         }
 
-        $url = Horde::getServiceLink('imple');
-        return Horde::url($url->url . '?' . $qstring, $full)->setRaw(true);
+        return Horde::url(Horde::getServiceLink('imple')->url . '?' . $qstring, $full)->setRaw(true);
     }
 
     /**
-- 
2.11.0