Move function xmlsafe() from Export.php to OAI extension

Exporting function from Export.php.

Change-Id: I82a78ff7a34402f2cc065643d90b064b996c525d

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 9c4be8b..197fd24 100644 (file)
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -252,6 +252,7 @@ changes to languages because of Bugzilla reports.
   is unused by any modern extension.
 * Removed maintenance/nextJobDB.php; no longer in use.
 * Removed global function wfViewPrevNext(). (deprecated since 1.19)
+* Removed global function xmlsafe() from Export.php. (moved to OAIRepo extension)
 
 ==== Renamed classes ====
 * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression

diff --git a/includes/Export.php b/includes/Export.php
index 21fcd5a..e57fe7f 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -1552,23 +1552,3 @@ class DumpMultiWriter {
                return $filenames;
        }
 }
-
-/**
- * @param string $string
- * @return string
- * @todo FIXME: Only used in OAI extension. Move over there.
- */
-function xmlsafe( $string ) {
-       wfProfileIn( __FUNCTION__ );
-
-       /**
-        * The page may contain old data which has not been properly normalized.
-        * Invalid UTF-8 sequences or forbidden control characters will make our
-        * XML output invalid, so be sure to strip them out.
-        */
-       $string = UtfNormal::cleanUp( $string );
-
-       $string = htmlspecialchars( $string );
-       wfProfileOut( __FUNCTION__ );
-       return $string;
-}

diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic
index 2f05d12..81bc06e 100644 (file)
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -4569,7 +4569,6 @@ xmldoublequote
 xmlfm
 xmlimport
 xmlns
-xmlsafe
 xmlselect
 xor
 xpinstall