Skip to content

Commit 08f07cf

Browse files
committed
fix: compatibility with next version of GLPI
due to introduction of a warning when building SQL queries Signed-off-by: Thierry Bugier <[email protected]>
1 parent 5899fd3 commit 08f07cf

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

inc/form.class.php

+28-28
Original file line numberDiff line numberDiff line change
@@ -1732,39 +1732,39 @@ public static function countAvailableForm() {
17321732
if ($DB->tableExists($formTable)
17331733
&& $DB->tableExists($formProfileTable)
17341734
&& isset($_SESSION['glpiactiveprofile']['id'])) {
1735-
$nb = (new DBUtils())->countElementsInTableForMyEntities(
1736-
$formTable,
1737-
[
1738-
'LEFT JOIN' => [
1739-
$formLanguage => [
1740-
'FKEY' => [
1741-
$formLanguage => $formFk,
1742-
$formTable => 'id',
1743-
],
1735+
$nb = $DB->request([
1736+
'COUNT' => 'c',
1737+
'FROM' => $formTable,
1738+
'LEFT JOIN' => [
1739+
$formLanguage => [
1740+
'FKEY' => [
1741+
$formLanguage => $formFk,
1742+
$formTable => 'id',
17441743
],
17451744
],
1746-
'WHERE' => [
1747-
"$formTable.is_active" => '1',
1748-
"$formTable.is_deleted" => '0',
1745+
],
1746+
'WHERE' => [
1747+
"$formTable.is_active" => '1',
1748+
"$formTable.is_deleted" => '0',
1749+
'OR' => [
1750+
"$formTable.language" => [$_SESSION['glpilanguage'], '0', '', null],
1751+
"$formLanguage.name" => $_SESSION['glpilanguage'],
1752+
],
1753+
[
17491754
'OR' => [
1750-
"$formTable.language" => [$_SESSION['glpilanguage'], '0', '', null],
1751-
"$formLanguage.name" => $_SESSION['glpilanguage'],
1752-
],
1753-
[
1754-
'OR' => [
1755-
"$formTable.access_rights" => ['<>', PluginFormcreatorForm::ACCESS_RESTRICTED],
1756-
"$formTable.id" => new QuerySubQuery([
1757-
'SELECT' => $formFk,
1758-
'FROM' => $formProfileTable,
1759-
'WHERE' => [
1760-
'profiles_id' => $_SESSION['glpiactiveprofile']['id']
1761-
]
1762-
]),
1763-
],
1755+
"$formTable.access_rights" => ['<>', PluginFormcreatorForm::ACCESS_RESTRICTED],
1756+
"$formTable.id" => new QuerySubQuery([
1757+
'SELECT' => $formFk,
1758+
'FROM' => $formProfileTable,
1759+
'WHERE' => [
1760+
'profiles_id' => $_SESSION['glpiactiveprofile']['id']
1761+
]
1762+
]),
17641763
],
17651764
],
1766-
]
1767-
);
1765+
] + (new DbUtils())->getEntitiesRestrictCriteria($formTable, '', '', (new self())->maybeRecursive()),
1766+
1767+
])->next()['c'];
17681768
}
17691769

17701770
return $nb;

0 commit comments

Comments
 (0)