diff -crB origmediawiki-1.18.1/extensions/WikiEditor/WikiEditor.hooks.php mediawiki-1.18.1/extensions/WikiEditor/WikiEditor.hooks.php
*** origmediawiki-1.18.1/extensions/WikiEditor/WikiEditor.hooks.php	2011-04-22 17:40:18.000000000 +0530
--- mediawiki-1.18.1/extensions/WikiEditor/WikiEditor.hooks.php	2012-02-25 23:33:48.381855567 +0530
***************
*** 31,44 ****
  			),
  		),
  		'dialogs' => array(
- 			'preferences' => array(
- 				// Ideally this key would be 'wikieditor-toolbar-dialogs'
- 				'usebetatoolbar-cgd' => array(
- 					'type' => 'toggle',
- 					'label-message' => 'wikieditor-toolbar-dialogs-preference',
- 					'section' => 'editing/beta',
- 				),
- 			),
  			'requirements' => array(
  				'usebetatoolbar-cgd' => true,
  				'usebetatoolbar' => true,
--- 31,36 ----
***************
*** 221,227 ****
  	 */
  	public static function getPreferences( $user, &$defaultPreferences ) {
  		global $wgWikiEditorFeatures;
! 		
  		foreach ( self::$features as $name => $feature ) {
  			if (
  				isset( $feature['preferences'] ) &&
--- 213,219 ----
  	 */
  	public static function getPreferences( $user, &$defaultPreferences ) {
  		global $wgWikiEditorFeatures;
! 
  		foreach ( self::$features as $name => $feature ) {
  			if (
  				isset( $feature['preferences'] ) &&
Only in mediawiki-1.18.1/extensions/WikiEditor: WikiEditor.hooks.php~
diff -crB origmediawiki-1.18.1/extensions/WikiEditor/WikiEditor.php mediawiki-1.18.1/extensions/WikiEditor/WikiEditor.php
*** origmediawiki-1.18.1/extensions/WikiEditor/WikiEditor.php	2011-11-09 20:21:56.000000000 +0530
--- mediawiki-1.18.1/extensions/WikiEditor/WikiEditor.php	2012-02-25 22:31:36.261796232 +0530
***************
*** 22,28 ****
  	
  	'toolbar' => array( 'global' => false, 'user' => true ),
  	// Provides interactive tools
! 	'dialogs' => array( 'global' => false, 'user' => true ),
  	// Hide signature button from main namespace
  	'hidesig' => array( 'global' => true, 'user' => false ),
  	
--- 22,28 ----
  	
  	'toolbar' => array( 'global' => false, 'user' => true ),
  	// Provides interactive tools
! 	'dialogs' => array( 'global' => true, 'user' => true ),
  	// Hide signature button from main namespace
  	'hidesig' => array( 'global' => true, 'user' => false ),
  	
Only in mediawiki-1.18.1/extensions/WikiEditor: WikiEditor.php~
Only in mediawiki-1.18.1: LocalSettings.php
Only in mediawiki-1.18.1: LocalSettings.php~