From 47a3cb88e7ed7f2a87bbf024dff3416fc6cd8002 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 31 Aug 2006 20:17:39 +0000
Subject: merge from 3.0 branch till 1374.

---
 framework/Util/TSimpleDateFormatter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'framework/Util')

diff --git a/framework/Util/TSimpleDateFormatter.php b/framework/Util/TSimpleDateFormatter.php
index 9c2975d5..046a3442 100644
--- a/framework/Util/TSimpleDateFormatter.php
+++ b/framework/Util/TSimpleDateFormatter.php
@@ -118,7 +118,8 @@ class TSimpleDateFormatter
 		$bits['dd'] = str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
 		$bits['d'] = $date['mday'];
 
-		return str_replace(array_keys($bits), $bits, $this->pattern);
+		$pattern = preg_replace('/M{3,4}/', 'MM', $this->pattern);
+		return str_replace(array_keys($bits), $bits, $pattern);
 	}
 
 	public function getMonthPattern()
-- 
cgit v1.2.3