diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 15:38:49 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 15:38:49 +0200 |
| commit | bf1057143cdff8ec289d9d766ab100d64d7ea45d (patch) | |
| tree | 6c35d0d99a72f27a981a07c93f0ecbf600764cd4 /lib/base.php | |
| parent | 3efe1d3b24e65ed76d521c24b0cfe4e0ff2e7af5 (diff) | |
| parent | 5144d26088b98685a37c73c776a9a47203efa68a (diff) | |
| download | nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.tar.gz nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.zip | |
Merge branch 'master' into routing
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php index 6af558ae9da..fa777cb9343 100644 --- a/lib/base.php +++ b/lib/base.php @@ -79,7 +79,7 @@ class OC{ /** @TODO: Remove this when necessary Remove "apps/" from inclusion path for smooth migration to mutli app dir */ - $path = preg_replace('/apps\//', '', OC::$CLASSPATH[$className]); + $path = str_replace('apps/', '', OC::$CLASSPATH[$className]); require_once $path; } elseif(strpos($className, 'OC_')===0) { @@ -226,8 +226,10 @@ class OC{ $tmpl->printPage(); exit; } - OC_Minimizer::clearCache(); - + $minimizerCSS = new OC_Minimizer_CSS(); + $minimizerCSS->clearCache(); + $minimizerJS = new OC_Minimizer_JS(); + $minimizerJS->clearCache(); OC_Config::setValue('version', implode('.', OC_Util::getVersion())); OC_App::checkAppsRequirements(); // load all apps to also upgrade enabled apps @@ -317,14 +319,14 @@ class OC{ //set http auth headers for apache+php-cgi work around if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) { - list($name, $password) = explode(':', base64_decode($matches[1])); + list($name, $password) = explode(':', base64_decode($matches[1]), 2); $_SERVER['PHP_AUTH_USER'] = strip_tags($name); $_SERVER['PHP_AUTH_PW'] = strip_tags($password); } //set http auth headers for apache+php-cgi work around if variable gets renamed by apache if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) { - list($name, $password) = explode(':', base64_decode($matches[1])); + list($name, $password) = explode(':', base64_decode($matches[1]), 2); $_SERVER['PHP_AUTH_USER'] = strip_tags($name); $_SERVER['PHP_AUTH_PW'] = strip_tags($password); } |