From cfd43f251e688ce71603f5d76412eaa1cb645e97 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 26 Jun 2015 15:13:46 +0200
Subject: [PATCH] Revert "Sortable: Allow to check for a particular sort rule"

This reverts commit ae21baa41e55e50774b4e7d42e24686bf231c25f.
---
 library/Icinga/Data/SimpleQuery.php            | 18 ++----------------
 library/Icinga/Data/Sortable.php               |  4 +---
 library/Icinga/Repository/RepositoryQuery.php  |  6 ++----
 .../library/Monitoring/DataView/DataView.php   |  6 ++----
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index b20cb02ab..9751a2756 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -341,25 +341,11 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
     /**
      * Whether an order is set
      *
-     * @param   string  $column
-     *
      * @return bool
      */
-    public function hasOrder($column = null)
+    public function hasOrder()
     {
-        if (empty($this->order)) {
-            return false;
-        } elseif ($column === null) {
-            return true;
-        }
-
-        foreach ($this->order as $rule) {
-            if ($rule[0] === $column) {
-                return true;
-            }
-        }
-
-        return false;
+        return !empty($this->order);
     }
 
     /**
diff --git a/library/Icinga/Data/Sortable.php b/library/Icinga/Data/Sortable.php
index 9f4898d8e..9c837e3d3 100644
--- a/library/Icinga/Data/Sortable.php
+++ b/library/Icinga/Data/Sortable.php
@@ -36,11 +36,9 @@ interface Sortable
     /**
      * Whether an order is set
      *
-     * @param   string  $column
-     *
      * @return bool
      */
-    public function hasOrder($column = null);
+    public function hasOrder();
 
     /**
      * Get the order if any
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index b07a69400..bbe0ae251 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -315,13 +315,11 @@ class RepositoryQuery implements QueryInterface, Iterator
     /**
      * Return whether any sort rules were applied to this query
      *
-     * @param   string  $column
-     *
      * @return  bool
      */
-    public function hasOrder($column = null)
+    public function hasOrder()
     {
-        return $this->query->hasOrder($column);
+        return $this->query->hasOrder();
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index b472fec65..0f892f42c 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -294,13 +294,11 @@ abstract class DataView implements QueryInterface, IteratorAggregate
     /**
      * Whether an order is set
      *
-     * @param   string  $column
-     *
      * @return bool
      */
-    public function hasOrder($column = null)
+    public function hasOrder()
     {
-        return $this->query->hasOrder($column);
+        return $this->query->hasOrder();
     }
 
     /**