| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -186,10 +186,10 @@ |
| 187 | 187 | var $mFieldInfoCache = array(); |
| 188 | 188 | |
| 189 | 189 | function __construct( $server = false, $user = false, $password = false, $dbName = false, |
| 190 | | - $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) |
| | 190 | + $flags = 0, $tablePrefix = 'get from global' ) |
| 191 | 191 | { |
| 192 | 192 | $tablePrefix = $tablePrefix == 'get from global' ? $tablePrefix : strtoupper( $tablePrefix ); |
| 193 | | - parent::__construct( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix ); |
| | 193 | + parent::__construct( $server, $user, $password, $dbName, $flags, $tablePrefix ); |
| 194 | 194 | wfRunHooks( 'DatabaseOraclePostInit', array( &$this ) ); |
| 195 | 195 | } |
| 196 | 196 | |
| — | — | @@ -219,14 +219,13 @@ |
| 220 | 220 | return true; |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | | - static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0, $tablePrefix ) |
| | 223 | + static function newFromParams( $server, $user, $password, $dbName, $flags = 0, $tablePrefix ) |
| 224 | 224 | { |
| 225 | | - return new DatabaseOracle( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix ); |
| | 225 | + return new DatabaseOracle( $server, $user, $password, $dbName, $flags, $tablePrefix ); |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | /** |
| 229 | 229 | * Usually aborts on failure |
| 230 | | - * If the failFunction is set to a non-zero integer, returns success |
| 231 | 230 | */ |
| 232 | 231 | function open( $server, $user, $password, $dbName ) { |
| 233 | 232 | if ( !function_exists( 'oci_connect' ) ) { |