r103368 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103367‎ | r103368 | r103369 >
Date:19:58, 16 November 2011
Author:bsitu
Status:ok (Comments)
Tags:
Comment:
follow up to r103251, remove array when calling Message::rawParams() and use array style to construct query condition
Modified paths:
  • /trunk/extensions/MoodBar/SpecialFeedbackDashboard.php (modified) (history)

Diff [purge]

Index: trunk/extensions/MoodBar/SpecialFeedbackDashboard.php
@@ -264,11 +264,12 @@
265265 $feedback_hidden_detail = self::getFeedbackHiddenDetail($id);
266266 $timestamp = wfTimestamp( TS_DB, $feedback_hidden_detail->log_timestamp );
267267
268 - $footer = wfMessage('moodbar-hidden-footer')->rawParams( array( htmlspecialchars( $feedback_hidden_detail->log_user_text ),
269 - $wgLang->userDate($timestamp, $wgUser),
270 - $wgLang->userTime($timestamp, $wgUser),
271 - htmlspecialchars( $feedback_hidden_detail->log_comment ),
272 - $link ) )->escaped();
 268+ $footer = wfMessage('moodbar-hidden-footer')->
 269+ rawParams( htmlspecialchars( $feedback_hidden_detail->log_user_text ),
 270+ $wgLang->userDate($timestamp, $wgUser),
 271+ $wgLang->userTime($timestamp, $wgUser),
 272+ htmlspecialchars( $feedback_hidden_detail->log_comment ),
 273+ $link )->escaped();
273274 return Xml::tags( 'div', array( 'class' => 'error' ), $footer );
274275 } elseif ( $mode === 'hidden' ) {
275276 $linkText = wfMessage('moodbar-feedback-show')->escaped();
@@ -507,11 +508,14 @@
508509 protected static function getFeedbackHiddenDetail( $mbf_id ) {
509510 $dbr = wfGetDB( DB_SLAVE );
510511
511 - $res = $dbr->select( array( 'logging' ), array(
512 - 'log_user_text', 'log_timestamp', 'log_comment' ),
513 - array( "log_namespace = " . NS_SPECIAL . " AND log_title = 'FeedbackDashboard/" . intval( $mbf_id ) . "' AND log_action = 'hide' AND log_type = 'moodbar'" ),
514 - __METHOD__,
515 - array( 'LIMIT' => 1, 'ORDER BY' => "log_timestamp DESC" )
 512+ $res = $dbr->select( array( 'logging' ),
 513+ array( 'log_user_text', 'log_timestamp', 'log_comment' ),
 514+ array( 'log_namespace' => NS_SPECIAL,
 515+ 'log_title' => 'FeedbackDashboard/' . intval( $mbf_id ),
 516+ 'log_action' => 'hide',
 517+ 'log_type' => 'moodbar' ),
 518+ __METHOD__,
 519+ array( 'LIMIT' => 1, 'ORDER BY' => "log_timestamp DESC" )
516520 );
517521
518522 $rows = iterator_to_array( $res, /*$use_keys=*/false );

Follow-up revisions

RevisionCommit summaryAuthorDate
r103510follow up to r103368, add code to handle empty log for admin hide actionbsitu20:58, 17 November 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r103251Adding text to indicate which admin at what time hid a feedback along with re...bsitu22:45, 15 November 2011

Comments

#Comment by NeilK (talk | contribs)   20:05, 17 November 2011

In getFeedbackHiddenDetail, it seems that you could possibly return false or the empty array.

It doesn't seem that you are checking those values in the caller.

#Comment by NeilK (talk | contribs)   20:25, 17 November 2011

Actually, this would be easier if you just used $dbr->selectRow() which returns an object or false

Status & tagging log