From cb44bdcc18f8b718f3e0084450d47e4503bf8773 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Fri, 14 Feb 2014 16:48:53 -0500 Subject: [PATCH] API: Don't find links in the middle of api.php links Bug: 61362 Change-Id: Idf985e4e69c2f11778a8a90503914678441cb3fb --- includes/api/ApiFormatBase.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php index 63a5502..5b46f50 100644 --- a/includes/api/ApiFormatBase.php +++ b/includes/api/ApiFormatBase.php @@ -271,12 +271,22 @@ See the complete documentation, // encode all comments or tags as safe blue strings $text = str_replace( '<', '<', $text ); $text = str_replace( '>', '>', $text ); + // identify requests to api.php - $text = preg_replace( "#api\\.php\\?[^ <\n\t]+#", '\\0', $text ); + $text = preg_replace( '#^(\s*)(api\.php\?[^ <\n\t]+)$#m', '\1\2', $text ); if ( $this->mHelp ) { // make strings inside * bold $text = preg_replace( "#\\*[^<>\n]+\\*#", '\\0', $text ); } + + // Armor links (bug 61362) + $masked = array(); + $text = preg_replace_callback( '##', function ( $matches ) use ( &$masked ) { + $sha = sha1( $matches[0] ); + $masked[$sha] = $matches[0]; + return "<$sha>"; + }, $text ); + // identify URLs $protos = wfUrlProtocolsWithoutProtRel(); // This regex hacks around bug 13218 (" included in the URL) @@ -286,6 +296,12 @@ See the complete documentation, $text ); + // Unarmor links + $text = preg_replace_callback( '#<([0-9a-f]+)>#', function ( $matches ) use ( &$masked ) { + $sha = $matches[1]; + return isset( $masked[$sha] ) ? $masked[$sha] : $matches[0]; + }, $text ); + /** * Temporary fix for bad links in help messages. As a special case, * XML-escaped metachars are de-escaped one level in the help message -- 1.9.0.rc3