Index: fckeditor.config.js
===================================================================
--- fckeditor.config.js	(revision 21)
+++ fckeditor.config.js	(working copy)
@@ -31,7 +31,7 @@
 ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],
 ['JustifyLeft','JustifyCenter','JustifyRight'],
 ['Link','Unlink','Anchor'],
-['Image','Flash','Table','Rule','SpecialChar','DrupalBreak'],
+['Image','Flash','Table','Rule','SpecialChar','DrupalBreak','ImageAssist'],
 //uncomment this line to enable teaser break and page break buttons
 //remember to load appropriate plugins with FCKConfig.Plugins.Add command a couple of lines below
 //['Image','Flash','Table','Rule','SpecialChar','DrupalBreak','DrupalPageBreak'],
@@ -41,7 +41,7 @@
 ] ;
 
 FCKConfig.ToolbarSets['DrupalBasic'] = [
-['FontFormat','-','Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink', 'Image']
+['FontFormat','-','Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink', 'Image','ImageAssist']
 ] ;
 
 //This toolbar should work fine with "Filtered HTML" filter
@@ -50,7 +50,7 @@
 ['Cut','Copy','Paste','PasteText','PasteWord'],
 ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
 ['Link','Unlink','Anchor'],
-['Image','Flash','Table','Rule','Smiley','SpecialChar'],
+['Image','Flash','Table','Rule','Smiley','SpecialChar','ImageAssist'],
 '/',
 ['FontFormat'],
 ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
@@ -87,4 +87,4 @@
 // [ Left, Center, Right, Justified ]
 FCKConfig.JustifyClasses = ['rteleft','rtecenter','rteright','rtejustify'] ;
 //Set to 'encode' if you want to obfuscate emails with javascript
-FCKConfig.EMailProtection = 'none' ;
\ No newline at end of file
+FCKConfig.EMailProtection = 'none' ;
Index: plugins/imgassist/fckplugin.js
===================================================================
--- plugins/imgassist/fckplugin.js	(revision 21)
+++ plugins/imgassist/fckplugin.js	(working copy)
@@ -176,35 +176,28 @@
 /*
  * Plugin: add image_assist button
  */
-var FCKimageAssist = function(){
-  this.EditMode = FCK.EditMode;
+var FCKimageAssist = function(){}
+// Define the command.
+FCKimageAssist.prototype.GetState = function(){
+  return ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
 }
-
+var oIAItem = new FCKToolbarButton( 'ImageAssist', 'Image Assist', null, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
 var imgAssistIcon= top.document.getElementById('img_assist-link-' + FCK.Config['TextareaID']);
-if (imgAssistIcon){
-
-  FCKimageAssist.prototype.Execute = function(){
-    if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ) {
-      return ;
-    }
-    ia_icon = top.document.getElementById('img_assist-link-' + FCK.Config['TextareaID']);
-    ia_href = ia_icon.getAttribute("href");
-    top.window.open(ia_href, 'img_assist_link', 'width=600,height=350,scrollbars=yes,status=yes,resizable=yes,toolbar=no,menubar=no');
-  }
-  // Define the command.
-  FCKimageAssist.prototype.GetState = function(){
-    return ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
-  }
-  FCKCommands.RegisterCommand( 'ImageAssist', new FCKimageAssist() ) ;
-
-  var oIAItem = new FCKToolbarButton( 'ImageAssist', 'Image Assist', null, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
-  oIAItem.IconPath = FCKConfig.PluginsPath + 'imgassist/imgassist_small.gif';
-  // Create the ImageAssist buttons.
-  FCKToolbarItems.RegisterItem( 'ImageAssist', oIAItem ) ;
-
-  addToolbarElement('ImageAssist', 'Basic', 0);
-  addToolbarElement('ImageAssist', 'DrupalBasic', 0);
-  addToolbarElement('ImageAssist', 'Default', 4);
-  addToolbarElement('ImageAssist', 'DrupalFiltered', 0);
-  addToolbarElement('ImageAssist', 'DrupalFull', 0);
+if (!imgAssistIcon){
+	//hack to disable ImageAssist  button
+	oIAItem.Create = function()		{return 0;}
+	oIAItem.Disable  = function()	{return 0;} 
+	oIAItem.RefreshState  = function()	{return 0;} 
 }
+FCKimageAssist.prototype.Execute = function(){
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ) {
+		return ;
+	}
+	ia_icon = top.document.getElementById('img_assist-link-' + FCK.Config['TextareaID']);
+	ia_href = ia_icon.getAttribute("href");
+	top.window.open(ia_href, 'img_assist_link', 'width=600,height=350,scrollbars=yes,status=yes,resizable=yes,toolbar=no,menubar=no');
+}
+FCKCommands.RegisterCommand( 'ImageAssist', new FCKimageAssist() ) ;
+// Create the ImageAssist button.
+oIAItem.IconPath = FCKConfig.PluginsPath + 'imgassist/imgassist_small.gif';
+FCKToolbarItems.RegisterItem( 'ImageAssist', oIAItem ) ;