diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-28 10:33:55 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-28 10:33:55 +0100 |
| commit | 5fa8f7cf128d819a195c540851faf265a481df64 (patch) | |
| tree | b5eec89d7f7508025c0abbf585d1c982f1defd2d /settings | |
| parent | e3b951f4122f0a5d8531faaf4082bfb356366847 (diff) | |
| parent | 8b86b94d47d7fa78669bdc4f17e4b1fa39079787 (diff) | |
| download | nextcloud-server-5fa8f7cf128d819a195c540851faf265a481df64.tar.gz nextcloud-server-5fa8f7cf128d819a195c540851faf265a481df64.zip | |
Merge pull request #7107 from owncloud/load-apps-proper-master
Load apps proper master
Diffstat (limited to 'settings')
| -rwxr-xr-x | settings/admin.php | 1 | ||||
| -rw-r--r-- | settings/apps.php | 1 | ||||
| -rw-r--r-- | settings/changepassword/controller.php | 6 | ||||
| -rw-r--r-- | settings/help.php | 1 | ||||
| -rw-r--r-- | settings/personal.php | 1 | ||||
| -rw-r--r-- | settings/settings.php | 1 | ||||
| -rw-r--r-- | settings/users.php | 1 |
7 files changed, 0 insertions, 12 deletions
diff --git a/settings/admin.php b/settings/admin.php index 23b3a2d5a0e..ea8aa7af5d0 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -6,7 +6,6 @@ */ OC_Util::checkAdminUser(); -OC_App::loadApps(); OC_Util::addStyle( "settings", "settings" ); OC_Util::addScript( "settings", "admin" ); diff --git a/settings/apps.php b/settings/apps.php index 96b6d21b502..6fd2efc2018 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -22,7 +22,6 @@ */ OC_Util::checkAdminUser(); -OC_App::loadApps(); // Load the files we need OC_Util::addStyle( "settings", "settings" ); diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php index e8c2a1943f3..9f1e7329964 100644 --- a/settings/changepassword/controller.php +++ b/settings/changepassword/controller.php @@ -8,9 +8,6 @@ class Controller { \OC_JSON::callCheck(); \OC_JSON::checkLoggedIn(); - // Manually load apps to ensure hooks work correctly (workaround for issue 1503) - \OC_App::loadApps(); - $username = \OC_User::getUser(); $password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null; $oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : ''; @@ -32,9 +29,6 @@ class Controller { \OC_JSON::callCheck(); \OC_JSON::checkLoggedIn(); - // Manually load apps to ensure hooks work correctly (workaround for issue 1503) - \OC_App::loadApps(); - if (isset($_POST['username'])) { $username = $_POST['username']; } else { diff --git a/settings/help.php b/settings/help.php index 88693939b84..301f50592ae 100644 --- a/settings/help.php +++ b/settings/help.php @@ -6,7 +6,6 @@ */ OC_Util::checkLoggedIn(); -OC_App::loadApps(); // Load the files we need OC_Util::addStyle( "settings", "settings" ); diff --git a/settings/personal.php b/settings/personal.php index cf1a496bdf0..be1aa6400bf 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -6,7 +6,6 @@ */ OC_Util::checkLoggedIn(); -OC_App::loadApps(); $defaults = new OC_Defaults(); // initialize themable default strings and urls diff --git a/settings/settings.php b/settings/settings.php index 1e05452ec4d..c08732fcf66 100644 --- a/settings/settings.php +++ b/settings/settings.php @@ -6,7 +6,6 @@ */ OC_Util::checkLoggedIn(); -OC_App::loadApps(); OC_Util::addStyle( 'settings', 'settings' ); OC_App::setActiveNavigationEntry( 'settings' ); diff --git a/settings/users.php b/settings/users.php index 2f1c63a0b59..f09d0e90d3c 100644 --- a/settings/users.php +++ b/settings/users.php @@ -6,7 +6,6 @@ */ OC_Util::checkSubAdminUser(); -OC_App::loadApps(); // We have some javascript foo! OC_Util::addScript( 'settings', 'users' ); |