aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-06 16:32:53 +0100
committerLukas Reschke <lukas@owncloud.com>2014-11-06 16:32:53 +0100
commit5b8a6b66b5fcfa9dbc25b403cb62a504019df644 (patch)
tree6b2730b3aaf1bad0430cdc332e9d11e1c2b35c17
parentc4d7483a0a7d1ea75bf06d0a4e726e2b150be81f (diff)
downloadnextcloud-server-5b8a6b66b5fcfa9dbc25b403cb62a504019df644.tar.gz
nextcloud-server-5b8a6b66b5fcfa9dbc25b403cb62a504019df644.zip
Load PHPAss via autoloader
-rw-r--r--lib/base.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index eecdd961852..3cbab52ed7c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -457,7 +457,8 @@ class OC {
// setup 3rdparty autoloader
$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
if (file_exists($vendorAutoLoad)) {
- require_once $vendorAutoLoad;
+ $loader = require_once $vendorAutoLoad;
+ $loader->add('PasswordHash', OC::$THIRDPARTYROOT . '/3rdparty/phpass');
} else {
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');