aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-05-31 15:27:32 +0200
committerNils Adermann <naderman@naderman.de>2012-05-31 15:27:32 +0200
commitb789758f1bf431accb1226ff34f28e25c7ebe5c6 (patch)
treeff6fd76991bc8e54e3de29ae3245ba783908df6e /phpBB/includes/functions_admin.php
parent0261a9acffd47beb5b40bfa58d987e44b5ebf0c3 (diff)
parent9ab5ad2986a836554bbf137d577c38155540c0a8 (diff)
downloadforums-b789758f1bf431accb1226ff34f28e25c7ebe5c6.tar
forums-b789758f1bf431accb1226ff34f28e25c7ebe5c6.tar.gz
forums-b789758f1bf431accb1226ff34f28e25c7ebe5c6.tar.bz2
forums-b789758f1bf431accb1226ff34f28e25c7ebe5c6.tar.xz
forums-b789758f1bf431accb1226ff34f28e25c7ebe5c6.zip
Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympus
By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10751: [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column. [ticket/10751] Add sql_lower_text() to database abstraction layer.
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 0e1a11b4aa..204fa9a43d 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2557,7 +2557,8 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
{
$sql_keywords .= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
}
- $sql_keywords .= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
+ $sql_lower = $db->sql_lower_text('l.log_data');
+ $sql_keywords .= "$sql_lower " . implode(" OR $sql_lower ", $keywords) . ')';
}
if ($log_count !== false)