Skip to content
GitLab
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
ab840c84
Commit
ab840c84
authored
Oct 05, 2018
by
Robert Lyon
Committed by
Gerrit Code Review
Oct 05, 2018
Browse files
Merge "Bug 1795191: blocks without view_artefacts to show in tag search"
parents
e329f4ce
c80be43f
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/search/internal/lib.php
View file @
ab840c84
...
...
@@ -1073,8 +1073,8 @@ class PluginSearchInternal extends PluginSearch {
$artefactjoin
=
' JOIN {view_artefact} va ON (va.artefact = a.parent OR va.artefact = a.id)
LEFT JOIN {artefact_blog_blogpost} abb ON abb.blogpost = a.id '
;
$artefactwhere
=
' AND va.view IN ('
.
$viewidstr
.
') AND (abb.published IS NULL OR abb.published = 1) '
;
$blocktypejoin
=
' JOIN {view
_artefact
} v
a
ON v
a.block
= b.
id
'
;
$blocktypewhere
=
' AND v
a.view
IN ('
.
$viewidstr
.
') '
;
$blocktypejoin
=
' JOIN {view} v ON v
.id
= b.
view
'
;
$blocktypewhere
=
' AND v
.id
IN ('
.
$viewidstr
.
') '
;
$viewwhere
=
' AND v.id IN ('
.
$viewidstr
.
') '
;
$collectionwhere
=
' AND cv.view IN ('
.
$viewidstr
.
') '
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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