From: Jure Kajzer <freakolowsky@users.mediawiki.org>
Date: Sat, 20 Feb 2010 18:27:00 +0000 (+0000)
Subject: tableName has to be encoded before field type checking
X-Git-Tag: 1.31.0-rc.0~37688
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=ec7782fe97f7e631176793d9cfa4bb4f0909f743;p=lhc%2Fweb%2Fwiklou.git

tableName has to be encoded before field type checking
---

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 0cfcaa6a24..9778b4cbb5 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -283,9 +283,9 @@ class DatabaseOracle extends DatabaseBase {
 
 	function doQuery( $sql ) {
 		wfDebug( "SQL: [$sql]\n" );
-		if ( !mb_check_encoding( $sql ) ) {
-			throw new MWException( "SQL encoding is invalid\n$sql" );
-		}
+        if ( !mb_check_encoding( $sql ) ) {
+            throw new MWException( "SQL encoding is invalid\n$sql" );
+        }
 
 		// handle some oracle specifics
 		// remove AS column/table/subquery namings
@@ -1024,6 +1024,7 @@ class DatabaseOracle extends DatabaseBase {
 		if (is_array($table)) {
 			$table = array_map( array( &$this, 'tableName' ), $table );
 		}
+		$table = $this->tableName($table);
 		
 		$conds2 = array();
 		$conds = ($conds != null && !is_array($conds)) ? array($conds) : $conds;