diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2015-12-18 11:42:09 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2015-12-18 11:53:41 +0100 |
| commit | 6fb60815c581c333106e0fa4845eb25ad6a5223b (patch) | |
| tree | abeec0139d55a72b1aee6194e9ebe11f8689c584 /lib/base.php | |
| parent | 0a09004d39b5d27124d59ed45debf109170b24d2 (diff) | |
| download | nextcloud-server-6fb60815c581c333106e0fa4845eb25ad6a5223b.tar.gz nextcloud-server-6fb60815c581c333106e0fa4845eb25ad6a5223b.zip | |
Use SystemConfig internally
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/base.php b/lib/base.php index aee1698e222..c0db0454f6a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -115,7 +115,7 @@ class OC { /** * @var \OC\Config */ - public static $config = null; + private static $config = null; /** * @throws \RuntimeException when the 3rdparty directory is missing or @@ -157,7 +157,7 @@ class OC { if (OC::$CLI) { - OC::$WEBROOT = \OC::$config->getValue('overwritewebroot', ''); + OC::$WEBROOT = self::$config->getValue('overwritewebroot', ''); } else { if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) { OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI)); @@ -170,7 +170,7 @@ class OC { // This most likely means that we are calling from CLI. // However some cron jobs still need to generate // a web URL, so we use overwritewebroot as a fallback. - OC::$WEBROOT = \OC::$config->getValue('overwritewebroot', ''); + OC::$WEBROOT = self::$config->getValue('overwritewebroot', ''); } // Resolve /owncloud to /owncloud/ to ensure to always have a trailing @@ -183,8 +183,8 @@ class OC { } // search the 3rdparty folder - OC::$THIRDPARTYROOT = \OC::$config->getValue('3rdpartyroot', null); - OC::$THIRDPARTYWEBROOT = \OC::$config->getValue('3rdpartyurl', null); + OC::$THIRDPARTYROOT = self::$config->getValue('3rdpartyroot', null); + OC::$THIRDPARTYWEBROOT = self::$config->getValue('3rdpartyurl', null); if (empty(OC::$THIRDPARTYROOT) && empty(OC::$THIRDPARTYWEBROOT)) { if (file_exists(OC::$SERVERROOT . '/3rdparty')) { @@ -202,7 +202,7 @@ class OC { } // search the apps folder - $config_paths = \OC::$config->getValue('apps_paths', array()); + $config_paths = self::$config->getValue('apps_paths', array()); if (!empty($config_paths)) { foreach ($config_paths as $paths) { if (isset($paths['url']) && isset($paths['path'])) { |