Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 534)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 535)
@@ -440,4 +440,20 @@
 class FCKeditorParser extends Parser
 {
+    private $FCKeditorMagicWords = array(
+            '__NOTOC__',
+            '__FORCETOC__',
+            '__NOEDITSECTION__',
+            '__START__',
+            '__NOTITLECONVERT__',
+            '__NOCONTENTCONVERT__',
+            '__END__',
+            '__TOC__',
+            '__NOTC__',
+            '__NOCC__',
+            "__FORCETOC__",
+            "__NEWSECTIONLINK__",
+            "__NOGALLERY__",
+    );
+    
     function replaceInternalLinks( $text ) {
         return parent::replaceInternalLinks($text);
@@ -448,6 +464,13 @@
     function stripNoGallery($text) {}
     function stripToc( $text ) {
-    	//return '<span class="fck_magic">' . $text . '</span>';
-    	return $text;
+        $prefix = '<span class="fck_magic">';
+        $suffix = '</span>';
+        
+        $strtr = array();
+        foreach ($this->FCKeditorMagicWords as $word) {
+            $strtr[$word] = $prefix . $word . $suffix;
+        }
+        
+        return strtr( $text, $strtr );
     }
     function strip( $text, $state, $stripcomments = false , $dontstrip = array () ) {