adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding fix for #2613, fixes afterFind callback not called on models in depth search > 1 (recursive).

Browse source 
Changed the regex pattern matching in Router::stripEscape()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5140 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-05-21 03:54:42 +00:00
parent df5c02aa8f
commit 056c4cc054
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -778,6 +778,7 @@ class DboSource extends DataSource {
} }
} }
$this->__mergeAssociation($resultSet[$i], $fetch, $association, $type); $this->__mergeAssociation($resultSet[$i], $fetch, $association, $type);
$resultSet[$i][$association] = $linkModel->afterfind($resultSet[$i][$association]);
} else { } else {
$tempArray[0][$association] = false; $tempArray[0][$association] = false;

6
cake/libs/router.php
View file

@ -737,15 +737,15 @@ class Router extends Object {
} }
function stripEscape($param) { function stripEscape($param) {
if(is_string($param) || empty($param)) { if(is_string($param) || empty($param)) {
$return = preg_replace('/^ ?-!/', '', $param); $return = preg_replace('/^ *-!/', '', $param);
return $return; return $return;
} }
foreach($param as $key => $value) { foreach($param as $key => $value) {
if(is_string($value)) { if(is_string($value)) {
$return[$key] = preg_replace('/^ ?-!/', '', $value); $return[$key] = preg_replace('/^ *-!/', '', $value);
} else { } else {
foreach ($value as $array => $string) { foreach ($value as $array => $string) {
$return[$key][$array] = preg_replace('/^ ?-!/', '', $string); $return[$key][$array] = preg_replace('/^ *-!/', '', $string);
} }
} }
} }