Skip to content

GitLab

Commit 30230392 authored by Nigel McNie's avatar Nigel McNie
Browse files

Properly quote the "group" field as MySQL thinks that it's a keyword. Fixes #1796.

parent eed4bd45
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
htdocs/search/internal/lib.php
View file @ 30230392
......@@ -410,11 +410,11 @@ class PluginSearchInternal extends PluginSearch {
)";
$values = array($query_string, $query_string);
if (!$all) {
$sql .= "AND (
$sql .= 'AND (
owner = ? OR id IN (
SELECT group FROM {group_member} WHERE member = ?
SELECT "group" FROM {group_member} WHERE member = ?
)
)";
)';
$values[] = $USER->get('id');
$values[] = $USER->get('id');
}
......@@ -430,12 +430,12 @@ class PluginSearchInternal extends PluginSearch {
OR description LIKE '%' || ? || '%'
)";
if (!$all) {
$sql .= "AND (
$sql .= 'AND (
owner = ? OR id IN (
SELECT group FROM {group_member} WHERE member = ?
SELECT "group" FROM {group_member} WHERE member = ?
)
)
";
';
}
$count = get_field_sql($sql, $values);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment