- small fixes after manual merge

37958ce7 · Bas de Nooijer · 9a5bc481 · 37958ce7
Commit 37958ce7 authored Nov 04, 2011 by Bas de Nooijer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

library/Solarium/Client/Request.php library/Solarium/Client/Request.php +2 -4

No files found.
--- a/library/Solarium/Client/Request.php
+++ b/library/Solarium/Client/Request.php
@@ -363,9 +363,7 @@ class Solarium_Client_Request extends Solarium_Configurable
     */
    public function getUri()
    {
-        $queryString = $this->getQueryString();
-
-        return $this->getHandler() . '?' . $queryString;
+        return $this->getHandler() . '?' . $this->getQueryString();
    }

    /**
@@ -385,6 +383,6 @@ class Solarium_Client_Request extends Solarium_Configurable
            );
        }

-        return $this->getHandler() . '?' . $queryString;
+        return $queryString;
    }
 }
\ No newline at end of file