Merge "(bug 41330) Default to the current year in the history page filter form"

diff --combined includes/actions/HistoryAction.php
index 051fa42,999a14b..a1d1c3a
--- 1/includes/actions/HistoryAction.php
--- 2/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@@ -154,7 -154,7 +154,7 @@@ class HistoryAction extends FormlessAct
                 * Option to show only revisions that have been (partially) hidden via RevisionDelete
                 */
                if ( $request->getBool( 'deleted' ) ) {
 -                      $conds = array( "rev_deleted != '0'" );
 +                      $conds = array( 'rev_deleted != 0' );
                } else {
                        $conds = array();
                }
@@@ -176,7 -176,7 +176,7 @@@
                        ) .
                        Html::hidden( 'title', $this->getTitle()->getPrefixedDBKey() ) . "\n" .
                        Html::hidden( 'action', 'history' ) . "\n" .
-                       Xml::dateMenu( $year, $month ) . ' ' .
+                       Xml::dateMenu( ( $year == null ? date( "Y" ) : $year ), $month ) . ' ' .
                        ( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ) .
                        $checkDeleted .
                        Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . "\n" .
@@@ -222,7 -222,7 +222,7 @@@
                }
  
                if ( $offset ) {
 -                      $offsets = array( "rev_timestamp $oper '$offset'" );
 +                      $offsets = array( 'rev_timestamp $oper ' . $dbr->addQuotes( $dbr->timestamp( $offset ) ) );
                } else {
                        $offsets = array();
                }
@@@ -231,7 -231,7 +231,7 @@@
  
                return $dbr->select( 'revision',
                        Revision::selectFields(),
 -                      array_merge( array( "rev_page=$page_id" ), $offsets ),
 +                      array_merge( array( 'rev_page' => $page_id ), $offsets ),
                        __METHOD__,
                        array( 'ORDER BY' => "rev_timestamp $dirs",
                                'USE INDEX' => 'page_timestamp', 'LIMIT' => $limit )
@@@ -602,16 -602,13 +602,16 @@@ class HistoryPager extends ReverseChron
                        $s .= ' ' . ChangesList::flag( 'minor' );
                }
  
 -              # Size is always public data
 -              $prevSize = isset( $this->parentLens[$row->rev_parent_id] )
 -                      ? $this->parentLens[$row->rev_parent_id]
 -                      : 0;
 -              $sDiff = ChangesList::showCharacterDifference( $prevSize, $rev->getSize() );
 -              $fSize = Linker::formatRevisionSize($rev->getSize());
 -              $s .= ' <span class="mw-changeslist-separator">. .</span> ' . "$fSize $sDiff";
 +              # Sometimes rev_len isn't populated
 +              if ( $rev->getSize() !== null ) {
 +                      # Size is always public data
 +                      $prevSize = isset( $this->parentLens[$row->rev_parent_id] )
 +                              ? $this->parentLens[$row->rev_parent_id]
 +                              : 0;
 +                      $sDiff = ChangesList::showCharacterDifference( $prevSize, $rev->getSize() );
 +                      $fSize = Linker::formatRevisionSize($rev->getSize());
 +                      $s .= ' <span class="mw-changeslist-separator">. .</span> ' . "$fSize $sDiff";
 +              }
  
                # Text following the character difference is added just before running hooks
                $s2 = Linker::revComment( $rev, false, true );
@@@ -626,12 -623,9 +626,12 @@@
                # Rollback and undo links
                if ( $prevRev && $this->getTitle()->quickUserCan( 'edit', $user ) ) {
                        if ( $latest && $this->getTitle()->quickUserCan( 'rollback', $user ) ) {
 -                              $this->preventClickjacking();
 -                              $tools[] = '<span class="mw-rollback-link">' .
 -                                      Linker::buildRollbackLink( $rev, $this->getContext() ) . '</span>';
 +                              // Get a rollback link without the brackets
 +                              $rollbackLink = Linker::generateRollback( $rev, $this->getContext(), array( 'verify', 'noBrackets' ) );
 +                              if ( $rollbackLink ) {
 +                                      $this->preventClickjacking();
 +                                      $tools[] = $rollbackLink;
 +                              }
                        }
  
                        if ( !$rev->isDeleted( Revision::DELETED_TEXT )