r82225 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r82224‎ | r82225 | r82226 >
Date:08:01, 16 February 2011
Author:catrope
Status:ok
Tags:
Comment:
1.17wmf1: Commit FlaggedRevs live hacks to make it work with RL. None of these are needed in trunk if FR has already been RL-ified there (has it?)
Modified paths:
  • /branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedRevs.class.php (modified) (history)
  • /branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedRevs.hooks.php (modified) (history)
  • /branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedRevs.php (modified) (history)
  • /branches/wmf/1.17wmf1/extensions/FlaggedRevs/client/flaggedrevs.css (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedRevs.php
@@ -205,8 +205,8 @@
206206 $wgRemoveGroups['bureaucrat'][] = 'reviewer';
207207
208208 # URL location for flaggedrevs.css and flaggedrevs.js
209 -# Use a literal $wgScriptPath as a placeholder for the runtime value of $wgScriptPath
210 -$wgFlaggedRevsStylePath = '$wgScriptPath/extensions/FlaggedRevs/client';
 209+# Use a literal $wgExtensionAssetsPath as a placeholder for the runtime value of $wgExtensionAssetsPath
 210+$wgFlaggedRevsStylePath = '$wgExtensionAssetsPath/FlaggedRevs/client';
211211
212212 # How far the logs for overseeing quality revisions and depreciations go
213213 $wgFlaggedRevsOversightAge = 30 * 24 * 3600;
@@ -250,7 +250,7 @@
251251 $wgAvailableRights[] = 'stablesettings';
252252
253253 # Bump this number every time you change flaggedrevs.css/flaggedrevs.js
254 -$wgFlaggedRevStyleVersion = 86;
 254+$wgFlaggedRevStyleVersion = 87;
255255
256256 $wgExtensionFunctions[] = 'efLoadFlaggedRevs';
257257
Index: branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedRevs.class.php
@@ -361,8 +361,8 @@
362362 * @return string
363363 */
364364 public static function styleUrlPath() {
365 - global $wgFlaggedRevsStylePath, $wgScriptPath;
366 - return str_replace( '$wgScriptPath', $wgScriptPath, $wgFlaggedRevsStylePath );
 365+ global $wgFlaggedRevsStylePath, $wgExtensionAssetsPath;
 366+ return str_replace( '$wgExtensionAssetsPath', $wgExtensionAssetsPath, $wgFlaggedRevsStylePath );
367367 }
368368
369369 # ################ Permission functions #################
Index: branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedRevs.hooks.php
@@ -145,9 +145,9 @@
146146 'Watchlist', 'Recentchanges', 'Contributions', 'Recentchangeslinked' );
147147 foreach ( $spPages as $key ) {
148148 if ( $title->isSpecial( $key ) ) {
149 - global $wgScriptPath, $wgFlaggedRevsStylePath, $wgFlaggedRevStyleVersion;
150 - $stylePath = str_replace( '$wgScriptPath',
151 - $wgScriptPath, $wgFlaggedRevsStylePath );
 149+ global $wgExtensionAssetsPath, $wgFlaggedRevsStylePath, $wgFlaggedRevStyleVersion;
 150+ $stylePath = str_replace( '$wgExtensionAssetsPath',
 151+ $wgExtensionAssetsPath, $wgFlaggedRevsStylePath );
152152 $encCssFile = htmlspecialchars( "$stylePath/flaggedrevs.css?" .
153153 $wgFlaggedRevStyleVersion );
154154 $out->addExtensionStyle( $encCssFile );
Index: branches/wmf/1.17wmf1/extensions/FlaggedRevs/client/flaggedrevs.css
@@ -38,6 +38,10 @@
3939 width: 100%;
4040 clear: both;
4141 }
 42+.rtl table.flaggedrevs_editnotice,
 43+.rtl table.flaggedrevs_viewnotice {
 44+ text-align: right;
 45+}
4246
4347 div.flaggedrevs_diffnotice,
4448 div.flaggedrevs_preview {

Follow-up revisions

RevisionCommit summaryAuthorDate
r85009Merge changes from 1.17wmf1 during deployment period: r81760, r81761, r81954,...demon14:19, 30 March 2011

Status & tagging log