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 +-
 framework/I18N/core/MessageSource_XLIFF.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'framework/I18N')

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)
diff --git a/framework/I18N/core/MessageSource_XLIFF.php b/framework/I18N/core/MessageSource_XLIFF.php
index 7f2f27c5..79d4f38c 100644
--- a/framework/I18N/core/MessageSource_XLIFF.php
+++ b/framework/I18N/core/MessageSource_XLIFF.php
@@ -280,7 +280,8 @@ class MessageSource_XLIFF extends MessageSource
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 
 		//create a new dom, import the existing xml
-		$dom = DOMDocument::load($filename);
+		$dom = new DOMDocument();
+		$dom->load($filename);
 
 		//find the body element
 		$xpath = new DomXPath($dom);
-- 
cgit v1.2.3