German localisation patch by the incredible one.

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

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index ac38fa0..5f2e2fc 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -40,7 +40,7 @@ class LanguageConverter {
                $this->mMainLanguageCode = $maincode;
                $this->mVariants = $variants;
                $this->mVariantFallbacks = $variantfallbacks;
-               $this->mCacheKey = wfMemcKey( 'conversiontables' );
+               $this->mCacheKey = wfMemcKey( 'conversiontables', $maincode );
                $m = array('begin'=>'-{', 'flagsep'=>'|', 'codesep'=>':',
                                   'varsep'=>';', 'end'=>'}-');
                $this->mMarkup = array_merge($m, $markup);
@@ -165,8 +165,10 @@ class LanguageConverter {
 
                // disable convert to variants between <code></code> tags
                $codefix = '<code>.+?<\/code>|';
+               // disable convertsion of <script type="text/javascript"> ... </script>
+               $scriptfix = '<script.*?>.*?<\/script>|';
 
-               $reg = '/'.$codefix.'<[^>]+>|&[a-zA-Z#][a-z0-9]+;' . $marker . $htmlfix . '/s';
+               $reg = '/'.$codefix . $scriptfix . '<[^>]+>|&[a-zA-Z#][a-z0-9]+;' . $marker . $htmlfix . '/s';
        
                $matches = preg_split($reg, $text, -1, PREG_SPLIT_OFFSET_CAPTURE);