X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fapi%2FApiFormatJson.php;h=2e917e1a4fc5e009bc86034a34aa88cee01ff0f3;hp=41de9253f6d70f14f99fb36a89311ecc631746c0;hb=7874fc4bec845ad92960b07e969c65f3c3fe74f2;hpb=54d58ef506653ad916deb11882e264dd4f0eb0bf

diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index 41de9253f6..2e917e1a4f 100644
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -56,15 +56,6 @@ class ApiFormatJson extends ApiFormatBase {
 		return 'application/json';
 	}
 
-	/**
-	 * @deprecated since 1.25
-	 */
-	public function getWantsHelp() {
-		wfDeprecated( __METHOD__, '1.25' );
-		// Help is always ugly in JSON
-		return false;
-	}
-
 	public function execute() {
 		$params = $this->extractRequestParams();
 
@@ -103,9 +94,9 @@ class ApiFormatJson extends ApiFormatBase {
 		// Bug 66776: wfMangleFlashPolicy() is needed to avoid a nasty bug in
 		// Flash, but what it does isn't friendly for the API, so we need to
 		// work around it.
-		if ( preg_match( '/\<\s*cross-domain-policy\s*\>/i', $json ) ) {
+		if ( preg_match( '/\<\s*cross-domain-policy(?=\s|\>)/i', $json ) ) {
 			$json = preg_replace(
-				'/\<(\s*cross-domain-policy\s*)\>/i', '\\u003C$1\\u003E', $json
+				'/\<(\s*cross-domain-policy(?=\s|\>))/i', '\\u003C$1', $json
 			);
 		}