dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ed7c8db
)
Allow raw conditions on insertSelect, given that array syntax isn't always expressive...
author
Platonides
<platonides@users.mediawiki.org>
Mon, 7 Nov 2011 17:19:08 +0000
(17:19 +0000)
committer
Platonides
<platonides@users.mediawiki.org>
Mon, 7 Nov 2011 17:19:08 +0000
(17:19 +0000)
includes/db/Database.php
patch
|
blob
|
history
diff --git
a/includes/db/Database.php
b/includes/db/Database.php
index
4967d77
..
4d56a5c
100644
(file)
--- a/
includes/db/Database.php
+++ b/
includes/db/Database.php
@@
-2531,7
+2531,10
@@
abstract class DatabaseBase implements DatabaseType {
" FROM $srcTable $useIndex ";
if ( $conds != '*' ) {
- $sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
+ if ( is_array( $conds ) ) {
+ $conds = $this->makeList( $conds, LIST_AND );
+ }
+ $sql .= " WHERE $conds";
}
$sql .= " $tailOpts";