mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1546 from owncloud/fix-loading-hooks 

Fix loading hooks when going though the routing system
This commit is contained in:
Thomas Müller 2013-02-09 09:59:41 -08:00
parent e68cf72458 fba9739448
commit 0222c589ac
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/app.php
View File

@ -294,6 +294,23 @@ class OC_App{
return true;
}
/**
* @brief Get the navigation entries for the $app
* @param string $app app
* @return array of the $data added with addNavigationEntry
*/
public static function getAppNavigationEntries($app) {
if(is_file(self::getAppPath($app).'/appinfo/app.php')) {
$save = self::$navigation;
self::$navigation = array();
require $app.'/appinfo/app.php';
$app_entries = self::$navigation;
self::$navigation = $save;
return $app_entries;
}
return array();
}
/**
* @brief gets the active Menu entry
* @return string id or empty string

1
lib/base.php
View File

@ -557,6 +557,7 @@ class OC {
if (!self::$CLI) {
try {
OC_App::loadApps();
OC::getRouter()->match(OC_Request::getPathInfo());
return;
} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {

5
settings/ajax/navigationdetect.php
View File

@ -6,10 +6,7 @@ OCP\JSON::callCheck();
$app = $_GET['app'];
$app = OC_App::cleanAppId($app);
//load the one app and see what it adds to the navigation
OC_App::loadApp($app);
$navigation = OC_App::getNavigation();
$navigation = OC_App::getAppNavigationEntries($app);
$navIds = array();
foreach ($navigation as $nav) {