killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()
This commit is contained in:
parent
96e6cb3db4
commit
f9279ac77a
|
@ -58,7 +58,6 @@ class Scan extends Command {
|
||||||
|
|
||||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||||
if ($input->getOption('all')) {
|
if ($input->getOption('all')) {
|
||||||
\OC_App::loadApps('authentication');
|
|
||||||
$users = $this->userManager->search('');
|
$users = $this->userManager->search('');
|
||||||
} else {
|
} else {
|
||||||
$users = $input->getArgument('user_id');
|
$users = $input->getArgument('user_id');
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
|
|
||||||
OC_JSON::checkLoggedIn();
|
OC_JSON::checkLoggedIn();
|
||||||
OCP\JSON::callCheck();
|
OCP\JSON::callCheck();
|
||||||
OC_App::loadApps();
|
|
||||||
|
|
||||||
$defaults = new \OCP\Defaults();
|
$defaults = new \OCP\Defaults();
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
// Check if we are a user
|
// Check if we are a user
|
||||||
OC_JSON::checkLoggedIn();
|
OC_JSON::checkLoggedIn();
|
||||||
OC_App::loadApps();
|
|
||||||
|
|
||||||
$query=(isset($_GET['query']))?$_GET['query']:'';
|
$query=(isset($_GET['query']))?$_GET['query']:'';
|
||||||
if($query) {
|
if($query) {
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
OC_Util::checkAdminUser();
|
OC_Util::checkAdminUser();
|
||||||
OC_App::loadApps();
|
|
||||||
|
|
||||||
OC_Util::addStyle( "settings", "settings" );
|
OC_Util::addStyle( "settings", "settings" );
|
||||||
OC_Util::addScript( "settings", "admin" );
|
OC_Util::addScript( "settings", "admin" );
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
OC_Util::checkAdminUser();
|
OC_Util::checkAdminUser();
|
||||||
OC_App::loadApps();
|
|
||||||
|
|
||||||
// Load the files we need
|
// Load the files we need
|
||||||
OC_Util::addStyle( "settings", "settings" );
|
OC_Util::addStyle( "settings", "settings" );
|
||||||
|
|
|
@ -8,9 +8,6 @@ class Controller {
|
||||||
\OC_JSON::callCheck();
|
\OC_JSON::callCheck();
|
||||||
\OC_JSON::checkLoggedIn();
|
\OC_JSON::checkLoggedIn();
|
||||||
|
|
||||||
// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
|
|
||||||
\OC_App::loadApps();
|
|
||||||
|
|
||||||
$username = \OC_User::getUser();
|
$username = \OC_User::getUser();
|
||||||
$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
|
$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
|
||||||
$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
|
$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
|
||||||
|
@ -32,9 +29,6 @@ class Controller {
|
||||||
\OC_JSON::callCheck();
|
\OC_JSON::callCheck();
|
||||||
\OC_JSON::checkLoggedIn();
|
\OC_JSON::checkLoggedIn();
|
||||||
|
|
||||||
// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
|
|
||||||
\OC_App::loadApps();
|
|
||||||
|
|
||||||
if (isset($_POST['username'])) {
|
if (isset($_POST['username'])) {
|
||||||
$username = $_POST['username'];
|
$username = $_POST['username'];
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
OC_Util::checkLoggedIn();
|
OC_Util::checkLoggedIn();
|
||||||
OC_App::loadApps();
|
|
||||||
|
|
||||||
// Load the files we need
|
// Load the files we need
|
||||||
OC_Util::addStyle( "settings", "settings" );
|
OC_Util::addStyle( "settings", "settings" );
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
OC_Util::checkLoggedIn();
|
OC_Util::checkLoggedIn();
|
||||||
OC_App::loadApps();
|
|
||||||
|
|
||||||
$defaults = new OC_Defaults(); // initialize themable default strings and urls
|
$defaults = new OC_Defaults(); // initialize themable default strings and urls
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
OC_Util::checkLoggedIn();
|
OC_Util::checkLoggedIn();
|
||||||
OC_App::loadApps();
|
|
||||||
|
|
||||||
OC_Util::addStyle( 'settings', 'settings' );
|
OC_Util::addStyle( 'settings', 'settings' );
|
||||||
OC_App::setActiveNavigationEntry( 'settings' );
|
OC_App::setActiveNavigationEntry( 'settings' );
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
OC_Util::checkSubAdminUser();
|
OC_Util::checkSubAdminUser();
|
||||||
OC_App::loadApps();
|
|
||||||
|
|
||||||
// We have some javascript foo!
|
// We have some javascript foo!
|
||||||
OC_Util::addScript( 'settings', 'users' );
|
OC_Util::addScript( 'settings', 'users' );
|
||||||
|
|
Loading…
Reference in New Issue