summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-17 13:10:15 +0100
committerLukas Reschke <lukas@owncloud.com>2014-11-17 13:39:13 +0100
commit8595b76df2fa5c0e536dd37456943162a154d4da (patch)
tree089939e57eb3175db4bc46f959afd7d9eaddc1b6 /lib/base.php
parent9df50c7be6ee47620af83c52ac340ac00d92042c (diff)
downloadnextcloud-server-8595b76df2fa5c0e536dd37456943162a154d4da.tar.gz
nextcloud-server-8595b76df2fa5c0e536dd37456943162a154d4da.zip
Remove phpass and migrate to new Hasher interface
This PR removes phpass and migrates to the new Hasher interface. Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt. Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php
index d365a4a306f..d7e4c379dbd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -464,8 +464,7 @@ class OC {
// setup 3rdparty autoloader
$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
if (file_exists($vendorAutoLoad)) {
- $loader = require_once $vendorAutoLoad;
- $loader->add('PasswordHash', OC::$THIRDPARTYROOT . '/3rdparty/phpass');
+ require_once $vendorAutoLoad;
} else {
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');