closes , check for defines

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6980 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-05-20 01:21:10 +00:00
parent aa00e47fe8
commit 2f0a556948

View file

@ -45,7 +45,9 @@
/** /**
* Path to the application's directory. * Path to the application's directory.
*/ */
if (!defined('APP')) {
define ('APP', ROOT.DS.APP_DIR.DS); define ('APP', ROOT.DS.APP_DIR.DS);
}
/** /**
* Path to the application's models directory. * Path to the application's models directory.
*/ */
@ -83,7 +85,9 @@
/** /**
* Path to the configuration files directory. * Path to the configuration files directory.
*/ */
if (!defined('CONFIGS')) {
define ('CONFIGS', APP.'config'.DS); define ('CONFIGS', APP.'config'.DS);
}
/** /**
* Path to the libs directory. * Path to the libs directory.
*/ */
@ -174,6 +178,7 @@ if (!defined('VENDORS')) {
/** /**
* Full url prefix * Full url prefix
*/ */
if (!defined('FULL_BASE_URL')) {
$s = null; $s = null;
if (env('HTTPS')) { if (env('HTTPS')) {
$s ='s'; $s ='s';
@ -185,6 +190,7 @@ if (!defined('VENDORS')) {
define('FULL_BASE_URL', 'http'.$s.'://'.$httpHost); define('FULL_BASE_URL', 'http'.$s.'://'.$httpHost);
} }
unset($httpHost, $s); unset($httpHost, $s);
}
/** /**
* Web path to the public images directory. * Web path to the public images directory.
*/ */