Ticket #2508: 2508.patch

FCKeditorParser.body.php

@@ -153 +153 @@
          * @private
          */
         function strip( $text, $state, $stripcomments = false , $dontstrip = array () ) {
-                global $wgContLang, $wgUseTeX, $wgScriptPath;
+                global $wgContLang, $wgUseTeX, $wgScriptPath, $showRef;
 
                 wfProfileIn( __METHOD__ );
                 $render = ($this->mOutputType == OT_HTML);
@@ -166 +166 @@
                 $elements = array_merge(
                 array( 'nowiki', 'gallery', 'math' ),
                 array_keys( $this->mTagHooks ) );
+                if( $showRef )
+                        $elements = array_merge( $elements, array( 'ref', 'references' ) );
                 global $wgRawHtml;
                 if( $wgRawHtml ) {
                         $elements[] = 'html';
@@ -177 +179 @@
                         unset ( $elements[$k] );
                 }
 
+                $elements = array_unique($elements);    
                 $matches = array();
                 $text = Parser::extractTagsAndParams( $elements, $text, $matches, $uniq_prefix );
 
@@ -196 +199 @@
                                                         $output = "$tag-->";
                                                 }
                                                 break;
+                                        case 'references':
+                                                        $output = $this->fck_wikiTag('references', $content, $params);
+                                                break;
+                                        case 'ref':
+                                                        $output = $this->fck_wikiTag('ref', $content, $params);
+                                                break;
                                         case 'html':
                                                 if( $wgRawHtml ) {
                                                         $output = $this->fck_wikiTag('html', $content, $params);

mw12/FCKeditorParser_OldPP.body.php

@@ -154 +154 @@
          * @private
          */
         function strip( $text, $state, $stripcomments = false , $dontstrip = array () ) {
-                global $wgContLang, $wgUseTeX, $wgScriptPath;
+                global $wgContLang, $wgUseTeX, $wgScriptPath, $showRef;
 
                 wfProfileIn( __METHOD__ );
                 $render = ($this->mOutputType == OT_HTML);
@@ -167 +167 @@
                 $elements = array_merge(
                 array( 'nowiki', 'gallery', 'math' ),
                 array_keys( $this->mTagHooks ) );
+                if( $showRef )
+                        $elements = array_merge( $elements, array( 'ref', 'references' ) );
                 global $wgRawHtml;
                 if( $wgRawHtml ) {
                         $elements[] = 'html';
@@ -178 +180 @@
                         unset ( $elements[$k] );
                 }
 
+                $elements = array_unique($elements);    
                 $matches = array();
                 $text = self::extractTagsAndParams( $elements, $text, $matches, $uniq_prefix );
 
@@ -197 +200 @@
                                                         $output = "$tag-->";
                                                 }
                                                 break;
+                                        case 'references':
+                                                        $output = $this->fck_wikiTag('references', $content, $params);
+                                                break;
+                                        case 'ref':
+                                                        $output = $this->fck_wikiTag('ref', $content, $params);
+                                                break;
                                         case 'html':
                                                 if( $wgRawHtml ) {
                                                         $output = $this->fck_wikiTag('html', $content, $params);