Changeset 2388 for MediaWiki/trunk/FCKeditorParser.body.php

Timestamp:

2008-08-27 16:58:27 (4 months ago)

Author:

wwalc

Message:

Changed the way how FCKeditor is loaded + a couple of other bugfixes

Files:

• MediaWiki/trunk/FCKeditorParser.body.php (modified) (6 diffs)

MediaWiki/trunk/FCKeditorParser.body.php

@@ -154 +154 @@
          */
         function strip( $text, $state, $stripcomments = false , $dontstrip = array () ) {
-                global $wgContLang;
+                global $wgContLang, $wgUseTeX, $wgScriptPath;
 
                 wfProfileIn( __METHOD__ );
@@ -165 +165 @@
 
                 $elements = array_merge(
-                array( 'nowiki', 'gallery' ),
+                array( 'nowiki', 'gallery', 'math' ),
                 array_keys( $this->mTagHooks ) );
                 global $wgRawHtml;
                 if( $wgRawHtml ) {
                         $elements[] = 'html';
-                }
-                if( $this->mOptions->getUseTeX() ) {
-                        $elements[] = 'math';
                 }
 
@@ -210 +207 @@
                                                 break;
                                         case 'math':
-                                                $output = $wgContLang->armourMath( MathRenderer::renderMath( $content ) );
+                                                if($wgUseTeX){          //normal render
+                                                        $output = $wgContLang->armourMath( MathRenderer::renderMath( $content ) );
+                                                }else                           //show fakeimage
+                                                        $output = '<img _fckfakelement="true" class="FCK__MWMath" _fck_mw_math="'.$content.'" src="'.$wgScriptPath.'/skins/common/images/button_math.png" />';
                                                 break;
                                         case 'gallery':
@@ -307 +307 @@
 
         function replaceInternalLinks( $text ) {
+                $text = preg_replace("/\[\[:(.*?)\]\]/", "[[RTECOLON$1]]", $text);      //change ':' => 'RTECOLON' in links
                 return parent::replaceInternalLinks($text);
         }
@@ -374 +375 @@
                         foreach ($tags as $pos=>$type) {
                                 $sum += $type;
+                                if (!$pos) {
+                                        $opened = 0;
+                                        $closed = 0;
+                                }
+                                else {
+                                        $opened = substr_count($text, '[', 0, $pos);                    //count [ 
+                                        $closed = substr_count($text, ']', 0, $pos);                    //count ]
+                                }
                                 if ($sum == 1 && $lastSum == 0) {
                                         $stringToParse .= strtr(substr($text, $startingPos, $pos - $startingPos), $strtr);
@@ -382 +391 @@
                                         $inner = htmlspecialchars(strtr(substr($text, $startingPos, $pos - $startingPos + 19), $strtr));
                                         $this->fck_mw_strtr_span['href="Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw"'] = 'href="'.$inner.'"';
-                                        $this->fck_mw_strtr_span['Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw'] = '<span class="fck_mw_template">'.str_replace(array("\r\n", "\n", "\r"),"fckLR",$inner).'</span>';
+                                        if($opened <= $closed) {                                                // {{template}} is NOT in [] or [[]]
+                                                $this->fck_mw_strtr_span['Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw'] = '<span class="fck_mw_template">'.str_replace(array("\r\n", "\n", "\r"),"fckLR",$inner).'</span>';
+                                        }else{
+                                                $this->fck_mw_strtr_span['Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw'] = str_replace(array("\r\n", "\n", "\r"),"fckLR",$inner);
+                                        }
                                         $startingPos = $pos + 19;
                                         $this->fck_mw_strtr_span_counter++;