Merge pull request #8138 from owncloud/allow-app-in-routes.php
To isolate the variable scope used inside the $file it is required in it...
This commit is contained in:
commit
ecd74d3630
|
@ -117,7 +117,7 @@ class Router implements IRouter {
|
||||||
if (!isset($this->loadedApps[$app])) {
|
if (!isset($this->loadedApps[$app])) {
|
||||||
$this->loadedApps[$app] = true;
|
$this->loadedApps[$app] = true;
|
||||||
$this->useCollection($app);
|
$this->useCollection($app);
|
||||||
require_once $file;
|
$this->requireRouteFile($file);
|
||||||
$collection = $this->getCollection($app);
|
$collection = $this->getCollection($app);
|
||||||
$collection->addPrefix('/apps/' . $app);
|
$collection->addPrefix('/apps/' . $app);
|
||||||
$this->root->addCollection($collection);
|
$this->root->addCollection($collection);
|
||||||
|
@ -230,4 +230,12 @@ class Router implements IRouter {
|
||||||
return $this->getGenerator()->generate($name, $parameters, $absolute);
|
return $this->getGenerator()->generate($name, $parameters, $absolute);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To isolate the variable scope used inside the $file it is required in it's own method
|
||||||
|
* @param $file
|
||||||
|
*/
|
||||||
|
private function requireRouteFile($file) {
|
||||||
|
require_once $file;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue