From: Jure Kajzer <freakolowsky@users.mediawiki.org>
Date: Mon, 25 Oct 2010 12:06:37 +0000 (+0000)
Subject: * fixed accidental revert of r75343
X-Git-Tag: 1.31.0-rc.0~34325
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=8e777b538aae62c6ed022ba79049c4e05ee744e0;p=lhc%2Fweb%2Fwiklou.git

* fixed accidental revert of r75343
---

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 5789d11017..3ea3728a9b 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -186,10 +186,10 @@ class DatabaseOracle extends DatabaseBase {
 	var $mFieldInfoCache = array();
 
 	function __construct( $server = false, $user = false, $password = false, $dbName = false,
-		$failFunction = false, $flags = 0, $tablePrefix = 'get from global' )
+		$flags = 0, $tablePrefix = 'get from global' )
 	{
 		$tablePrefix = $tablePrefix == 'get from global' ? $tablePrefix : strtoupper( $tablePrefix );
-		parent::__construct( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix );
+		parent::__construct( $server, $user, $password, $dbName, $flags, $tablePrefix );
 		wfRunHooks( 'DatabaseOraclePostInit', array( &$this ) );
 	}
 
@@ -219,14 +219,13 @@ class DatabaseOracle extends DatabaseBase {
 		return true;
 	}
 
-	static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0, $tablePrefix )
+	static function newFromParams( $server, $user, $password, $dbName, $flags = 0, $tablePrefix )
 	{
-		return new DatabaseOracle( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix );
+		return new DatabaseOracle( $server, $user, $password, $dbName, $flags, $tablePrefix );
 	}
 
 	/**
 	 * Usually aborts on failure
-	 * If the failFunction is set to a non-zero integer, returns success
 	 */
 	function open( $server, $user, $password, $dbName ) {
 		if ( !function_exists( 'oci_connect' ) ) {