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

API/tree: do not check parent treenodes if not expizitly selected

Browse Source
This commit is contained in:
Klaus Leithoff 2012-01-09 14:45:24 +00:00
parent 163ca468f8
commit 904917af86
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpgwapi/inc/class.html.inc.php
View File

@ -297,6 +297,7 @@ class html
{ {
//if (!is_scalar($str) && !is_null($str)) error_log(__METHOD__.'('.array2string($str).') '.function_backtrace()); //if (!is_scalar($str) && !is_null($str)) error_log(__METHOD__.'('.array2string($str).') '.function_backtrace());
// as EGroupware supports only utf-8 we should not need to worry about wrong charsets // as EGroupware supports only utf-8 we should not need to worry about wrong charsets
//if (is_array($str)) error_log(__METHOD__.__LINE__.' string expected -> array given:'.array2string($str).'->'.function_backtrace());
return htmlspecialchars($str,ENT_COMPAT,self::$charset,false); return htmlspecialchars($str,ENT_COMPAT,self::$charset,false);
// we need '&#' unchanged, so we translate it back -> this is provided by 4th param = false -> do not doubleencode // we need '&#' unchanged, so we translate it back -> this is provided by 4th param = false -> do not doubleencode
//$str = str_replace(array('&#',' ','<','>'),array('&#',' ','<','>'),$str); //$str = str_replace(array('&#',' ','<','>'),array('&#',' ','<','>'),$str);
@ -1359,7 +1360,7 @@ class html
if ($_onCheckHandler && $_selected) // check selected items on multi selection if ($_onCheckHandler && $_selected) // check selected items on multi selection
{ {
if (!is_array($_selected)) $_selected = explode(',',$_selected); if (!is_array($_selected)) $_selected = explode(',',$_selected);
if (in_array($path,$_selected,!is_numeric($path))) $entryOptions .= ',CHECKED'; if (array_search("$path",$_selected)!==false) $entryOptions .= ',CHECKED';
//echo "<p>path=$path, _selected=".print_r($_selected,true).": $entryOptions</p>\n"; //echo "<p>path=$path, _selected=".print_r($_selected,true).": $entryOptions</p>\n";
} }
// highlight current item // highlight current item