[icinga-checkins] icinga.org: icingaweb2/feature/livestatus-playground-4787: Data\SimpleQuery: don't fail on missing columns...

git at icinga.org git at icinga.org
Sun Nov 16 18:25:11 CET 2014


Module: icingaweb2
Branch: feature/livestatus-playground-4787
Commit: 40c4562fe426626dd6098bae232b32d12c506cce
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=40c4562fe426626dd6098bae232b32d12c506cce

Author: Thomas Gelf <thomas at gelf.net>
Date:   Sun Nov 16 18:24:16 2014 +0100

Data\SimpleQuery: don't fail on missing columns...

...for now

---

 library/Icinga/Data/SimpleQuery.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 6a0b71c..41d050e 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -210,7 +210,7 @@ class SimpleQuery implements QueryInterface, Queryable
         $dir = $this->order[$col_num][1];
 // TODO: throw Exception if column is missing
         //$res = strnatcmp(strtolower($a->$col), strtolower($b->$col));
-        $res = strcmp(strtolower($a->$col), strtolower($b->$col));
+        $res = @strcmp(strtolower($a->$col), strtolower($b->$col));
         if ($res === 0) {
 //            return $this->compare($a, $b, $col_num++);
 



More information about the icinga-checkins mailing list