From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 12 Aug 2008 20:13:45 +0000 (+0000)
Subject: Revert r39198 "* (bug 15128) Feed:xmlEncode() function now declared as static"
X-Git-Tag: 1.31.0-rc.0~45934
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/fiche.php?a=commitdiff_plain;h=3937270fb1f1aab9f87a66ce2f4ac63a9f547982;p=lhc%2Fweb%2Fwiklou.git

Revert r39198 "* (bug 15128) Feed:xmlEncode() function now declared as static"
FeedItem::xmlEncode() is only called *non*-statically
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cd87a18974..982c6ffbec 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -109,8 +109,7 @@ 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 c42ebc0e76..512057d937 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -55,7 +55,7 @@ class FeedItem {
 	/**
 	 * @static
 	 */
-	static function xmlEncode( $string ) {
+	function xmlEncode( $string ) {
 		$string = str_replace( "\r\n", "\n", $string );
 		$string = preg_replace( '/[\x00-\x08\x0b\x0c\x0e-\x1f]/', '', $string );
 		return htmlspecialchars( $string );