Followup r95449, fix the code to do what it was actually intended to do

diff --git a/includes/db/Database.php b/includes/db/Database.php
index fd14153..6126b35 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1693,7 +1693,7 @@ abstract class DatabaseBase implements DatabaseType {
                $opts = $this->makeUpdateOptions( $options );
                $sql = "UPDATE $opts $table SET " . $this->makeList( $values, LIST_SET );
 
-               if ( $conds != '*' || ( is_array( $conds ) && count( $conds ) ) ) {
+               if ( $conds !== array() && $conds !== '*' ) {
                        $sql .= " WHERE " . $this->makeList( $conds, LIST_AND );
                }
 

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 23e449a..8ede6bc 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1194,7 +1194,8 @@ class DatabaseOracle extends DatabaseBase {
                        $sql .= $sqlSet;
                }
 
-               if ( $conds != '*' || ( is_array( $conds ) && count( $conds ) ) ) {
+               if ( $conds !== array() && $conds !== '*' ) {
+               if ( $conds !== array() && $conds !== '*' ) {
                        $conds = $this->wrapConditionsForWhere( $table, $conds );
                        $sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
                }