CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Basic class if layout fixes

Browse Source
This commit is contained in:
Clemens Schwaighofer
2019-11-28 15:44:39 +09:00
parent 12e335c69c
commit ecc52e2dbd
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
www/lib/CoreLibs/Admin/Backend.php
View File

@@ -105,6 +105,7 @@ class Backend extends \CoreLibs\DB\IO
/** /**
* set the language encoding and language settings * set the language encoding and language settings
* use $OVERRIDE_LANG to override all language settings
* the default charset from _SESSION login or from * the default charset from _SESSION login or from
* config DEFAULT ENCODING * config DEFAULT ENCODING
* the lang full name for mo loading from _SESSION login * the lang full name for mo loading from _SESSION login

18
www/lib/CoreLibs/Basic.php
View File

@@ -1236,12 +1236,22 @@ class Basic
$path[] = $key_lookin; $path[] = $key_lookin;
} else { } else {
foreach ($haystack as $key => $val) { foreach ($haystack as $key => $val) {
if (is_scalar($val) && $val === $needle && empty($key_lookin)) { if (is_scalar($val) &&
break; $val === $needle &&
} elseif (is_scalar($val) && !empty($key_lookin) && $key === $key_lookin && $val == $needle) { empty($key_lookin)
) {
$path[] = $key; $path[] = $key;
break; break;
} elseif (is_array($val) && $path = Basic::arraySearchRecursive($needle, $val, $key_lookin)) { } elseif (is_scalar($val) &&
!empty($key_lookin) &&
$key === $key_lookin &&
$val == $needle
) {
$path[] = $key;
break;
} elseif (is_array($val) &&
$path = Basic::arraySearchRecursive($needle, $val, $key_lookin)
) {
array_unshift($path, $key); array_unshift($path, $key);
break; break;
} }