From 6ed1fc8fbe734c91db8dababc38d40f8a35699f7 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 24 May 2008 22:46:40 +0000 Subject: [PATCH] Corrected CONFIGS usage in Helper and Configure as per patch from 'zeuthen'. git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7041 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/configure.php | 6 +++--- cake/libs/view/helper.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cake/libs/configure.php b/cake/libs/configure.php index 0922e38a0..c9c76b567 100644 --- a/cake/libs/configure.php +++ b/cake/libs/configure.php @@ -626,11 +626,11 @@ class Configure extends Object { $_this->write('App.server', 'IIS'); } - if (!include(APP_PATH . 'config' . DS . 'core.php')) { + if (!include(CONFIGS . '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); } - if (!include(APP_PATH . 'config' . DS . 'bootstrap.php')) { + if (!include(CONFIGS . 'bootstrap.php')) { trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR); } @@ -1157,4 +1157,4 @@ class App extends Object { } } } -?> \ No newline at end of file +?> diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php index 95a3225d1..d75787ed5 100644 --- a/cake/libs/view/helper.php +++ b/cake/libs/view/helper.php @@ -155,8 +155,8 @@ class Helper extends Overloadable { * @return array merged tags from config/$name.php */ function loadConfig($name = 'tags') { - if (file_exists(APP . 'config' . DS . $name .'.php')) { - require(APP . 'config' . DS . $name .'.php'); + if (file_exists(CONFIGS . $name .'.php')) { + require(CONFIGS . $name .'.php'); if (isset($tags)) { $this->tags = array_merge($this->tags, $tags); } @@ -760,4 +760,4 @@ class Helper extends Overloadable { } while ($oldstring != $this->__cleaned); } } -?> \ No newline at end of file +?>