tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ObjectsController: fix 8.1 glitch for JSON format

This commit is contained in:
Thomas Gelf 2022-07-15 09:55:02 +02:00
parent f24f8eb287
commit fe3d5c7076
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Director/RestApi/IcingaObjectsHandler.php
View File

@ -89,7 +89,7 @@ class IcingaObjectsHandler extends RequestHandler
$resolved = (bool) $params->get('resolved', false); $resolved = (bool) $params->get('resolved', false);
$withNull = ! $params->shift('withNull'); $withNull = ! $params->shift('withNull');
$properties = $params->shift('properties'); $properties = $params->shift('properties');
if (strlen($properties)) { if ($properties !== null && strlen($properties)) {
$properties = preg_split('/\s*,\s*/', $properties, -1, PREG_SPLIT_NO_EMPTY); $properties = preg_split('/\s*,\s*/', $properties, -1, PREG_SPLIT_NO_EMPTY);
} else { } else {
$properties = null; $properties = null;

2
library/Director/Web/Controller/ObjectsController.php
View File

@ -85,7 +85,7 @@ abstract class ObjectsController extends ActionController
$table->filterObjectType('apply'); $table->filterObjectType('apply');
} }
$search = $this->params->get('q'); $search = $this->params->get('q');
if (\strlen($search) > 0) { if ($search !== null && \strlen($search) > 0) {
$table->search($search); $table->search($search);
} }