From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 13 Sep 2005 01:57:28 +0000 (+0000)
Subject: * (bug 1512) Disable x-code interp on Esperanto URLs for now, it does more
X-Git-Tag: 1.6.0~1661
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=162e6618d1f6d2715b24f2bc2de13487ee82fa7f;p=lhc%2Fweb%2Fwiklou.git

* (bug 1512) Disable x-code interp on Esperanto URLs for now, it does more
  harm than good under current system by breaking incoming URLs with "ux".
  (Editing is not affected, just URLs.)
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dfbf3e02bc..ef4d997725 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -101,6 +101,9 @@ fully support the editing toolbar, but was found to be too confusing.
 * Use the real file link instead of the default-size rasterized version for
   large SVG images on image description page
 * Include the file name/type/size line for non-resized images
+* (bug 1512) Disable x-code interp on Esperanto URLs for now, it does more
+  harm than good under current system by breaking incoming URLs with "ux".
+  (Editing is not affected, just URLs.)
 
 
 === Caveats ===
diff --git a/languages/LanguageEo.php b/languages/LanguageEo.php
index ea66bb21fe..8f7b31fa8e 100644
--- a/languages/LanguageEo.php
+++ b/languages/LanguageEo.php
@@ -1000,8 +1000,8 @@ class LanguageEo extends LanguageUtf8 {
 			return $s;
 		}
 
-		if( preg_match( '/[cghjsu]x/i', $s ) )
-			return $this->iconv( 'x', 'utf-8', $s );
+		//if( preg_match( '/[cghjsu]x/i', $s ) )
+		//	return $this->iconv( 'x', 'utf-8', $s );
 		return $s;
 	}