Merge "Drop six authentication-related hooks, deprecated in 1.27"

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

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 6d921b9..696e81f 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -390,13 +390,12 @@ class DatabaseOracle extends Database {
                foreach ( $a as &$row ) {
                        $this->insertOneRow( $table, $row, $fname );
                }
-               $retVal = true;
 
                if ( in_array( 'IGNORE', $options ) ) {
                        $this->ignoreDupValOnIndex = false;
                }
 
-               return $retVal;
+               return true;
        }
 
        private function fieldBindStatement( $table, $col, &$val, $includeCol = false ) {
@@ -580,13 +579,11 @@ class DatabaseOracle extends Database {
                        $this->ignoreDupValOnIndex = true;
                }
 
-               $retval = $this->query( $sql, $fname );
+               $this->query( $sql, $fname );
 
                if ( in_array( 'IGNORE', $insertOptions ) ) {
                        $this->ignoreDupValOnIndex = false;
                }
-
-               return $retval;
        }
 
        public function upsert( $table, array $rows, array $uniqueIndexes, array $set,