From 3937270fb1f1aab9f87a66ce2f4ac63a9f547982 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 12 Aug 2008 20:13:45 +0000 Subject: [PATCH] Revert r39198 "* (bug 15128) Feed:xmlEncode() function now declared as static" FeedItem::xmlEncode() is only called *non*-statically --- RELEASE-NOTES | 3 +-- includes/Feed.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 ); -- 2.20.1