Revision: 50043
Author: aaron
Date: 2009-04-29 15:14:04 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
Cleaned up addToHistLine() perms and $skin var cruft.
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2009-04-29 13:43:37 UTC
(rev 50042)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2009-04-29 15:14:04 UTC
(rev 50043)
@@ -1150,10 +1150,16 @@
* @param Row $row, from history page
* @returns array (string,string)
*/
- public static function markHistoryRow( $title, $row, $skin ) {
- if( isset($row->fr_quality) && isset($row->fr_flags) ) {
+ public static function markHistoryRow( $title, $row ) {
+ global $wgUser;
+ if( !isset($row->fr_quality) ) {
+ return array("",""); // not reviewed
+ }
+ $css = FlaggedRevsXML::getQualityColor( $row->fr_quality );
+ if( $row->rev_deleted & Revision::DELETED_USER ) {
+ $link = "";
+ } else {
wfLoadExtensionMessages( 'FlaggedRevs' );
- $css = FlaggedRevsXML::getQualityColor(
$row->fr_quality );
$user = User::whois( $row->fr_user ); // FIXME: o(N)
$flags = explode(',',$row->fr_flags);
if( in_array('auto',$flags) ) {
@@ -1164,8 +1170,6 @@
$st = $title->getPrefixedDBkey();
$link = "<span class='fr-$msg plainlinks'>[" .
wfMsgExt($msg,array('parseinline'),$st,$row->rev_id,$user) . "]</span>";
- } else {
- return array("","");
}
return array($link,$css);
}
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2009-04-29 13:43:37 UTC
(rev 50042)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2009-04-29 15:14:04 UTC
(rev 50043)
@@ -1418,15 +1418,14 @@
}
public static function addToHistLine( &$history, $row, &$s ) {
- global $wgUser;
if( $row->rev_deleted & Revision::DELETED_TEXT )
return true; // Don't bother showing notice for deleted
revs
- $skin = $wgUser->getSkin();
# Add link to stable version of *this* rev, if any
- list($link,$class) = FlaggedRevs::markHistoryRow(
$history->getArticle()->getTitle(), $row, $skin );
- if( $link ) {
- $s = "<span class='$class'>$s</span>
<small>$link</small>";
- }
+ list($link,$class) = FlaggedRevs::markHistoryRow(
$history->getArticle()->getTitle(), $row );
+ # Style the row as needed
+ if( $class ) $s = "<span class='$class'>$s</span>";
+ # Add stable old version link
+ if( $link ) $s .= " <small>$link</small>";
return true;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
