adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Corrected CONFIGS usage in Helper and Configure as per patch from 'zeuthen'.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7041 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mark_story 2008-05-24 22:46:40 +00:00
parent dcdfdb3cbe
commit 6ed1fc8fbe
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/configure.php
View file

@ -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 {
}
}
}
?>
?>

6
cake/libs/view/helper.php
View file

@ -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);
}
}
?>
?>