Index: /CKEditor/trunk/_source/skins/default/skin.js
===================================================================
--- /CKEditor/trunk/_source/skins/default/skin.js	(revision 2960)
+++ /CKEditor/trunk/_source/skins/default/skin.js	(revision 2961)
@@ -40,68 +40,71 @@
 				element.setStyle( 'height', height + 'px' );
 		};
+	
+	if ( CKEDITOR.dialog )
+	{
+		CKEDITOR.dialog.setMargins( 0, 14, 18, 14 );
 
-	CKEDITOR.dialog.setMargins( 0, 14, 18, 14 );
+		CKEDITOR.dialog.on( 'resize', function( evt )
+			{
+				var data = evt.data,
+					width = data.width,
+					height = data.height,
+					dialog = data.dialog,
+					standardsMode = ( CKEDITOR.document.$.compatMode == 'CSS1Compat' );
+				if ( data.skin != skinName )
+					return;
 
-	CKEDITOR.dialog.on( 'resize', function( evt )
-		{
-			var data = evt.data,
-				width = data.width,
-				height = data.height,
-				dialog = data.dialog,
-				standardsMode = ( CKEDITOR.document.$.compatMode == 'CSS1Compat' );
-			if ( data.skin != skinName )
-				return;
+				// Dialog parts dimensions.
+				//  16x16  |  ?x16  |  16x16
+				//  16x?   |  ?x?   |  16x?
+				//  30x51  |  ?x51  |  30x51
+				setSize( dialog, 't', width - 32, 16 );
+				setSize( dialog, 't_resize', width - 32, null );
+				setSize( dialog, 'l', 16, height - 67 );
+				setSize( dialog, 'l_resize', null, height - 22 );
+				setSize( dialog, 'c', width - 32, height - 67 );
+				setSize( dialog, 'r', 16, height - 67 );
+				setSize( dialog, 'r_resize', null, height - 22 );
+				setSize( dialog, 'b', width - 60, 51 );
+				setSize( dialog, 'b_resize', width - 32, null );
+				setSize( dialog, 'tabs_table', width - 32, null );
 
-			// Dialog parts dimensions.
-			//  16x16  |  ?x16  |  16x16
-			//  16x?   |  ?x?   |  16x?
-			//  30x51  |  ?x51  |  30x51
-			setSize( dialog, 't', width - 32, 16 );
-			setSize( dialog, 't_resize', width - 32, null );
-			setSize( dialog, 'l', 16, height - 67 );
-			setSize( dialog, 'l_resize', null, height - 22 );
-			setSize( dialog, 'c', width - 32, height - 67 );
-			setSize( dialog, 'r', 16, height - 67 );
-			setSize( dialog, 'r_resize', null, height - 22 );
-			setSize( dialog, 'b', width - 60, 51 );
-			setSize( dialog, 'b_resize', width - 32, null );
-			setSize( dialog, 'tabs_table', width - 32, null );
+				/*
+				 * Although the following fix seems to be for IE6 only, it's also for IE7.
+				 * While IE7 can render DIV nodes with left: and right: defined, it cannot
+				 * put 100% height TABLES correctly inside those DIVs. Unless the width is
+				 * set as well.
+				 */
+				if ( CKEDITOR.env.ie )
+				{
+					var contentWidth = width - 34,
+						contentHeight = dialog.getPageCount() > 1 ? height - 106 : height - 84,
+						contentsLength = dialog.parts.contents.getChildCount();
 
-			/*
-			 * Although the following fix seems to be for IE6 only, it's also for IE7.
-			 * While IE7 can render DIV nodes with left: and right: defined, it cannot
-			 * put 100% height TABLES correctly inside those DIVs. Unless the width is
-			 * set as well.
-			 */
-			if ( CKEDITOR.env.ie )
-			{
-				var contentWidth = width - 34,
-					contentHeight = dialog.getPageCount() > 1 ? height - 106 : height - 84,
-					contentsLength = dialog.parts.contents.getChildCount();
+					if ( !standardsMode )
+					{
+						contentWidth += 2;
+						contentHeight += 2;
+						dialog.parts.tabs.setStyle( 'top', '33px' );
+					}
 
-				if ( !standardsMode )
-				{
-					contentWidth += 2;
-					contentHeight += 2;
-					dialog.parts.tabs.setStyle( 'top', '33px' );
+					setSize( dialog, 'title', standardsMode ? width - 52 : width - 32, standardsMode ? null : 31 );
+					setSize( dialog, 'contents', contentWidth, contentHeight );
+					setSize( dialog, 'footer', width - 32);
+
+					for ( var i = 0 ; i < contentsLength ; i++ )
+					{
+						var child = dialog.parts.contents.getChild( i );
+						if ( ( child instanceof CKEDITOR.dom.element ) && ( child.$.className || '' ).search( 'cke_dialog_page_contents' ) > -1 )
+							child.setStyles(
+								{
+									width : contentWidth - ( standardsMode ? 20 : 0 ) + 'px',
+									height : contentHeight - ( standardsMode ? 20 : 0 ) + 'px'
+								} );
+					}
 				}
 
-				setSize( dialog, 'title', standardsMode ? width - 52 : width - 32, standardsMode ? null : 31 );
-				setSize( dialog, 'contents', contentWidth, contentHeight );
-				setSize( dialog, 'footer', width - 32);
-
-				for ( var i = 0 ; i < contentsLength ; i++ )
-				{
-					var child = dialog.parts.contents.getChild( i );
-					if ( ( child instanceof CKEDITOR.dom.element ) && ( child.$.className || '' ).search( 'cke_dialog_page_contents' ) > -1 )
-						child.setStyles(
-							{
-								width : contentWidth - ( standardsMode ? 20 : 0 ) + 'px',
-								height : contentHeight - ( standardsMode ? 20 : 0 ) + 'px'
-							} );
-				}
-			}
-
-			setSize( dialog, null, width, height );
-		});
+				setSize( dialog, null, width, height );
+			});
+	}
 })();
Index: /CKEditor/trunk/config.js
===================================================================
--- /CKEditor/trunk/config.js	(revision 2960)
+++ /CKEditor/trunk/config.js	(revision 2961)
@@ -6,4 +6,8 @@
 CKEDITOR.editorConfig = function( config )
 {
+	// This is a temporary setting we'll have while moving plugins from the
+	// prototype to trunk.
+	config.plugins = '';
+
 	// Define changes to default configuration here. For example:
 	// config.autoLanguage = false;