Removing ini_set() in project root.

Fixing notice errors that would happen when mod_rewrite wasn't enabled.
This commit is contained in:
mark_story 2010-11-14 14:45:09 -05:00
parent 27287e4b9f
commit b91566d35f
3 changed files with 5 additions and 13 deletions

View file

@ -76,5 +76,5 @@
} else { } else {
require LIBS . 'dispatcher.php'; require LIBS . 'dispatcher.php';
$Dispatcher = new Dispatcher(); $Dispatcher = new Dispatcher();
$Dispatcher->dispatch(new CakeRequest($_GET['url'])); $Dispatcher->dispatch(new CakeRequest(isset($_GET['url']) ? $_GET['url'] : null));
} }

View file

@ -76,5 +76,5 @@
} else { } else {
require LIBS . 'dispatcher.php'; require LIBS . 'dispatcher.php';
$Dispatcher = new Dispatcher(); $Dispatcher = new Dispatcher();
$Dispatcher->dispatch(new CakeRequest($_GET['url'])); $Dispatcher->dispatch(new CakeRequest(isset($_GET['url']) ? $_GET['url'] : null));
} }

View file

@ -41,15 +41,7 @@
/** /**
* Set the include path or define app and core path * Set the include path or define app and core path
*/ */
if (function_exists('ini_set')) { define('APP_PATH', ROOT . DS . APP_DIR . DS);
ini_set('include_path', define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
ini_get('include_path') . PATH_SEPARATOR . CAKE_CORE_INCLUDE_PATH
. PATH_SEPARATOR . ROOT . DS . APP_DIR . DS
);
define('APP_PATH', null);
define('CORE_PATH', null);
} else {
define('APP_PATH', ROOT . DS . APP_DIR . DS);
define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
}
require APP_DIR . DS . WEBROOT_DIR . DS . 'index.php'; require APP_DIR . DS . WEBROOT_DIR . DS . 'index.php';