Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
GLPI
glpi
Commits
e5c590f7
Commit
e5c590f7
authored
Apr 18, 2019
by
Johan Cwiklinski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '9.5/bugfixes'
parents
1941281f
2b04a7aa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
inc/dropdown.class.php
inc/dropdown.class.php
+1
-4
No files found.
inc/dropdown.class.php
View file @
e5c590f7
...
...
@@ -2803,10 +2803,7 @@ class Dropdown {
case
KnowbaseItem
::
getType
()
:
$criteria
=
[
'SELECT'
=>
[
"
$table
.*"
,
$addselect
],
'SELECT'
=>
array_merge
([
"
$table
.*"
],
$addselect
),
'DISTINCT'
=>
true
,
'FROM'
=>
$table
];
...
...
Write
Preview
Markdown
is supported
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