Next fixes to db_pager usage/behaviour.

[fa-stable.git] / includes / db_pager.inc

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 90f61ec347908c6a2aadd039e8799f980273b86d..328a424f76e0c6a442c903228ea8115735aecae1 100644 (file)
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -375,12 +375,13 @@ function &new_db_pager($name, $sql, $coldef, $page_len = 0)  {
     if ($_SERVER['REQUEST_METHOD'] == 'GET')
                unset($_SESSION[$name]); // kill old pager if any exists on first page call
 
-       if (!isset($_SESSION[$name]))
+       if (!isset($_SESSION[$name])) {
            $_SESSION[$name] =& new db_pager($sql, $name, $page_len);
+               $_SESSION[$name]->set_sql($sql);
+               $_SESSION[$name]->set_columns($coldef);
+       }
        
        $ret = &$_SESSION[$name];
-    $ret->set_sql($sql);
-    $ret->set_columns($coldef);
 
     return $ret;
 }