| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | |
| 55 | 55 | if ( ( $this->nrows = oci_fetch_all( $stmt, $this->rows, 0, - 1, OCI_FETCHSTATEMENT_BY_ROW | OCI_NUM ) ) === false ) { |
| 56 | 56 | $e = oci_error( $stmt ); |
| 57 | | - $db->reportQueryError( $e['message'], $e['code'], '', __FUNCTION__ ); |
| | 57 | + $db->reportQueryError( $e['message'], $e['code'], '', __METHOD__ ); |
| 58 | 58 | return; |
| 59 | 59 | } |
| 60 | 60 | |
| — | — | @@ -305,14 +305,14 @@ |
| 306 | 306 | |
| 307 | 307 | if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn, $sql ) ) === false ) { |
| 308 | 308 | $e = oci_error( $this->mConn ); |
| 309 | | - $this->reportQueryError( $e['message'], $e['code'], $sql, __FUNCTION__ ); |
| | 309 | + $this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ ); |
| 310 | 310 | return false; |
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | if ( !oci_execute( $stmt, $this->execFlags() ) ) { |
| 314 | 314 | $e = oci_error( $stmt ); |
| 315 | 315 | if ( !$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1' ) { |
| 316 | | - $this->reportQueryError( $e['message'], $e['code'], $sql, __FUNCTION__ ); |
| | 316 | + $this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ ); |
| 317 | 317 | return false; |
| 318 | 318 | } |
| 319 | 319 | } |
| Index: trunk/phase3/includes/db/DatabaseMssql.php |
| — | — | @@ -152,7 +152,7 @@ |
| 153 | 153 | if ( $stmt == false ) { |
| 154 | 154 | $message = "A database error has occurred. Did you forget to run maintenance/update.php after upgrading? See: http://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" . |
| 155 | 155 | "Query: " . htmlentities( $sql ) . "\n" . |
| 156 | | - "Function: " . __FUNCTION__ . "\n"; |
| | 156 | + "Function: " . __METHOD__ . "\n"; |
| 157 | 157 | // process each error (our driver will give us an array of errors unlike other providers) |
| 158 | 158 | foreach ( sqlsrv_errors() as $error ) { |
| 159 | 159 | $message .= $message . "ERROR[" . $error['code'] . "] " . $error['message'] . "\n"; |