r98497 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r98496‎ | r98497 | r98498 >
Date:00:50, 30 September 2011
Author:aaron
Status:ok (Comments)
Tags:
Comment:
More PHPStorm fixes
Modified paths:
  • /trunk/extensions/FlaggedRevs/api/FlaggedRevsApi.hooks.php (modified) (history)
  • /trunk/extensions/FlaggedRevs/dataclasses/FlaggedRevs.hooks.php (modified) (history)
  • /trunk/extensions/FlaggedRevs/maintenance/fixBug28348.inc (modified) (history)
  • /trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php (modified) (history)
  • /trunk/extensions/FlaggedRevs/presentation/specialpages/reports/PendingChanges_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/FlaggedRevs/maintenance/fixBug28348.inc
@@ -45,7 +45,7 @@
4646 if ( $file ) {
4747 echo "fixed file {$row->fi_name} reference in rev ID {$row->fi_rev_id}\n";
4848 # Fix the fi_img_timestamp value...
49 - $dbw->update( 'flaggedimages',
 49+ $db->update( 'flaggedimages',
5050 array( 'fi_img_timestamp' => $dbw->timestamp( $time ) ),
5151 array( 'fi_rev_id' => $row->fi_rev_id, 'fi_name' => $row->fi_name ),
5252 __METHOD__
Index: trunk/extensions/FlaggedRevs/dataclasses/FlaggedRevs.hooks.php
@@ -192,8 +192,6 @@
193193 if ( $title->getNamespace() == NS_MEDIA ) {
194194 $title = Title::makeTitle( NS_FILE, $title->getDBkey() );
195195 $title->resetArticleId( $title->getArticleId() ); // avoid extra queries
196 - } else {
197 - $title =& $title;
198196 }
199197 $time = $sha1 = false; // current version
200198 # Check for the version of this file used when reviewed...
Index: trunk/extensions/FlaggedRevs/api/FlaggedRevsApi.hooks.php
@@ -55,6 +55,7 @@
5656 ) );
5757 $module->addWhere( 'fr_user=user_id' );
5858
 59+ $where = array();
5960 // Construct WHERE-clause to avoid multiplying the number of scanned rows
6061 // as flaggedrevs table has composite primary key (fr_page_id,fr_rev_id)
6162 foreach ( $pageids as $pageid => $revids ) {
Index: trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
@@ -542,7 +542,7 @@
543543 {
544544 return true; // confirm that page is in reviewable namespace
545545 }
546 - $rlink = '';
 546+ $rlink = $css = '';
547547 // page is not reviewed
548548 if ( $rc->mAttribs['fp_stable'] == null ) {
549549 // Is this a config were pages start off reviewable?
Index: trunk/extensions/FlaggedRevs/presentation/specialpages/reports/PendingChanges_body.php
@@ -24,6 +24,8 @@
2525 $this->watched = $wgRequest->getCheck( 'watched' );
2626 $this->stable = $wgRequest->getCheck( 'stable' );
2727 $feedType = $wgRequest->getVal( 'feed' );
 28+
 29+ $incLimit = 0;
2830 if ( $this->including() ) {
2931 $incLimit = $this->parseParams( $par ); // apply non-URL params
3032 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r98801FU r98497 another instance of dbw bogus varaaron20:35, 3 October 2011
r98803MFT r98497, r98801 fixes of bogus dbw varaaron20:39, 3 October 2011
r100383REL1_18 MFT r97886, r97899, r97969, r98179, r98497, r98654, r98773, r98801, r...reedy21:36, 20 October 2011

Comments

#Comment by Aaron Schulz (talk | contribs)   03:21, 4 October 2011

The fixBug28348.inc one is important.

Status & tagging log