diff options
| author | Clark Tomlinson <fallen013@gmail.com> | 2014-08-11 10:44:47 -0400 |
|---|---|---|
| committer | Clark Tomlinson <fallen013@gmail.com> | 2014-08-11 10:44:47 -0400 |
| commit | 7bc313a0cdca9251acaa626fd7d87488bf7ffda7 (patch) | |
| tree | 5b88b0308265e012b78b5ff400c75a810b9d9da9 | |
| parent | 13d44f8f7f09b3fa641f2ea8e835d0be9bd00c49 (diff) | |
| parent | f2e20757f6198bc49e139c62acdb965a11767093 (diff) | |
| download | nextcloud-server-7bc313a0cdca9251acaa626fd7d87488bf7ffda7.tar.gz nextcloud-server-7bc313a0cdca9251acaa626fd7d87488bf7ffda7.zip | |
Merge pull request #10066 from marc0s/issues/10065-fix-null-check
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
| -rw-r--r-- | lib/base.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index a6f6f6f71d7..cba5d4a4276 100644 --- a/lib/base.php +++ b/lib/base.php @@ -135,7 +135,7 @@ class OC { OC::$THIRDPARTYROOT = OC_Config::getValue('3rdpartyroot', null); OC::$THIRDPARTYWEBROOT = OC_Config::getValue('3rdpartyurl', null); - if (is_null(OC::$THIRDPARTYROOT) && is_null(OC::$THIRDPARTYWEBROOT)) { + if (empty(OC::$THIRDPARTYROOT) && empty(OC::$THIRDPARTYWEBROOT)) { if (file_exists(OC::$SERVERROOT . '/3rdparty')) { OC::$THIRDPARTYROOT = OC::$SERVERROOT; OC::$THIRDPARTYWEBROOT = OC::$WEBROOT; @@ -144,7 +144,7 @@ class OC { OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/'); } } - if (is_null(OC::$THIRDPARTYROOT) || !file_exists(OC::$THIRDPARTYROOT)) { + if (empty(OC::$THIRDPARTYROOT) || !file_exists(OC::$THIRDPARTYROOT)) { echo('3rdparty directory not found! Please put the ownCloud 3rdparty' . ' folder in the ownCloud folder or the folder above.' . ' You can also configure the location in the config.php file.'); |