From f488d7de973c782bf2099b23014e24c63c2e72b8 Mon Sep 17 00:00:00 2001 From: Jure Kajzer Date: Fri, 8 Jan 2010 07:23:43 +0000 Subject: [PATCH] Prevented delete call in replace function if conditions empty. Removed some old commented code. --- includes/db/DatabaseOracle.php | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index 2b5290e0be..f4ef519306 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -700,35 +700,9 @@ class DatabaseOracle extends DatabaseBase { $condsDelete = array(); foreach ( $uniqueIndexes as $index ) $condsDelete[$index] = $row[$index]; - $this->delete( $table, $condsDelete, $fname ); -/* - $sql = "DELETE FROM $table WHERE "; - $first = true; - foreach ( $uniqueIndexes as $index ) { - if ( $first ) { - $first = false; - $sql .= "("; - } else { - $sql .= ') OR ('; - } - if ( is_array( $index ) ) { - $first2 = true; - foreach ( $index as $col ) { - if ( $first2 ) { - $first2 = false; - } else { - $sql .= ' AND '; - } - $sql .= $col.'=' . $this->addQuotes( $row[$col] ); - } - } else { - $sql .= $index.'=' . $this->addQuotes( $row[$index] ); - } + if (count($condsDelete) > 0) { + $this->delete( $table, $condsDelete, $fname ); } - $sql .= ')'; - - $this->doQuery( $sql);//, $fname ); -*/ } if ( $sequenceData !== false && !isset( $row[$sequenceData['column']] ) ) { -- 2.20.1