* Restriction types now use restriction-* messages instead of ui messages

[lhc/web/wiklou.git] / languages / LanguageConverter.php

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 515a298..1992d7e 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -135,8 +135,17 @@ class LanguageConverter {
                if(!in_array($toVariant, $this->mVariants))
                        return $text;
 
-
-               $reg = '/<[^>]+>|&[a-z#][a-z0-9]+;|'.UNIQ_PREFIX.'-[a-zA-Z0-9]+/';
+               /* we convert everything except:
+                  1. html markups (anything between < and >)
+                  2. html entities
+                  3. place holders created by the parser
+               */
+               global $wgParser;
+               if (isset($wgParser))
+                       $marker = '|' . $wgParser->UniqPrefix() . '[\-a-zA-Z0-9]+';
+               else
+                       $marker = "";
+               $reg = '/<[^>]+>|&[a-z#][a-z0-9]+;' . $marker . '/';
                $matches = preg_split($reg, $text, -1, PREG_SPLIT_OFFSET_CAPTURE);
 
 
@@ -434,7 +443,7 @@ class LanguageConverter {
      */
        function loadDefaultTables() {
                $name = get_class($this);
-               die("Must implement loadDefaultTables() method in class $name");
+               wfDie("Must implement loadDefaultTables() method in class $name");
        }
 
        /**