[Pkg-owncloud-commits] [owncloud] 81/239: fix overwrite host support and make the code a bit more readable

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 2ce850f7dbdc7759f250715f1e97036a93bc0ac1
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Sun Nov 24 12:41:09 2013 +0100

    fix overwrite host support and make the code a bit more readable
---
 lib/private/request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/request.php b/lib/private/request.php
index df33217..54e6d81 100755
--- a/lib/private/request.php
+++ b/lib/private/request.php
@@ -99,7 +99,7 @@ class OC_Request {
 	public static function scriptName() {
 		$name = $_SERVER['SCRIPT_NAME'];
 		if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) {
-			$serverroot = str_replace("\\", '/', substr(__DIR__, 0, -4));
+			$serverroot = str_replace("\\", '/', substr(__DIR__, 0, -strlen('lib/private/')));
 			$suburi = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen($serverroot)));
 			$name = OC_Config::getValue('overwritewebroot', '') . $suburi;
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git