diff options
| author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2014-05-02 22:43:19 +0200 |
|---|---|---|
| committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2014-05-02 22:43:19 +0200 |
| commit | 906061a07b64c1a56b51e3883883ac202630148f (patch) | |
| tree | 973de83daf6eebcbe3058e71eb0fff77f7a19755 /lib | |
| parent | 9e18be642239a77014ff16598a50cd413b70af46 (diff) | |
| parent | 6935364b33b0fb8206a83b67aa9a8e6eb874a541 (diff) | |
| download | nextcloud-server-906061a07b64c1a56b51e3883883ac202630148f.tar.gz nextcloud-server-906061a07b64c1a56b51e3883883ac202630148f.zip | |
Merge pull request #8171 from owncloud/fix-import
be nice and use a relative import so people can use the class without fi...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 1 | ||||
| -rw-r--r-- | lib/private/appframework/utility/simplecontainer.php | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 38cd272a89f..1f7d0c0da65 100644 --- a/lib/base.php +++ b/lib/base.php @@ -436,6 +436,7 @@ class OC { self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing'); self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console'); self::$loader->registerPrefix('Patchwork', '3rdparty'); + self::$loader->registerPrefix('Pimple', '3rdparty/Pimple'); spl_autoload_register(array(self::$loader, 'load')); // set some stuff diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php index d08a4879e34..1ad06b9ab23 100644 --- a/lib/private/appframework/utility/simplecontainer.php +++ b/lib/private/appframework/utility/simplecontainer.php @@ -2,9 +2,6 @@ namespace OC\AppFramework\Utility; -// register 3rdparty autoloaders -require_once 'Pimple/Pimple.php'; - /** * Class SimpleContainer * |