From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sat, 9 Feb 2013 17:59:41 +0000 (-0800)
Subject: Merge pull request #1546 from owncloud/fix-loading-hooks
X-Git-Tag: v5.0.0alpha1~47
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0222c589ac7c006c09dca6cea09cae9a1006a0b4;p=nextcloud-server.git

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

Fix loading hooks when going though the routing system
---

0222c589ac7c006c09dca6cea09cae9a1006a0b4
diff --cc settings/ajax/navigationdetect.php
index 607c0e873f9,d21f774126c..7f961eb9bc5
--- a/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) {