From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 3 May 2012 19:13:53 +0000 (+0000)
Subject: Merge "ImagePage refactoring"
X-Git-Tag: 1.31.0-rc.0~23747
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=240ac2341eb06d59014ca5867fb3d17ec2461378;p=lhc%2Fweb%2Fwiklou.git

Merge "ImagePage refactoring"
---

240ac2341eb06d59014ca5867fb3d17ec2461378
diff --cc includes/Article.php
index 67e1c873bb,3cd5e6522a..2ef9dedaa3
--- a/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;
  		}