holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return $arr argument itself, but no reference to it, in all error cases

Browse Source
This commit is contained in:
Ralf Becker 2014-01-08 09:47:37 +00:00
parent 7b7132314c
commit 2f905e8290
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/inc/class.boetemplate.inc.php
View File

@ -689,12 +689,12 @@ class boetemplate extends soetemplate
*/ */
static function &get_array(&$arr,$idx,$reference_into=False,$skip_empty=False) static function &get_array(&$arr,$idx,$reference_into=False,$skip_empty=False)
{ {
if (!is_array($arr)) // return content of $arr itself (but no reference!) in all error-cases: $arr no array or $idx an object
if (is_object($idx) || !is_array($arr))
{ {
throw new egw_exception_assertion_failed(__METHOD__."(\$arr,'$idx',$reference_into,$skip_empty) \$arr is no array!"); $ret = $arr;
return $ret;
} }
if (is_object($idx)) return false; // given an error in php5.2
if ((string)$idx === '') if ((string)$idx === '')
{ {
$idxs = array(); $idxs = array();