diff --git a/admin/inc/class.admin_cmd.inc.php b/admin/inc/class.admin_cmd.inc.php index 48625a4a5f..4b1e1c1a5e 100644 --- a/admin/inc/class.admin_cmd.inc.php +++ b/admin/inc/class.admin_cmd.inc.php @@ -587,7 +587,10 @@ abstract class admin_cmd } foreach($labels as $class => &$label) { - $label = $class::name(); + if(class_exists($class)) + { + $label = $class::name(); + } } // sort them alphabetic diff --git a/api/src/Storage/Base.php b/api/src/Storage/Base.php index 639e944a2a..2cec1c0fb9 100644 --- a/api/src/Storage/Base.php +++ b/api/src/Storage/Base.php @@ -1643,6 +1643,7 @@ class Base } 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 (preg_match('/AS ([a-z_0-9]+)$/i',$key_col,$matches)) @@ -1670,6 +1671,7 @@ class Base if ($data) $ret[$row[$key_col]] = $data; } } + $this->search_return_iterator = false; return $cache[$cache_key] =& $ret; }