From 7d02107803ca96c1adf4e99ce7f0880891975308 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Sun, 16 Nov 2014 16:29:40 +0100
Subject: [PATCH] Livestatus\Query: fix limit, add some notes

---
 library/Icinga/Protocol/Livestatus/Query.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Livestatus/Query.php b/library/Icinga/Protocol/Livestatus/Query.php
index a9571d9ac..eb009918b 100644
--- a/library/Icinga/Protocol/Livestatus/Query.php
+++ b/library/Icinga/Protocol/Livestatus/Query.php
@@ -147,16 +147,21 @@ class Query extends SimpleQuery
             $parts[] =  $filter;
         }
 
+        // TODO: Old way of rendering a count query, this should definitively be
+        // improved
         if ($this->count === true) {
             $parts[] = 'Stats: state >= 0';
         }
+
+        // TODO: Well... ordering is still missing
         if (! $this->count && $this->hasLimit() && ! $this->hasOrder()) {
-            $parts[] = 'Limit: ' . ($this->limit_count + $this->limit_offset);
+            $parts[] = 'Limit: ' . ($this->getLimit() + $this->getOffset());
         }
         $lql = implode("\n", $parts)
              . "\n"
              . implode("\n", $default_headers)
              . "\n\n";
+
         return $lql;
     }