Merge "ImagePage refactoring"

diff --cc includes/Article.php
index 67e1c87,3cd5e65..2ef9ded
--- 1/includes/Article.php
--- 2/includes/Article.php
+++ b/includes/Article.php
@@@ -1068,9 -1076,11 +1068,9 @@@ class Article extends Page 
         *   Revision as of \<date\>; view current revision
         *   \<- Previous version | Next Version -\>
         *
-        * @param $oldid String: revision ID of this article revision
+        * @param $oldid int: revision ID of this article revision
         */
        public function setOldSubtitle( $oldid = 0 ) {
 -              global $wgLang, $wgOut, $wgUser, $wgRequest;
 -
                if ( !wfRunHooks( 'DisplayOldSubtitle', array( &$this, &$oldid ) ) ) {
                        return;
                }