From fe25f039748eb28a9d5ae6670ab91e6b14b31ff4 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@akbkhome.com>
Date: Fri, 12 Nov 2010 16:39:07 +0800
Subject: [PATCH] Pman/Roo.php

---
 Pman/Roo.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Pman/Roo.php b/Pman/Roo.php
index 9ceaf9c..f82116c 100644
--- a/Pman/Roo.php
+++ b/Pman/Roo.php
@@ -259,12 +259,13 @@ class Pman_Roo extends Pman
      * @arg   DB_DataObject $x
      * 
      */
-    function applySort($x)
+    function applySort($x, $sort = '', $dir ='')
     {
         
        // Db_DataObject::debugLevel(1);
-        $sort = empty($_REQUEST['sort']) ? '' : $_REQUEST['sort'];
-        $dir = (empty($_REQUEST['dir']) || strtoupper($_REQUEST['dir']) == 'ASC' ? 'ASC' : 'DESC');
+        $sort = empty($_REQUEST['sort']) ? $sort : $_REQUEST['sort'];
+        $dir = empty($_REQUEST['dir']) ? $sort : $_REQUEST['dir'];
+        $dir = $dir == 'ASC' ? 'ASC' : 'DESC';
         
         
         
-- 
2.39.2