Commit 37958ce7 authored by Bas de Nooijer's avatar Bas de Nooijer

- small fixes after manual merge

parent 9a5bc481
...@@ -363,9 +363,7 @@ class Solarium_Client_Request extends Solarium_Configurable ...@@ -363,9 +363,7 @@ class Solarium_Client_Request extends Solarium_Configurable
*/ */
public function getUri() public function getUri()
{ {
$queryString = $this->getQueryString(); return $this->getHandler() . '?' . $this->getQueryString();
return $this->getHandler() . '?' . $queryString;
} }
/** /**
...@@ -385,6 +383,6 @@ class Solarium_Client_Request extends Solarium_Configurable ...@@ -385,6 +383,6 @@ class Solarium_Client_Request extends Solarium_Configurable
); );
} }
return $this->getHandler() . '?' . $queryString; return $queryString;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment