If we have user tool links even in the page history, we should have it also in the...

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

diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index f64634f..695c8c2 100644 (file)
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -260,7 +260,7 @@ class PageArchive {
 
                # Does this page already exist? We'll have to update it...
                $article = new Article( $this->title );
-               $options = ( $wgDBtype == 'PostgreSQL' )
+               $options = ( $wgDBtype == 'postgres' )
                        ? '' // pg doesn't support this?
                        : 'FOR UPDATE';
                $page = $dbw->selectRow( 'page',
@@ -658,7 +658,7 @@ class UndeleteForm {
                                        $checkBox = '';
                                        $pageLink = $wgLang->timeanddate( $ts, true );
                                }
-                               $userLink = $sk->userLink( $row->ar_user, $row->ar_user_text );
+                               $userLink = $sk->userLink( $row->ar_user, $row->ar_user_text ) . $sk->userToolLinks( $row->ar_user, $row->ar_user_text );
                                $comment = $sk->commentBlock( $row->ar_comment );
                                $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink $comment</li>\n" );
        
@@ -686,9 +686,14 @@ class UndeleteForm {
                                        $checkBox = '';
                                        $pageLink = $wgLang->timeanddate( $ts, true );
                                }
-                               $userLink = $sk->userLink( $row->fa_user, $row->fa_user_text );
-                               $data = $row->fa_width . 'x' . $row->fa_height . " (" .
-                                       $row->fa_size . " bytes)";
+                               $userLink = $sk->userLink( $row->fa_user, $row->fa_user_text ) . $sk->userToolLinks( $row->fa_user, $row->fa_user_text );
+                               $data =
+                                       wfMsgHtml( 'widthheight',
+                                               $wgLang->formatNum( $row->fa_width ),
+                                               $wgLang->formatNum( $row->fa_height ) ) .
+                                       ' (' .
+                                       wfMsgHtml( 'nbytes', $wgLang->formatNum( $row->fa_size ) ) .
+                                       ')';
                                $comment = $sk->commentBlock( $row->fa_description );
                                $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink $data $comment</li>\n" );
                        }