Index: /CKEditor/branches/prototype/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/image/dialogs/image.js	(revision 2724)
+++ /CKEditor/branches/prototype/_source/plugins/image/dialogs/image.js	(revision 2725)
@@ -35,4 +35,13 @@
 		{
 		},
+		
+		onLoad : function( )
+		{
+			if ( !imageDialog )
+				this.hidePage( 'Link' );		//Hide Link tab.
+
+			if ( editor.config.imageUpload == false )
+				this.hidePage( 'Upload' );		//Hide Upload tab.
+		},	
 		contents : [
 			{