Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
2741b619
Commit
2741b619
authored
Jan 07, 2008
by
Richard Mansfield
Browse files
Merge branch 'master' of
git+ssh://git.catalyst.net.nz/var/git/mahara
into mahara-trunk
parents
ad7f0e6e
4a1d9f45
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/search/internal/lib.php
View file @
2741b619
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment