[icinga-checkins] icinga.org: icingaweb2-module-director/fiddle/mfrosch: WIP: ImportRun: properly detect empty column array

git at icinga.org git at icinga.org
Fri Jul 22 14:13:14 CEST 2016


Module: icingaweb2-module-director
Branch: fiddle/mfrosch
Commit: 0e9b35399c433f220378aa8f4404981156cbefdf
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=0e9b35399c433f220378aa8f4404981156cbefdf

Author: Markus Frosch <lazyfrosch at icinga.org>
Date:   Fri Jul 22 14:09:44 2016 +0200

WIP: ImportRun: properly detect empty column array

---

 library/Director/Objects/ImportRun.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Director/Objects/ImportRun.php b/library/Director/Objects/ImportRun.php
index f339c2c..f68f7f9 100644
--- a/library/Director/Objects/ImportRun.php
+++ b/library/Director/Objects/ImportRun.php
@@ -84,7 +84,7 @@ class ImportRun extends DbObject
             array()
         )->where('rsr.rowset_checksum = ?', $this->getConnection()->quoteBinary($binchecksum))->order('r.object_name');
 
-        if ($columns === null) {
+        if ($columns === null || empty($columns)) {
             $columns = $this->listColumnNames();
         } else {
             $query->where('p.property_name IN (?)', $columns);



More information about the icinga-checkins mailing list