Marged fixes from ain trunk up to 2.2.11

[fa-stable.git] / includes / current_user.inc

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 017a54052bff8fa0868e18d55ffe8938eb4ad86e..c1c68e439a287070a98d1d543b9a2566b7eca056 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -175,7 +175,7 @@ class current_user
                        update_user_prefs($this->user, $prefs);
                }
 
-               $this->prefs = new user_prefs($prefs);
+               $this->prefs = new user_prefs(get_user($this->user));
        }
 }
 
@@ -183,7 +183,7 @@ class current_user
 
 function round2($number, $decimals=0)
 {
-       $delta = ($number < 0 ? -.000001 : .000001);
+       $delta = ($number < 0 ? -.0000000001 : .0000000001);
        return round($number+$delta, $decimals);
 }
 
@@ -193,7 +193,7 @@ function number_format2($number, $decimals=0)
        $tsep = $thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
        $dsep = $decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
        //return number_format($number, $decimals, $dsep,       $tsep);
-       $delta = ($number < 0 ? -.000001 : .000001);
+       $delta = ($number < 0 ? -.0000000001 : .0000000001);
        return number_format($number+$delta, $decimals, $dsep,  $tsep);
 }
 //
@@ -481,12 +481,13 @@ function array_search_value($needle, $haystack, $valuekey=null)
 function array_search_keys($needle, $haystack, $valuekey=null)
 {
        $keys = array();
-       foreach($haystack as $key => $value) {
-               $val = isset($valuekey) ? $value[$valuekey] : $value;
-               if ($needle == $val){
-                       $keys[] = $key;
+       if($haystack)
+               foreach($haystack as $key => $value) {
+                       $val = isset($valuekey) ? $value[$valuekey] : $value;
+                       if ($needle == $val){
+                               $keys[] = $key;
+                       }
                }
-       }
        return $keys;
 }
 //