Updated base url parsing to account for app's folder structure changes.

cakephp · Jan 12, 2014 · a1dac80 · a1dac80
1 parent 20b993f
commit a1dac80
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 73 deletions.
diff --git a/src/Network/Request.php b/src/Network/Request.php
@@ -346,14 +346,11 @@ protected static function _base() {
 		if (!$baseUrl) {
 			$base = dirname(env('PHP_SELF'));
 
-			$indexPos = strpos($base, '/webroot/index.php');
+			$indexPos = strpos($base, '/' . $webroot . '/index.php');
 			if ($indexPos !== false) {
-				$base = substr($base, 0, $indexPos) . '/webroot';
+				$base = substr($base, 0, $indexPos) . '/' . $webroot;
 			}
-			if ($webroot === 'webroot' && $webroot === basename($base)) {
-				$base = dirname($base);
-			}
-			if ($dir === 'App' && $dir === basename($base)) {
+			if ($webroot === basename($base)) {
 				$base = dirname($base);
 			}
 
@@ -373,12 +370,9 @@ protected static function _base() {
 		$webrootDir = $base . '/';
 
 		$docRoot = env('DOCUMENT_ROOT');
-		$docRootContainsWebroot = strpos($docRoot, $dir . DS . $webroot);
+		$docRootContainsWebroot = strpos($docRoot, $webroot);
 
 		if (!empty($base) || !$docRootContainsWebroot) {
-			if (strpos($webrootDir, '/' . $dir . '/') === false) {
-				$webrootDir .= $dir . '/';
-			}
 			if (strpos($webrootDir, '/' . $webroot . '/') === false) {
 				$webrootDir .= $webroot . '/';
 			}