Index: trunk/globals.php
===================================================================
diff -u -r500 -r503
--- trunk/globals.php	(.../globals.php)	(revision 500)
+++ trunk/globals.php	(.../globals.php)	(revision 503)
@@ -1001,7 +1001,10 @@
   }
   else
     $fmt = "m-d-Y";
-  return $fmt;	
+
+	if(isset($GLOBALS['FrontEnd'])&&$GLOBALS['FrontEnd'])
+		return $fmt;
+	return preg_replace('/y+/i','Y',$fmt);
 }
 
 function GetTimeFormat($LangId=0)
Index: trunk/admin/include/calendar.js
===================================================================
diff -u -r381 -r503
--- trunk/admin/include/calendar.js	(.../calendar.js)	(revision 381)
+++ trunk/admin/include/calendar.js	(.../calendar.js)	(revision 503)
@@ -1071,10 +1071,11 @@
       if (b[i] == "m" || b[i] == "mm") {
          m = a[i]-1;
       }
-      if (b[i] == "y") {
-         y = a[i];
-      }
-      if (b[i] == "yy") {      	
+//      if (b[i] == "y") {
+//         y = a[i];
+//      }
+      if ((b[i] == "y")||(b[i] == "yy")) {      	
+//      if (b[i] == "yy") {      	
       	if (a[i].length == 4) {
       		y = a[i];
       	}