Robuster determination of "base_url" config item

vlakoff · vlakoff · commit 2516f3b39451 · 2014-03-31T20:46:04.000+02:00
Remove the basename only at the end, to avoid edge cases.
diff --git a/system/core/Config.php b/system/core/Config.php
@@ -76,9 +76,11 @@ public function __construct()
 		// Set the base_url automatically if none was provided
 		if (empty($this->config['base_url']))
 		{
+			$script_basename = basename($_SERVER['SCRIPT_NAME']);
+
 			$base_url = (is_https() ? 'https' : 'http') . '://'
 				. (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost')
-				. str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
+				. preg_replace('/'.preg_quote($script_basename).'$/', '', $_SERVER['SCRIPT_NAME']);
 
 			$this->set_item('base_url', $base_url);
 		}

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,11 @@ public function __construct()`
`76`	`76`	`// Set the base_url automatically if none was provided`
`77`	`77`	`if (empty($this->config['base_url']))`
`78`	`78`	`{`
	`79`	`+ $script_basename = basename($_SERVER['SCRIPT_NAME']);`
	`80`	`+`
`79`	`81`	`$base_url = (is_https() ? 'https' : 'http') . '://'`
`80`	`82`	`. (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost')`
`81`		`- . str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);`
	`83`	`+ . preg_replace('/'.preg_quote($script_basename).'$/', '', $_SERVER['SCRIPT_NAME']);`
`82`	`84`
`83`	`85`	`$this->set_item('base_url', $base_url);`
`84`	`86`	`}`