fix url parsing.

taylorotwell · taylorotwell · commit ffb4034631a3 · 2012-04-04T10:16:15.000-05:00
diff --git a/application/config/application.php b/application/config/application.php
@@ -54,7 +54,7 @@
 	|
 	*/
 
-	'profiler' => true,
+	'profiler' => false,
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/laravel/url.php b/laravel/url.php
@@ -61,7 +61,7 @@ public static function base()
 
 		$base = 'http://localhost';
 
-		// If the application URL configuration is set, we will just use that
+		// If the application's URL configuration is set, we will just use that
 		// instead of trying to guess the URL from the $_SERVER array's host
 		// and script variables as this is more reliable.
 		if (($url = Config::get('application.url')) !== '')
@@ -72,7 +72,7 @@ public static function base()
 		{
 			$f = Request::foundation();
 
-			$base = $f->getScheme().'://'.$f->getHttpHost().$f->getBaseUrl();
+			$base = $f->getScheme().'://'.$f->getHttpHost().$f->getBasePath();
 		}
 
 		return static::$base = $base;

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static function base()`
`61`	`61`
`62`	`62`	`$base = 'http://localhost';`
`63`	`63`
`64`		`- // If the application URL configuration is set, we will just use that`
	`64`	`+ // If the application's URL configuration is set, we will just use that`
`65`	`65`	`// instead of trying to guess the URL from the $_SERVER array's host`
`66`	`66`	`// and script variables as this is more reliable.`
`67`	`67`	`if (($url = Config::get('application.url')) !== '')`
`@@ -72,7 +72,7 @@ public static function base()`
`72`	`72`	`{`
`73`	`73`	`$f = Request::foundation();`
`74`	`74`
`75`		`- $base = $f->getScheme().'://'.$f->getHttpHost().$f->getBaseUrl();`
	`75`	`+ $base = $f->getScheme().'://'.$f->getHttpHost().$f->getBasePath();`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`return static::$base = $base;`