merged branch DHorchler/2.1 (PR #7193)

fabpot · fabpot · commit 8ae7d985690f · 2013-03-23T08:47:35.000+01:00
This PR was merged into the 2.1 branch. Discussion ---------- Routing issue with installation in a sub-directory ref: #7129 Commits ------- 8d9cd42 Routing issue with installation in a sub-directory ref: #7129
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -94,7 +94,7 @@ private function resolveParameters(RouteCollection $collection)
                 foreach ($route->getRequirements() as $name => $value) {
                      $route->setRequirement($name, $this->resolveString($value));
                 }
-
+                $collection->setPrefix('/'.ltrim($this->resolveString($collection->getPrefix()), '/'));
                 $route->setPattern($this->resolveString($route->getPattern()));
             }
         }
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
@@ -259,6 +259,16 @@ public function getPrefix()
         return $this->prefix;
     }
 
+    /**
+     * Sets the prefix (used to resolve placeholders).
+     *
+     * @param string The prefix
+     */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = $prefix;
+    }
+
     /**
      * Returns an array of resources loaded to build this collection.
      *

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private function resolveParameters(RouteCollection $collection)`
`94`	`94`	`foreach ($route->getRequirements() as $name => $value) {`
`95`	`95`	`$route->setRequirement($name, $this->resolveString($value));`
`96`	`96`	`}`
`97`		`-`
	`97`	`+ $collection->setPrefix('/'.ltrim($this->resolveString($collection->getPrefix()), '/'));`
`98`	`98`	`$route->setPattern($this->resolveString($route->getPattern()));`
`99`	`99`	`}`
`100`	`100`	`}`