Commit 2741b619 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Merge branch 'master' of git+ssh://git.catalyst.net.nz/var/git/mahara into mahara-trunk

parents ad7f0e6e 4a1d9f45
......@@ -569,11 +569,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');
}
......@@ -589,12 +589,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);
......
Supports Markdown
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