diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-13 17:30:10 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-13 17:30:10 +0200 |
| commit | e383a9506df196e9421d3494b9f84ae28deea55d (patch) | |
| tree | 6b16c8d47edafeb484ee20a60c4e6b58bbe7e861 /lib | |
| parent | 88da2966b49e378fa458e5da6dfa6feedd415b21 (diff) | |
| parent | d022b6fad49204dc2839233f0fded409e54ee003 (diff) | |
| download | nextcloud-server-e383a9506df196e9421d3494b9f84ae28deea55d.tar.gz nextcloud-server-e383a9506df196e9421d3494b9f84ae28deea55d.zip | |
Merge pull request #24617 from owncloud/autoloader_no_private
our autoloader should not load classes in \OC
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/autoloader.php | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/autoloader.php b/lib/autoloader.php index 6a427848235..9cc573c0997 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -102,24 +102,6 @@ class Autoloader { } } elseif (strpos($class, 'OC_') === 0) { $paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php'); - $paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php'); - } elseif (strpos($class, 'OC\\') === 0) { - $split = explode('\\', $class, 3); - - if (count($split) === 3) { - $split[1] = strtolower($split[1]); - - if ($split[1] === 'core') { - // Covered by PSR-4 autoloader - } else if ($split[1] === 'settings') { - // Covered by PSR-4 autoloader - } else { - $paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php'; - } - - } else { - $paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('\\', '/', $split[1])) . '.php'; - } } elseif (strpos($class, 'OCP\\') === 0) { $paths[] = \OC::$SERVERROOT . '/lib/public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php'); } elseif (strpos($class, 'OCA\\') === 0) { |