From: Derick Alangi <alangiderick@gmail.com>
Date: Mon, 15 Apr 2019 15:05:31 +0000 (+0100)
Subject: db: Use $fname instead of __METHOD__ magic constant
X-Git-Tag: 1.34.0-rc.0~1966^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=70cafa4eedf5116a870496aa879290292fafa649;p=lhc%2Fweb%2Fwiklou.git

db: Use $fname instead of __METHOD__ magic constant

The insert() method calls insertOneRow() method on line 391. It then
passes $fname which defaults to __METHOD__ in its function header and
not using $fname instead of __METHOD__ in insertOneRow() method makes
this parameter unused which of course should be used.

Change-Id: Ic5f5ee878e4f919a96900ba88755641ac85929df
---

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index dedaf2190e..f4753d67e6 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -470,7 +470,7 @@ class DatabaseOracle extends Database {
 		$this->mLastResult = $stmt = oci_parse( $this->conn, $sql );
 		if ( $stmt === false ) {
 			$e = oci_error( $this->conn );
-			$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+			$this->reportQueryError( $e['message'], $e['code'], $sql, $fname );
 
 			return false;
 		}
@@ -496,7 +496,7 @@ class DatabaseOracle extends Database {
 				$val = $this->getVerifiedUTF8( $val );
 				if ( oci_bind_by_name( $stmt, ":$col", $val, -1, SQLT_CHR ) === false ) {
 					$e = oci_error( $stmt );
-					$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+					$this->reportQueryError( $e['message'], $e['code'], $sql, $fname );
 
 					return false;
 				}
@@ -530,7 +530,7 @@ class DatabaseOracle extends Database {
 		if ( oci_execute( $stmt, $this->execFlags() ) === false ) {
 			$e = oci_error( $stmt );
 			if ( !$this->ignoreDupValOnIndex || $e['code'] != '1' ) {
-				$this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+				$this->reportQueryError( $e['message'], $e['code'], $sql, $fname );
 
 				return false;
 			} else {