extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-22 21:30:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed handling of empty name, not index into array but return full array

Browse Source
This commit is contained in:
Ralf Becker 2014-01-06 12:54:05 +00:00
parent 5cd2ab377f
commit 44ac7db6a5
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -653,7 +653,11 @@ class boetemplate extends soetemplate
}
if (is_object($idx)) return false; // given an error in php5.2
if (count($idxs = explode('[', $idx, 2)) > 1)
if (empty($idx))
{
$idxs = array();
}
elseif (count($idxs = explode('[', $idx, 2)) > 1)
{
$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1],0,-1)));
}

9
etemplate/inc/class.etemplate.inc.php
View File

@ -1081,14 +1081,7 @@ class etemplate extends boetemplate
list($name) = explode('=',$name);
}
$form_name = self::form_name($cname,$name);
if (!is_object($name) && (string)$name !== '' && is_array($content))
{
$value = $this->get_array($content,$name);
}
else
{
$value =& $content;
}
$value =& $this->get_array($content,$name);
$options = '';
if ($readonly = $cell['readonly'] && $readonlys[$name] !== false || // allow to overwrite readonly settings of a cell
@$readonlys[$name] && !is_array($readonlys[$name]) || $readonlys['__ALL__'] && (!is_string($name) || $readonlys[$name] !== false) ||