From: Jure Kajzer <freakolowsky@users.mediawiki.org>
Date: Fri, 8 Jan 2010 07:23:43 +0000 (+0000)
Subject: Prevented delete call in replace function if conditions empty. Removed some old comme... 
X-Git-Tag: 1.31.0-rc.0~38356
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=f488d7de973c782bf2099b23014e24c63c2e72b8;p=lhc%2Fweb%2Fwiklou.git

Prevented delete call in replace function if conditions empty. Removed some old commented code.
---

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']] ) ) {