corrected idPrefix check logic in getRoutesByNames()

lsmith77 · lsmith77 · commit deff18e4d51a · 2013-10-08T10:09:33.000+02:00
diff --git a/Doctrine/Phpcr/RouteProvider.php b/Doctrine/Phpcr/RouteProvider.php
@@ -143,13 +143,13 @@ public function getRoutesByNames($names, $parameters = array())
     {
         $routes = array();
         if ('' === $this->idPrefix) {
+            $routes = $names;
+        } else {
             foreach ($names as $name) {
-                if ('' === $this->idPrefix || 0 === strpos($name, $this->idPrefix)) {
+                if (0 === strpos($name, $this->idPrefix)) {
                     $routes[] = $name;
                 }
             }
-        } else {
-            $routes = $names;
         }
 
         $collection = $this->getObjectManager()->findMany($this->className, $routes);

Original file line number	Diff line number	Diff line change
`@@ -143,13 +143,13 @@ public function getRoutesByNames($names, $parameters = array())`
`143`	`143`	`{`
`144`	`144`	`$routes = array();`
`145`	`145`	`if ('' === $this->idPrefix) {`
	`146`	`+ $routes = $names;`
	`147`	`+ } else {`
`146`	`148`	`foreach ($names as $name) {`
`147`		`- if ('' === $this->idPrefix \|\| 0 === strpos($name, $this->idPrefix)) {`
	`149`	`+ if (0 === strpos($name, $this->idPrefix)) {`
`148`	`150`	`$routes[] = $name;`
`149`	`151`	`}`
`150`	`152`	`}`
`151`		`- } else {`
`152`		`- $routes = $names;`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`$collection = $this->getObjectManager()->findMany($this->className, $routes);`