diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-27 14:02:05 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-27 14:02:05 +0200 |
| commit | 153ce2f9ab93f983fa9013c521f9b2a39a4adafb (patch) | |
| tree | 5c4c1b28f32b9abe04b7115f8cb704287e31d7a7 /lib/base.php | |
| parent | 4e53db3d9c2dfca6baf2e9878d14c38656b37bca (diff) | |
| parent | 12f7cb87679453fa96c796df857b7e7193d4ee09 (diff) | |
| download | nextcloud-server-153ce2f9ab93f983fa9013c521f9b2a39a4adafb.tar.gz nextcloud-server-153ce2f9ab93f983fa9013c521f9b2a39a4adafb.zip | |
Merge branch 'master' into calendar_import
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php index b4da6434e25..c2b0bbef780 100644 --- a/lib/base.php +++ b/lib/base.php @@ -170,8 +170,10 @@ class OC{ public static function checkInstalled() { // Redirect to installer if not installed if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') { - $url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php'; - header("Location: $url"); + if(!OC::$CLI){ + $url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php'; + header("Location: $url"); + } exit(); } } @@ -180,7 +182,7 @@ class OC{ // redirect to https site if configured if( OC_Config::getValue( "forcessl", false )){ ini_set("session.cookie_secure", "on"); - if(OC_Helper::serverProtocol()<>'https') { + if(OC_Helper::serverProtocol()<>'https' and !OC::$CLI) { $url = "https://". OC_Helper::serverHost() . $_SERVER['REQUEST_URI']; header("Location: $url"); exit(); @@ -208,9 +210,9 @@ class OC{ OC_Config::setValue('version',implode('.',OC_Util::getVersion())); OC_App::checkAppsRequirements(); + // load all apps to also upgrade enabled apps + OC_App::loadApps(); } - - OC_App::updateApps(); } } |