Merge "Block: Explicit convert Message to string"

[lhc/web/wiklou.git] / includes / db / DatabaseOracle.php

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 6af6de5..9cf924f 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -184,6 +184,10 @@ class DatabaseOracle extends Database {
                return $this->trxLevel ? OCI_NO_AUTO_COMMIT : OCI_COMMIT_ON_SUCCESS;
        }
 
+       /**
+        * @param string $sql
+        * @return bool|mixed|ORAResult
+        */
        protected function doQuery( $sql ) {
                wfDebug( "SQL: [$sql]\n" );
                if ( !StringUtils::isUtf8( $sql ) ) {
@@ -561,7 +565,7 @@ class DatabaseOracle extends Database {
                // count-alias subselect fields to avoid abigious definition errors
                $i = 0;
                foreach ( $varMap as &$val ) {
-                       $val = $val . ' field' . ( $i++ );
+                       $val .= ' field' . ( $i++ );
                }
 
                $selectSql = $this->selectSQLText(