From 17f49a9bc71d88c9b3e2f31a161f3689c136ac16 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 1 Dec 2006 12:28:55 +0000
Subject: merge from 3.0 branch till 1531.

---
 framework/I18N/core/DateTimeFormatInfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework/I18N/core/DateTimeFormatInfo.php')

diff --git a/framework/I18N/core/DateTimeFormatInfo.php b/framework/I18N/core/DateTimeFormatInfo.php
index 4d8dafe8..fb6793c5 100644
--- a/framework/I18N/core/DateTimeFormatInfo.php
+++ b/framework/I18N/core/DateTimeFormatInfo.php
@@ -166,7 +166,7 @@ class DateTimeFormatInfo
      * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
      * culture.
      */
-    function getInstance($culture=null)
+    static function getInstance($culture=null)
     {
 
         if ($culture instanceof CultureInfo)
-- 
cgit v1.2.3