Optimised get_company_pref()

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index f73cd04cc636036d1b68bd41738d6a64b0fb1288..39108db831f22d408f41f2344c3a1c3b9371f96a 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -39,16 +39,13 @@ function get_company_pref($prefs = null)
 
        $all = $SysPrefs->prefs;
 
-       if (!$prefs)
-               return $all;
-       elseif (is_string($prefs))
+       if ($prefs && is_string($prefs))
                return @$all[$prefs];
 
-       $ret = array();
-       foreach($prefs as $name)
-               $ret[$name] = $all[$name];
+       if (!is_array($all))
+               $all = array();
 
-       return $ret;
+       return $all;
 }
 
 function get_company_prefs()