Merged latest changes from stable branch.

[fa-stable.git] / includes / prefs / userprefs.inc

diff --git a/includes/prefs/userprefs.inc b/includes/prefs/userprefs.inc
index caf0506648c0b963b0003129ed54ced26608495b..400ef1e16903dbf06d2f24d39d22f718033a0581 100644 (file)
--- a/includes/prefs/userprefs.inc
+++ b/includes/prefs/userprefs.inc
@@ -166,8 +166,14 @@ class user_prefs
                        return "m".$sep."d".$sep."Y";
                elseif ($this->date_format == 1)
                        return "d".$sep."m".$sep."Y";
-               else
+               elseif ($this->date_format == 2)
                        return "Y".$sep."m".$sep."d";
+               elseif ($this->date_format == 3)
+                       return "M".$sep."j".$sep."Y";
+               elseif ($this->date_format == 4)
+                       return "j".$sep."M".$sep."Y";
+               else
+                       return "Y".$sep."M".$sep."j";
        }
 
        function tho_sep()