http://www.mediawiki.org/wiki/Special:Code/MediaWiki/60830
Revision: 60830
Author: freakolowsky
Date: 2010-01-08 07:23:43 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
Prevented delete call in replace function if conditions empty. Removed some old
commented code.
Modified Paths:
--------------
trunk/phase3/includes/db/DatabaseOracle.php
Modified: trunk/phase3/includes/db/DatabaseOracle.php
===================================================================
--- trunk/phase3/includes/db/DatabaseOracle.php 2010-01-08 03:34:04 UTC (rev
60829)
+++ trunk/phase3/includes/db/DatabaseOracle.php 2010-01-08 07:23:43 UTC (rev
60830)
@@ -700,35 +700,9 @@
$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']] ) ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
