Changing SERVER_IIS constant to 'App.server' config variable

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6283 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-12-30 22:28:59 +00:00
parent f6b71c29e9
commit a11db494bb
2 changed files with 4 additions and 3 deletions

View file

@ -29,9 +29,6 @@
if (!defined('PHP5')) {
define ('PHP5', (phpversion() >= 5));
}
if (!defined('SERVER_IIS') && php_sapi_name() == 'isapi') {
define('SERVER_IIS', true);
}
/**
* Configuration, directory layout and standard libraries
*/

View file

@ -602,6 +602,10 @@ class Configure extends Object {
if ($boot) {
$_this->write('App', array('base' => false, 'baseUrl' => false, 'dir' => APP_DIR, 'webroot' => WEBROOT_DIR));
if (php_sapi_name() == 'isapi') {
$_this->write('App.server', 'IIS');
}
if (!include(APP_PATH . 'config' . DS . 'core.php')) {
trigger_error(sprintf(__("Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
}