Fixed base URL

Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
This commit is contained in:
Albert Santoni 2014-08-14 17:22:01 -04:00 committed by drigato
parent 716cc5a754
commit 4c1e6d3fe3
3 changed files with 10 additions and 7 deletions

View file

@ -65,8 +65,10 @@ class Application_Common_OsPath{
}
public static function getBaseDir() {
$baseUrl = dirname($_SERVER['SCRIPT_NAME']);
$CC_CONFIG = Config::getConfig();
$baseUrl = $CC_CONFIG['baseDir'];
if ($baseUrl[0] != "/") {
$baseUrl = "/".$baseUrl;
}
@ -74,7 +76,8 @@ class Application_Common_OsPath{
if ($baseUrl[strlen($baseUrl) -1] != "/") {
$baseUrl = $baseUrl."/";
}
return $baseUrl;
}
}