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 cd87a18..982c6ff 100644 (file)
--- 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 c42ebc0..512057d 100644 (file)
--- 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 );