http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74133
Revision: 74133
Author: ialex
Date: 2010-10-02 08:04:58 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
__FUNCTION__ -> __METHOD__
Modified Paths:
--------------
trunk/phase3/includes/db/DatabaseMssql.php
trunk/phase3/includes/db/DatabaseOracle.php
Modified: trunk/phase3/includes/db/DatabaseMssql.php
===================================================================
--- trunk/phase3/includes/db/DatabaseMssql.php 2010-10-02 07:57:43 UTC (rev
74132)
+++ trunk/phase3/includes/db/DatabaseMssql.php 2010-10-02 08:04:58 UTC (rev
74133)
@@ -152,7 +152,7 @@
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";
Modified: trunk/phase3/includes/db/DatabaseOracle.php
===================================================================
--- trunk/phase3/includes/db/DatabaseOracle.php 2010-10-02 07:57:43 UTC (rev
74132)
+++ trunk/phase3/includes/db/DatabaseOracle.php 2010-10-02 08:04:58 UTC (rev
74133)
@@ -53,7 +53,7 @@
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 @@
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;
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
