From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 27 Jan 2009 23:12:42 +0000 (+0000)
Subject: Revert r46068 "	Enable language conversion in "alt" and "title" attributes."
X-Git-Tag: 1.31.0-rc.0~43194
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=5843d3db031b831a2a8436f3163c721b1c2f748f;p=lhc%2Fweb%2Fwiklou.git

Revert r46068 "	Enable language conversion in "alt" and "title" attributes."
Use of eval is strongly discouraged, on penalty of death. :) Needs to be redone using preg_replace_callback
---

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index bc27d41d48..aad2963fbb 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -198,24 +198,6 @@ class LanguageConverter {
 
 	}
 	
-	/**
-	 * caption convert, base on preg_replace
-	 *
-	 * to convert text in "title" or "alt", like '<img alt="text" ... '
-	 * or '<span title="text" ... '
-	 *
-	 * @param string $title the "title" or "alt" text
-	 * @param string $text the text to be converted
-	 * @param string $toVariant the target language code
-	 * @return string like ' alt="yyyy"' or ' title="yyyy"'
-	 */
-	protected function captionConvert( $title, $text, $toVariant ) {
-		// we convert captions except URL
-		if( !strpos( $text, '://' ) )
-			$text = $this->translate($text, $toVariant);
-		return " $title=\"$text\"";
-	}
-
 	/**
 	 * dictionary-based conversion
 	 *
@@ -266,14 +248,8 @@ class LanguageConverter {
 
 		$ret = $this->translate($m[0], $toVariant);
 		$mstart = $m[1]+strlen($m[0]);
-		
-		// enable convertsion of '<img alt="xxxx" ... ' or '<span title="xxxx" ... '
-		$captionpattern  = '/\s(title|alt)\s*=\s*"([\s\S]*?)"/e';
-		$replacement = "\$this->captionConvert('\\1', '\\2', \$toVariant)";
 		foreach($matches as $m) {
-			$mark = substr($text, $mstart, $m[1]-$mstart);
-			$mark = preg_replace($captionpattern, $replacement, $mark);
-			$ret .= $mark;
+			$ret .= substr($text, $mstart, $m[1]-$mstart);
 			$ret .= $this->translate($m[0], $toVariant);
 			$mstart = $m[1] + strlen($m[0]);
 		}