aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/auth.php')
-rw-r--r--phpBB/includes/auth.php21
1 files changed, 2 insertions, 19 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index c7b53b4a9a..6601527026 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -842,15 +842,7 @@ class auth
{
if (strpos($auth_options, '%') !== false)
{
- if (strpos($auth_options, '_') !== false && $db->sql_layer !== 'sqlite')
- {
- $sql_opts = "AND $key LIKE '" . $db->sql_escape(str_replace('_', "\_", $auth_options)) . "'";
- $sql_opts .= ($db->sql_layer == 'mssql' || $db->sql_layer == 'mssql_odbc') ? " ESCAPE '\\' " : '';
- }
- else
- {
- $sql_opts = "AND $key LIKE '" . $db->sql_escape($auth_options) . "'";
- }
+ $sql_opts = "AND $key " . $db->sql_like_expression($auth_options);
}
else
{
@@ -881,16 +873,7 @@ class auth
{
if (strpos($option, '%') !== false)
{
- if (strpos($option, '_') !== false && $db->sql_layer !== 'sqlite')
- {
- $_sql = $key . " LIKE '" . $db->sql_escape(str_replace('_', "\_", $option)) . "'";
- $_sql .= ($db->sql_layer == 'mssql' || $db->sql_layer == 'mssql_odbc') ? " ESCAPE '\\'" : '';
- $sql[] = $_sql;
- }
- else
- {
- $sql[] = $key . " LIKE '" . $db->sql_escape($option) . "'";
- }
+ $sql[] = $key . ' ' . $db->sql_like_expression($option);
}
else
{