Index: wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js
===================================================================
--- wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js	(revision 19145)
+++ wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js	(working copy)
@@ -9,7 +9,10 @@
 		mceTout : 0,
 
 		init : function(ed, url) {
-			var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML;
+			var t = this, tbId = [], last = 0, moreHTML, nextpageHTML;
+			tbId[0] = ed.getParam('wordpress_adv_toolbar', 'toolbar2');
+			tbId[1] = ed.getParam('wordpress_adv_toolbar', 'toolbar3');
+			tbId[2] = ed.getParam('wordpress_adv_toolbar', 'toolbar4');
 			moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
 			nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
 
@@ -18,10 +21,14 @@
 
 			// Hides the specified toolbar and resizes the iframe
 			ed.onPostRender.add(function() {
-				var adv_toolbar = ed.controlManager.get(tbId);
-				if ( ed.getParam('wordpress_adv_hidden', 1) && adv_toolbar ) {
-					DOM.hide(adv_toolbar.id);
-					t._resizeIframe(ed, tbId, 28);
+				for( var k in tbId ) {
+					if ( typeof ed.controlManager.get( tbId[k] ) == 'undefined' )
+						continue;
+					var adv_toolbar = ed.controlManager.get(tbId[k]);
+					if ( ed.getParam('wordpress_adv_hidden', 1) && adv_toolbar ) {
+						DOM.hide(adv_toolbar.id);
+						t._resizeIframe(ed, tbId[k], 28);
+					}
 				}
 			});
 
@@ -44,26 +51,30 @@
 			});
 
 			ed.addCommand('WP_Adv', function() {
-				var cm = ed.controlManager, id = cm.get(tbId).id;
+				var cm = ed.controlManager, id;
+				for( var k in tbId ) {
+					if ( typeof cm.get( tbId[k] ) == 'undefined' )
+						continue;
+					id = cm.get( tbId[k] ).id;
+					if ( 'undefined' == id )
+						continue;
 
-				if ( 'undefined' == id )
-					return;
-
-				if ( DOM.isHidden(id) ) {
-					cm.setActive('wp_adv', 1);
-					DOM.show(id);
-					t._resizeIframe(ed, tbId, -28);
-					ed.settings.wordpress_adv_hidden = 0;
-					setUserSetting('hidetb', '1');
-				} else {
-					cm.setActive('wp_adv', 0);
-					DOM.hide(id);
-					t._resizeIframe(ed, tbId, 28);
-					ed.settings.wordpress_adv_hidden = 1;
-					setUserSetting('hidetb', '0');
+					if ( DOM.isHidden(id) ) {
+						cm.setActive('wp_adv', 1);
+						DOM.show(id);
+						t._resizeIframe(ed, tbId, -28);
+						ed.settings.wordpress_adv_hidden = 0;
+						setUserSetting('hidetb', '1');
+					} else {
+						cm.setActive('wp_adv', 0);
+						DOM.hide(id);
+						t._resizeIframe(ed, tbId, 28);
+						ed.settings.wordpress_adv_hidden = 1;
+						setUserSetting('hidetb', '0');
+					}
 				}
 			});
-			
+
 			ed.addCommand('WP_Medialib', function() {
 				var id = ed.getParam('wp_fullscreen_editor_id') || ed.getParam('fullscreen_editor_id') || ed.id,
 					link = tinymce.DOM.select('#wp-' + id + '-media-buttons a.thickbox');
@@ -144,7 +155,7 @@
 					}
 				}
 			});
-			
+
 			ed.onInit.add(function(ed) {
 				// make sure these run last
 				ed.onNodeChange.add( function(ed, cm, e) {
@@ -404,4 +415,3 @@
 	// Register plugin
 	tinymce.PluginManager.add('wordpress', tinymce.plugins.WordPress);
 })();
-
