1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-06-05 22:09:38 +02:00

Merge branch 'master' into 2.4.2

This commit is contained in:
Thomas Zilio
2018-09-03 16:49:43 +02:00
17 changed files with 75 additions and 90 deletions

View File

@@ -9,9 +9,9 @@ switch ($resource) {
foreach ($elements as $element) {
$filter[] = 'id = '.prepare($element);
}
if (empty($filter)) {
$where[] = 'deleted_at IS NULL';
}
if (empty($filter)) {
$where[] = 'deleted_at IS NULL';
}
if (!empty($search)) {
$search_fields[] = 'name LIKE '.prepare('%'.$search.'%');
}