r56428 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r56427‎ | r56428 | r56429 >
Date:18:27, 16 September 2009
Author:catrope
Status:deferred
Tags:
Comment:
wmf-deployment-work: Merge r56426 (fix stupid mistake in r56417, which
was merged earlier) from trunk
Modified paths:
  • /branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar (modified) (history)
  • /branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php (modified) (history)
  • /branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js (modified) (history)

Diff [purge]

Index: branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
——@@ -219,7 +219,7 @@
220220 );
221221 }
222222
223 - if ( !$wgEditToolbarGlobalEnable && $wgEditToolbarUserEnable ) {
 223+ if ( !$wgEditToolbarCGDGlobalEnable && $wgEditToolbarCGDGlobalEnable ) {
224224 wfLoadExtensionMessages( 'EditToolbar' );
225225 $defaultPreferences['usebetatoolbar-cgd'] = array(
226226 'type' => 'toggle',
Property changes on: branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
___________________________________________________________________
Name: svn:mergeinfo
227227 - /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417,56424
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
228228 + /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417,56424,56426
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
Property changes on: branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar
___________________________________________________________________
Name: svn:mergeinfo
229229 - /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar:51646
/trunk/extensions/UsabilityInitiative/EditToolbar:56207,56209,56296,56333,56355,56424
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
230230 + /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar:51646
/trunk/extensions/UsabilityInitiative/EditToolbar:56207,56209,56296,56333,56355,56424,56426
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r56417UsabilityInitiative:...catrope15:33, 16 September 2009
r56426EditToolbar: Fix stupid copypaste mess-up from r56417catrope18:26, 16 September 2009

Status & tagging log