Merge "Fix type hint in HistoryAction::getArticle"

diff --combined includes/actions/HistoryAction.php
index 1e2f889,da2a11a..7189372
--- 1/includes/actions/HistoryAction.php
--- 2/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@@ -67,8 -67,7 +67,7 @@@ class HistoryAction extends FormlessAct
        }
  
        /**
-        * Get the Article object we are working on.
-        * @return Page
+        * @return WikiPage|Article|ImagePage|CategoryPage|Page The Article object we are working on.
         */
        public function getArticle() {
                return $this->page;
@@@ -102,6 -101,8 +101,6 @@@
                        return; // Client cache fresh and headers sent, nothing more to do.
                }
  
 -              wfProfileIn( __METHOD__ );
 -
                $this->preCacheMessages();
                $config = $this->context->getConfig();
  
@@@ -129,6 -130,7 +128,6 @@@
                $feedType = $request->getVal( 'feed' );
                if ( $feedType ) {
                        $this->feed( $feedType );
 -                      wfProfileOut( __METHOD__ );
  
                        return;
                }
@@@ -148,6 -150,7 +147,6 @@@
                                        'msgKey' => array( 'moveddeleted-notice' )
                                )
                        );
 -                      wfProfileOut( __METHOD__ );
  
                        return;
                }
@@@ -211,6 -214,7 +210,6 @@@
                );
                $out->preventClickjacking( $pager->getPreventClickjacking() );
  
 -              wfProfileOut( __METHOD__ );
        }
  
        /**
@@@ -896,4 -900,5 +895,5 @@@ class HistoryPager extends ReverseChron
        function getPreventClickjacking() {
                return $this->preventClickjacking;
        }
+ 
  }