From: Sam Reed <reedy@wikimedia.org>
Date: Tue, 27 Jan 2015 05:34:40 +0000 (+0000)
Subject: Remove copious amounts of commented out preg_replace calls
X-Git-Tag: 1.31.0-rc.0~12594
X-Git-Url: http://git.cyclocoop.org/%22%20.%20%20%20%24self2%20.%20%20%20%22&var_mode_affiche=boucle?a=commitdiff_plain;h=e6c1ab047f8e31f0208a5da7241ee51401972aa0;p=lhc%2Fweb%2Fwiklou.git

Remove copious amounts of commented out preg_replace calls

Change-Id: I9b9afea3dc6729598b240845c3d34357548cdd4a
---

diff --git a/includes/search/SearchHighlighter.php b/includes/search/SearchHighlighter.php
index ec7b710c02..223a2fe4e7 100644
--- a/includes/search/SearchHighlighter.php
+++ b/includes/search/SearchHighlighter.php
@@ -442,12 +442,6 @@ class SearchHighlighter {
 	 * @return mixed
 	 */
 	function removeWiki( $text ) {
-		// $text = preg_replace( "/'{2,5}/", "", $text );
-		// $text = preg_replace( "/\[[a-z]+:\/\/[^ ]+ ([^]]+)\]/", "\\2", $text );
-		// $text = preg_replace( "/\[\[([^]|]+)\]\]/", "\\1", $text );
-		// $text = preg_replace( "/\[\[([^]]+\|)?([^|]]+)\]\]/", "\\2", $text );
-		// $text = preg_replace( "/\\{\\|(.*?)\\|\\}/", "", $text );
-		// $text = preg_replace( "/\\[\\[[A-Za-z_-]+:([^|]+?)\\]\\]/", "", $text );
 		$text = preg_replace( "/\\{\\{([^|]+?)\\}\\}/", "", $text );
 		$text = preg_replace( "/\\{\\{([^|]+\\|)(.*?)\\}\\}/", "\\2", $text );
 		$text = preg_replace( "/\\[\\[([^|]+?)\\]\\]/", "\\1", $text );
@@ -456,7 +450,6 @@ class SearchHighlighter {
 			array( $this, 'linkReplace' ),
 			$text
 		);
-		// $text = preg_replace("/\\[\\[([^|]+\\|)(.*?)\\]\\]/", "\\2", $text);
 		$text = preg_replace( "/<\/?[^>]+>/", "", $text );
 		$text = preg_replace( "/'''''/", "", $text );
 		$text = preg_replace( "/('''|<\/?[iIuUbB]>)/", "", $text );