adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-08 20:42:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.6

Browse source 
Conflicts:
	lib/Cake/Model/Model.php
This commit is contained in:
mark_story 2014-08-08 23:28:06 -04:00
commit 9c3089796f
15 changed files with 650 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/Utility/String.php
View file

@ -132,21 +132,21 @@ class String {
}
if ($tmpOffset !== -1) {
$buffer .= substr($data, $offset, ($tmpOffset - $offset));
if (!$depth && $data{$tmpOffset} == $separator) {
if (!$depth && $data{$tmpOffset} === $separator) {
$results[] = $buffer;
$buffer = '';
} else {
$buffer .= $data{$tmpOffset};
}
if ($leftBound != $rightBound) {
if ($data{$tmpOffset} == $leftBound) {
if ($leftBound !== $rightBound) {
if ($data{$tmpOffset} === $leftBound) {
$depth++;
}
if ($data{$tmpOffset} == $rightBound) {
if ($data{$tmpOffset} === $rightBound) {
$depth--;
}
} else {
if ($data{$tmpOffset} == $leftBound) {
if ($data{$tmpOffset} === $leftBound) {
if (!$open) {
$depth++;
$open = true;