Revert r55800 "bug 19646 Localization of img_auth.php - with enhancements"

[lhc/web/wiklou.git] / includes / PatrolLog.php

diff --git a/includes/PatrolLog.php b/includes/PatrolLog.php
index cb6de3e..117ed4e 100644 (file)
--- a/includes/PatrolLog.php
+++ b/includes/PatrolLog.php
@@ -14,24 +14,22 @@ class PatrolLog {
         * @param mixed $change Change identifier or RecentChange object
         * @param bool $auto Was this patrol event automatic?
         */
-       public static function record( $change, $auto = false ) {
-               if( !( is_object( $change ) && $change instanceof RecentChange ) ) {
-                       $change = RecentChange::newFromId( $change );
-                       if( !is_object( $change ) )
+       public static function record( $rc, $auto = false ) {
+               if( !( $rc instanceof RecentChange ) ) {
+                       $rc = RecentChange::newFromId( $rc );
+                       if( !is_object( $rc ) )
                                return false;
                }
-               $title = Title::makeTitleSafe( $change->getAttribute( 'rc_namespace' ),
-                                       $change->getAttribute( 'rc_title' ) );
+               $title = Title::makeTitleSafe( $rc->getAttribute( 'rc_namespace' ), $rc->getAttribute( 'rc_title' ) );
                if( is_object( $title ) ) {
-                       $params = self::buildParams( $change, $auto );
-                       $log = new LogPage( 'patrol', false ); # False suppresses RC entries
+                       $params = self::buildParams( $rc, $auto );
+                       $log = new LogPage( 'patrol', false, $auto ? "skipUDP" : "UDP" ); # False suppresses RC entries
                        $log->addEntry( 'patrol', $title, '', $params );
                        return true;
-               } else {
-                       return false;
                }
+               return false;
        }
-       
+
        /**
         * Generate the log action text corresponding to a patrol log item
         *
@@ -41,20 +39,24 @@ class PatrolLog {
         * @return string
         */
        public static function makeActionText( $title, $params, $skin ) {
-               # This is a bit of a hack, but...if $skin is not a Skin, then *do nothing*
-               # -- this is fine, because the action text we would be queried for under
-               # these conditions would have gone into recentchanges, which we aren't
-               # supposed to be updating
+               list( $cur, /* $prev */, $auto ) = $params;
                if( is_object( $skin ) ) {
-                       list( $cur, /* $prev */, $auto ) = $params;
                        # Standard link to the page in question
-                       $link = $skin->makeLinkObj( $title );
+                       $link = $skin->link( $title );
                        if( $title->exists() ) {
                                # Generate a diff link
-                               $bits[] = 'oldid=' . urlencode( $cur );
-                               $bits[] = 'diff=prev';
-                               $bits = implode( '&', $bits );
-                               $diff = $skin->makeKnownLinkObj( $title, htmlspecialchars( wfMsg( 'patrol-log-diff', $cur ) ), $bits );
+                               $query = array(
+                                       'oldid' => $cur,
+                                       'diff' => 'prev'
+                               );
+
+                               $diff = $skin->link(
+                                       $title,
+                                       htmlspecialchars( wfMsg( 'patrol-log-diff', $cur ) ),
+                                       array(),
+                                       $query,
+                                       array( 'known', 'noclasses' )
+                               );
                        } else {
                                # Don't bother with a diff link, it's useless
                                $diff = htmlspecialchars( wfMsg( 'patrol-log-diff', $cur ) );
@@ -64,10 +66,11 @@ class PatrolLog {
                        # Put it all together
                        return wfMsgHtml( 'patrol-log-line', $diff, $link, $auto );
                } else {
-                       return '';
+                       $text = $title->getPrefixedText();
+                       return wfMsgForContent( 'patrol-log-line', wfMsgHtml('patrol-log-diff',$cur), "[[$text]]", '' );
                }
        }
-       
+
        /**
         * Prepare log parameters for a patrolled change
         *
@@ -82,7 +85,4 @@ class PatrolLog {
                        (int)$auto
                );
        }
-
 }
-
-?>
\ No newline at end of file