diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-11 11:24:11 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-11 11:24:11 +0100 |
| commit | 94cf9e56b6c723c0dcc3c46cf66d6aaf3eaeecf3 (patch) | |
| tree | 7aba368bc46adc30ced9b02406cd0dd6333d2bbb | |
| parent | 939cd43b5812909c8e5de3538988758063d07330 (diff) | |
| parent | 1a592e574593e79df1e0ed6b418cd880c4a5f7ee (diff) | |
| download | nextcloud-server-94cf9e56b6c723c0dcc3c46cf66d6aaf3eaeecf3.tar.gz nextcloud-server-94cf9e56b6c723c0dcc3c46cf66d6aaf3eaeecf3.zip | |
Merge pull request #21593 from owncloud/strict_autoloader
Stricter autoloader
| -rw-r--r-- | lib/base.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 51f4d819ab1..80b1a2bafcd 100644 --- a/lib/base.php +++ b/lib/base.php @@ -488,9 +488,10 @@ class OC { OC::$SERVERROOT . '/settings', OC::$SERVERROOT . '/ocs', OC::$SERVERROOT . '/ocs-provider', - OC::$SERVERROOT . '/3rdparty', - OC::$SERVERROOT . '/tests', ]); + if (defined('PHPUNIT_RUN')) { + self::$loader->addValidRoot(OC::$SERVERROOT . '/tests'); + } spl_autoload_register(array(self::$loader, 'load')); $loaderEnd = microtime(true); |