From: withoutaname <drevitchi@gmail.com>
Date: Thu, 17 Jul 2014 22:34:39 +0000 (-0700)
Subject: Move function xmlsafe() from Export.php to OAI extension
X-Git-Tag: 1.31.0-rc.0~14871^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=344e6c7b75c0f50a9a0b18667754da9aebbe62db;p=lhc%2Fweb%2Fwiklou.git

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 9c4be8bb07..197fd243e6 100644
--- 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 21fcd5a34d..e57fe7f2a7 100644
--- 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 2f05d12663..81bc06e8ad 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -4569,7 +4569,6 @@ xmldoublequote
 xmlfm
 xmlimport
 xmlns
-xmlsafe
 xmlselect
 xor
 xpinstall