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

Fix loading hooks when going though the routing system

diff --cc lib/app.php
Simple merge

diff --cc lib/base.php
Simple merge

diff --cc settings/ajax/navigationdetect.php
index 607c0e873f9dcff5acc2de16781850b42049cf98,d21f774126cd8a4b5b83b9d304946e377067339a..7f961eb9bc52d73ca8631b48aa6b597d6945be0b
--- 1/settings/ajax/navigationdetect.php
--- 2/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@@ -4,12 -4,8 +4,9 @@@ OC_Util::checkAdminUser()
  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) {