__FUNCTION__ -> __METHOD__

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index d04a7d3..ce05efe 100644 (file)
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -152,7 +152,7 @@ class DatabaseMssql extends DatabaseBase {
                if ( $stmt == false ) {
                        $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" .
                                "Query: " . htmlentities( $sql ) . "\n" .
-                               "Function: " . __FUNCTION__ . "\n";
+                               "Function: " . __METHOD__ . "\n";
                        // process each error (our driver will give us an array of errors unlike other providers)
                        foreach ( sqlsrv_errors() as $error ) {
                                $message .= $message . "ERROR[" . $error['code'] . "] " . $error['message'] . "\n";

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 40cd180..fc5b951 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -53,7 +53,7 @@ class ORAResult {
 
                if ( ( $this->nrows = oci_fetch_all( $stmt, $this->rows, 0, - 1, OCI_FETCHSTATEMENT_BY_ROW | OCI_NUM ) ) === false ) {
                        $e = oci_error( $stmt );
-                       $db->reportQueryError( $e['message'], $e['code'], '', __FUNCTION__ );
+                       $db->reportQueryError( $e['message'], $e['code'], '', __METHOD__ );
                        return;
                }
 
@@ -305,14 +305,14 @@ class DatabaseOracle extends DatabaseBase {
 
                if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn, $sql ) ) === false ) {
                        $e = oci_error( $this->mConn );
-                       $this->reportQueryError( $e['message'], $e['code'], $sql, __FUNCTION__ );
+                       $this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
                        return false;
                }
 
                if ( !oci_execute( $stmt, $this->execFlags() ) ) {
                        $e = oci_error( $stmt );
                        if ( !$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1' ) {
-                               $this->reportQueryError( $e['message'], $e['code'], $sql, __FUNCTION__ );
+                               $this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
                                return false;
                        }
                }