Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

Conflicts: lib/jabber.php
2009-03-28 13:52:01 +00:00
parent 420c361304 8c073a34ce
commit 4b3f022fc2
66 changed files with 7517 additions and 6605 deletions
--- a/extlib/Net/URL/Mapper/Path.php
+++ b/extlib/Net/URL/Mapper/Path.php
@@ -241,7 +241,12 @@ class Net_URL_Mapper_Path
        }
        $path = '/'.trim(Net_URL::resolvePath($path), '/');
        if (!empty($qstring)) {
-            $path .= '?'.http_build_query($qstring);
+            if (!strpos($path, '?')) {
+                $path .= '?';
+            } else {
+                $path .= '&';
+            }
+	    $path .= http_build_query($qstring);
        }
        if (!empty($anchor)) {
            $path .= '#'.ltrim($anchor, '#');
@@ -427,4 +432,4 @@ class Net_URL_Mapper_Path

 }

-?>
+?>