Fixed sort handling in MultipleLinkPage

diff --git a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
index a35119e1a7bedf19c5ea79205650498ca0df1cf9..42656d01afc295a77c6050492a1e6083e75f8662 100644 (file)
--- a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
+++ b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
@@ -65,6 +65,18 @@ abstract class MultipleLinkPage extends AbstractPage {
         */     
        public $objectListClassName = '';
        
+       /**
+        * selected sort field
+        * @var string
+        */
+       public $sortField = '';
+       
+       /**
+        * selected sort order
+        * @var string
+        */
+       public $sortOrder = '';
+       
        /**
         * @see wcf\data\DatabaseObjectList::$sqlLimit
         */     
@@ -106,6 +118,7 @@ abstract class MultipleLinkPage extends AbstractPage {
                if ($this->items) {
                        $this->sqlLimit = $this->itemsPerPage;
                        $this->sqlOffset = ($this->pageNo - 1) * $this->itemsPerPage;
+                       if ($this->sortField && $this->sortOrder) $this->sqlOrderBy = $this->sortField." ".$this->sortOrder;
                        $this->readObjects();
                }
        }

diff --git a/wcfsetup/install/files/lib/page/SortablePage.class.php b/wcfsetup/install/files/lib/page/SortablePage.class.php
index 433afd190b484bdfd7e51acbf4e4f07551bf14bc..ee3169d74227b5965c717265d888bbb7115cb288 100644 (file)
--- a/wcfsetup/install/files/lib/page/SortablePage.class.php
+++ b/wcfsetup/install/files/lib/page/SortablePage.class.php
@@ -15,18 +15,6 @@ use wcf\system\event\EventHandler;
  * @category   Community Framework
  */
 abstract class SortablePage extends MultipleLinkPage {
-       /**
-        * selected sort field
-        * @var string
-        */
-       public $sortField = '';
-       
-       /**
-        * selected sort order
-        * @var string
-        */
-       public $sortOrder = '';
-       
        /**
         * default sort field
         * @var string
@@ -66,15 +54,6 @@ abstract class SortablePage extends MultipleLinkPage {
                parent::readData();
        }
        
-       /**
-        * @see wcf\page\MultipleLinkPage::readObjects()
-        */     
-       protected function readObjects() {
-               $this->sqlOrderBy = $this->sortField." ".$this->sortOrder;
-               
-               parent::readObjects();
-       }
-       
        /**
         * Validates the given sort field parameter. 
         */