diff --git a/application/views/scripts/mixedPagination.phtml b/application/views/scripts/mixedPagination.phtml
index b8ad88a4b..a30cb199b 100755
--- a/application/views/scripts/mixedPagination.phtml
+++ b/application/views/scripts/mixedPagination.phtml
@@ -23,7 +23,7 @@ $title_next = sprintf(
previous)): ?>
- - « = $this->translate('Back') ?>
+ - « = $this->translate('Back') ?>
- « = $this->translate('Back') ?>
diff --git a/library/Icinga/Data/AbstractQuery.php b/library/Icinga/Data/AbstractQuery.php
index a65a45e98..7df883a75 100644
--- a/library/Icinga/Data/AbstractQuery.php
+++ b/library/Icinga/Data/AbstractQuery.php
@@ -164,6 +164,7 @@ abstract class AbstractQuery
$dir = self::SORT_ASC;
}
}
+
$this->order_columns[] = array($col, $dir);
return $this;
}
@@ -374,6 +375,11 @@ abstract class AbstractQuery
return $paginator;
}
+ public function getColumns()
+ {
+ return $this->columns;
+ }
+
/**
* Destructor. Remove $ds, just to be on the safe side
*/
diff --git a/test/php/library/Icinga/Protocol/Statusdat/StatusdatTestLoader.php b/test/php/library/Icinga/Protocol/Statusdat/StatusdatTestLoader.php
index 467f52ded..9864df71c 100644
--- a/test/php/library/Icinga/Protocol/Statusdat/StatusdatTestLoader.php
+++ b/test/php/library/Icinga/Protocol/Statusdat/StatusdatTestLoader.php
@@ -9,16 +9,18 @@ class StatusdatTestLoader extends LibraryLoader
public static function requireLibrary()
{
$libPath = LibraryLoader::getLibraryPath();
- require_once($libPath."/Data/AbstractQuery.php");
- require_once($libPath."/Data/DatasourceInterface.php");
- $statusdat = realpath($libPath."/Protocol/Statusdat/");
-
require_once 'Zend/Config.php';
require_once 'Zend/Cache.php';
+ require_once 'Zend/Log.php';
+ require_once($libPath."/Data/AbstractQuery.php");
+ require_once($libPath."/Application/Logger.php");
- require_once($statusdat."/View/AbstractAccessorStrategy.php");
+ require_once($libPath."/Data/DatasourceInterface.php");
+ $statusdat = realpath($libPath."/Protocol/Statusdat/");
+ require_once($statusdat."/View/AccessorStrategy.php");
require_once($statusdat."/View/MonitoringObjectList.php");
require_once($statusdat."/View/ObjectRemappingView.php");
+ require_once($statusdat."/ObjectContainer.php");
require_once($statusdat."/IReader.php");
require_once($statusdat."/RuntimeStateContainer.php");
require_once($statusdat."/Query.php");