dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
354aec4
)
Merge "Remove use of strencode() in buildLike()"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Fri, 20 Jun 2014 00:19:52 +0000
(
00:19
+0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Fri, 20 Jun 2014 00:19:52 +0000
(
00:19
+0000)
includes/db/Database.php
patch
|
blob
|
history
diff --git
a/includes/db/Database.php
b/includes/db/Database.php
index
16e1ef2
..
7bbcc2f
100644
(file)
--- a/
includes/db/Database.php
+++ b/
includes/db/Database.php
@@
-2539,11
+2539,7
@@
abstract class DatabaseBase implements IDatabase, DatabaseType {
* @return string
*/
protected function escapeLikeInternal( $s ) {
- $s = str_replace( '\\', '\\\\', $s );
- $s = $this->strencode( $s );
- $s = str_replace( array( '%', '_' ), array( '\%', '\_' ), $s );
-
- return $s;
+ return addcslashes( $s, '\%_' );
}
/**
@@
-2579,7
+2575,7
@@
abstract class DatabaseBase implements IDatabase, DatabaseType {
}
}
- return " LIKE
'" . $s . "'
";
+ return " LIKE
{$this->addQuotes( $s )}
";
}
/**