From 8e777b538aae62c6ed022ba79049c4e05ee744e0 Mon Sep 17 00:00:00 2001 From: Jure Kajzer Date: Mon, 25 Oct 2010 12:06:37 +0000 Subject: [PATCH] * fixed accidental revert of r75343 --- includes/db/DatabaseOracle.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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' ) ) { -- 2.20.1