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

Adding fix for Ticket #2101.

Browse source 
Changed Helper::loadConfig() to accept a param with the name of the file to load

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4589 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-03-05 13:48:21 +00:00
parent 59908ac629
commit a9c128b0ec
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/datasources/dbo_source.php
View file

@ -1424,7 +1424,7 @@ class DboSource extends DataSource {
$data = $this->name($key) . ' IS NULL';
} elseif($value === '') {
$data = $this->name($key) . " = ''";
} elseif (preg_match('/^([a-z]*\\([a-z0-9]*\\)\\x20?|(?:' . join('\\x20)|(?:', $this->__sqlOps) . '\\x20)|<=?(?![^>]+>)\\x20?|[>=!]{1,3}(?!<)\\x20?)?(.*)/i', $value, $match)) {
} elseif (preg_match('/^([a-z]*\\([a-z0-9]*\\)\\x20?|(?:' . join('\\x20)|(?:', $this->__sqlOps) . '\\x20)|<[>=]?(?![^>]+>)\\x20?|[>=!]{1,3}(?!<)\\x20?)?(.*)/i', $value, $match)) {
if (preg_match('/(\\x20[\\w]*\\x20)/', $key, $regs)) {
$clause = $regs['1'];
$key = preg_replace('/' . $regs['1'] . '/', '', $key);

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

@ -151,12 +151,15 @@ class Helper extends Overloadable {
/**
* Parses tag templates into $this->tags.
*
* @return void
* @param $name file name
* @return array merged tags from config/$name.php
*/
function loadConfig() {
if (file_exists(APP . 'config' . DS . 'tags.php')) {
require(APP . 'config' . DS . 'tags.php');
$this->tags = am($this->tags, $tags);
function loadConfig($name = 'tags') {
if (file_exists(APP . 'config' . DS . $name .'.php')) {
require(APP . 'config' . DS . $name .'.php');
if(isset($tags)) {
$this->tags = am($this->tags, $tags);
}
}
return $this->tags;
}