r95498 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r95497‎ | r95498 | r95499 >
Date:17:48, 25 August 2011
Author:reedy
Status:ok
Tags:
Comment:
Fix fail double pasting from r95497
Modified paths:
  • /trunk/phase3/includes/db/DatabaseOracle.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/db/DatabaseOracle.php
@@ -1195,7 +1195,6 @@
11961196 }
11971197
11981198 if ( $conds !== array() && $conds !== '*' ) {
1199 - if ( $conds !== array() && $conds !== '*' ) {
12001199 $conds = $this->wrapConditionsForWhere( $table, $conds );
12011200 $sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
12021201 }
@@ -1284,7 +1283,8 @@
12851284 return 'BITOR(' . $fieldLeft . ', ' . $fieldRight . ')';
12861285 }
12871286
1288 - function setFakeMaster( $enabled = true ) { }
 1287+ function setFakeMaster( $enabled = true ) {
 1288+ }
12891289
12901290 function getDBname() {
12911291 return $this->mDBname;

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r95497Followup r95449, fix the code to do what it was actually intended to doreedy17:47, 25 August 2011

Status & tagging log