Index: /MediaWiki/trunk/FCKeditorParser.body.php
===================================================================
--- /MediaWiki/trunk/FCKeditorParser.body.php	(revision 1835)
+++ /MediaWiki/trunk/FCKeditorParser.body.php	(revision 1836)
@@ -197,5 +197,6 @@
 						break;
 					case 'gallery':
-						$output = $this->renderImageGallery( $content, $params );
+						$output = $this->fck_wikiTag('gallery', $content, $params); //required by FCKeditor
+						//$output = $this->renderImageGallery( $content, $params );
 						break;
 					default:
Index: /MediaWiki/trunk/FCKeditorSajax.body.php
===================================================================
--- /MediaWiki/trunk/FCKeditorSajax.body.php	(revision 1835)
+++ /MediaWiki/trunk/FCKeditorSajax.body.php	(revision 1836)
@@ -43,5 +43,5 @@
 	global $wgParser;
 
-	$ret = "nowiki\nincludeonly\nonlyinclude\nnoinclude\n";
+	$ret = "nowiki\nincludeonly\nonlyinclude\nnoinclude\ngallery\n";
 	foreach ($wgParser->getTags() as $h) {
 		if (!in_array($h, array("pre", "math", "ref", "references"))) {
Index: /MediaWiki/trunk/fckeditor_config.js
===================================================================
--- /MediaWiki/trunk/fckeditor_config.js	(revision 1835)
+++ /MediaWiki/trunk/fckeditor_config.js	(revision 1836)
@@ -37,5 +37,5 @@
 
 FCKConfig.EditorAreaStyles = '\
-.FCK__MWTemplate, .FCK__MWRef, .FCK__MWSpecial, .FCK__MWReferences, .FCK__MWNowiki, .FCK__MWIncludeonly, .FCK__MWNoinclude, .FCK__MWOnlyinclude \
+.FCK__MWTemplate, .FCK__MWRef, .FCK__MWSpecial, .FCK__MWReferences, .FCK__MWNowiki, .FCK__MWIncludeonly, .FCK__MWNoinclude, .FCK__MWOnlyinclude, .FCK__MWGallery \
 { \
 	border: 1px dotted #00F; \
@@ -80,4 +80,10 @@
 	height: 15px; \
 } \
+.FCK__MWGallery \
+{ \
+	background-image: url(' + FCKConfig.PluginsPath + 'mediawiki/images/icon_gallery.gif); \
+	width: 66px; \
+	height: 15px; \
+} \
 .FCK__MWOnlyinclude \
 { \
Index: /MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php
===================================================================
--- /MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php	(revision 1835)
+++ /MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php	(revision 1836)
@@ -197,5 +197,6 @@
 						break;
 					case 'gallery':
-						$output = $this->renderImageGallery( $content, $params );
+						$output = $this->fck_wikiTag('gallery', $content, $params); //required by FCKeditor
+						//$output = $this->renderImageGallery( $content, $params );
 						break;
 					default:
Index: /MediaWiki/trunk/plugins/mediawiki/dialogs/special.html
===================================================================
--- /MediaWiki/trunk/plugins/mediawiki/dialogs/special.html	(revision 1835)
+++ /MediaWiki/trunk/plugins/mediawiki/dialogs/special.html	(revision 1836)
@@ -66,4 +66,9 @@
 			sFakeClass = 'FCK__MWNoinclude';
 		}
+		else if ( oFakeImage.getAttribute('_fck_mw_gallery') )
+		{
+			oTemplateSpan = FCK.GetRealElement( oFakeImage ) ;
+			sFakeClass = 'FCK__MWGallery';
+		}
 		else if ( oFakeImage.getAttribute('_fck_mw_onlyinclude') )
 		{
@@ -159,4 +164,7 @@
 		case 'noinclude':
 		sFakeClass = 'FCK__MWNoinclude';
+		break;
+		case 'gallery':
+		sFakeClass = 'FCK__MWGallery';
 		break;
 		case 'nowiki':
Index: /MediaWiki/trunk/plugins/mediawiki/fckplugin.js
===================================================================
--- /MediaWiki/trunk/plugins/mediawiki/fckplugin.js	(revision 1835)
+++ /MediaWiki/trunk/plugins/mediawiki/fckplugin.js	(revision 1836)
@@ -456,4 +456,8 @@
 									break ;
 
+								case 'fck_mw_gallery' :
+									sNodeName = 'gallery' ;
+									break ;
+									
 								case 'fck_mw_onlyinclude' :
 									sNodeName = 'onlyinclude' ;
@@ -695,17 +699,16 @@
 			case 'fck_mw_nowiki' :
 				if ( className == null )
-					//className = 'FCK__MWSpecial' ;
 					className = 'FCK__MWNowiki' ;
 			case 'fck_mw_includeonly' :
 				if ( className == null )
-					//className = 'FCK__MWSpecial' ;
 					className = 'FCK__MWIncludeonly' ;
+			case 'fck_mw_gallery' :
+				if ( className == null )
+					className = 'FCK__MWGallery' ;
 			case 'fck_mw_noinclude' :
 				if ( className == null )
-					//className = 'FCK__MWSpecial' ;
 					className = 'FCK__MWNoinclude' ;
 			case 'fck_mw_onlyinclude' :
 				if ( className == null )
-					//className = 'FCK__MWSpecial' ;
 					className = 'FCK__MWOnlyinclude' ;
 					
@@ -746,5 +749,5 @@
 				contextMenu.AddItem( 'MW_Math', 'Edit Formula' ) ;
 			}
-			if ( tag.getAttribute( '_fck_mw_special' ) || tag.getAttribute( '_fck_mw_nowiki' ) || tag.getAttribute( '_fck_mw_includeonly' ) || tag.getAttribute( '_fck_mw_noinclude' ) || tag.getAttribute( '_fck_mw_onlyinclude' )) //YC
+			if ( tag.getAttribute( '_fck_mw_special' ) || tag.getAttribute( '_fck_mw_nowiki' ) || tag.getAttribute( '_fck_mw_includeonly' ) || tag.getAttribute( '_fck_mw_noinclude' ) || tag.getAttribute( '_fck_mw_onlyinclude' ) || tag.getAttribute( '_fck_mw_gallery' )) //YC
 			{
 				contextMenu.AddSeparator() ;