extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing types in admin queue and history

Browse Source
This commit is contained in:
nathangray 2019-01-23 10:41:52 -07:00
parent 231946ae58
commit 05ce70f1a8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/inc/class.admin_cmd.inc.php
View File

@ -586,9 +586,12 @@ abstract class admin_cmd
} }
} }
foreach($labels as $class => &$label) foreach($labels as $class => &$label)
{
if(class_exists($class))
{ {
$label = $class::name(); $label = $class::name();
} }
}
// sort them alphabetic // sort them alphabetic
uasort($labels, function($a, $b) uasort($labels, function($a, $b)

2
api/src/Storage/Base.php
View File

@ -1643,6 +1643,7 @@ class Base
} }
if (!$order) $order = current($cols); if (!$order) $order = current($cols);
$this->search_return_iterator = true;
if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter))) if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
{ {
if (preg_match('/AS ([a-z_0-9]+)$/i',$key_col,$matches)) if (preg_match('/AS ([a-z_0-9]+)$/i',$key_col,$matches))
@ -1670,6 +1671,7 @@ class Base
if ($data) $ret[$row[$key_col]] = $data; if ($data) $ret[$row[$key_col]] = $data;
} }
} }
$this->search_return_iterator = false;
return $cache[$cache_key] =& $ret; return $cache[$cache_key] =& $ret;
} }