From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 9 May 2014 11:29:31 +0000 (+0000)
Subject: Merge "Fix Oracle 1.23 missing patches (rebase)"
X-Git-Tag: 1.31.0-rc.0~15836
X-Git-Url: https://git.cyclocoop.org/?a=commitdiff_plain;h=2e040b99eda6c99cf472b3896f62d2f21315e808;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix Oracle 1.23 missing patches (rebase)"
---

2e040b99eda6c99cf472b3896f62d2f21315e808
diff --combined includes/installer/OracleUpdater.php
index 68a5519845,edb0cb128d..0ef41fa268
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@@ -97,9 -97,9 +97,11 @@@ class OracleUpdater extends DatabaseUpd
  			array( 'addIndex', 'logging', 'i06', 'patch-logging_user_text_type_time_index.sql' ),
  			array( 'addIndex', 'logging', 'i07', 'patch-logging_user_text_time_index.sql' ),
  			array( 'addField', 'user', 'user_password_expires', 'patch-user_password_expire.sql' ),
+ 			array( 'addField', 'page', 'page_links_updated', 'patch-page_links_updated.sql' ),
+ 			array( 'addField', 'recentchanges', 'rc_source', 'patch-rc_source.sql' ),
  
 +			//1.24
 +
  			// KEEP THIS AT THE BOTTOM!!
  			array( 'doRebuildDuplicateFunction' ),
  
@@@ -261,7 -261,7 +263,7 @@@
  	/**
  	 * Overload: after this action field info table has to be rebuilt
  	 *
 -	 * @param $what array
 +	 * @param array $what
  	 */
  	public function doUpdates( $what = array( 'core', 'extensions', 'purge', 'stats' ) ) {
  		parent::doUpdates( $what );