From: Ryan Schmidt <skizzerz@users.mediawiki.org>
Date: Tue, 12 Aug 2008 01:47:05 +0000 (+0000)
Subject: * (bug 15128) Feed:xmlEncode() function now declared as static
X-Git-Tag: 1.31.0-rc.0~45943
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=d7139c4f350e976842e59db6e4d43be4e90ee6b0;p=lhc%2Fweb%2Fwiklou.git

* (bug 15128) Feed:xmlEncode() function now declared as static
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2cd2393756..f6d6488224 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -107,7 +107,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13770) Fixed incorrect detection of PHP's DOM module
 * (bug 14790) Export of category pages when using Category: prefix now actually
   gives results
-
+* (bug 15128) Feed::xmlEncode() function is now declared as static
+  
 === API changes in 1.14 ===
 
 * Registration time of users registered before the DB field was created is now
diff --git a/includes/Feed.php b/includes/Feed.php
index 512057d937..c42ebc0e76 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -55,7 +55,7 @@ class FeedItem {
 	/**
 	 * @static
 	 */
-	function xmlEncode( $string ) {
+	static function xmlEncode( $string ) {
 		$string = str_replace( "\r\n", "\n", $string );
 		$string = preg_replace( '/[\x00-\x08\x0b\x0c\x0e-\x1f]/', '', $string );
 		return htmlspecialchars( $string );