Fix bug #3353670: Error when executing a report with paging

diff --git a/display.php b/display.php
index 07e62f0204093cb5da42d949e8581b6315865966..c36739ae4eb87c9beca1076a587e2783270fb3ed 100644 (file)
--- a/display.php
+++ b/display.php
@@ -438,7 +438,12 @@
                                $_SESSION['sqlquery'] = $_REQUEST['query'];
                                $misc->printTitle($lang['strselect']);
                                $type = 'SELECT';
-                       } else {
+                       }
+                       else if (isset($_REQUEST['report'])) {
+                               $misc->printTitle($lang['strselect']);
+                               $type = 'SELECT';
+                       }
+                       else {
                                $misc->printTitle($lang['strbrowse']);
                                $type = 'TABLE';
                        }
@@ -474,7 +479,7 @@
                // Retrieve page from query.  $max_pages is returned by reference.
                $rs = $data->browseQuery($type, 
                        isset($object) ? $object : null, 
-                       isset($_REQUEST['query']) ? $_REQUEST['query'] : null, 
+                       isset($_SESSION['sqlquery']) ? $_SESSION['sqlquery'] : null,
                        $_REQUEST['sortkey'], $_REQUEST['sortdir'], $_REQUEST['page'],
                        $conf['max_rows'], $max_pages);
 
@@ -485,6 +490,7 @@
                if (isset($object)) $gets .= "&" . urlencode($subject) . '=' . urlencode($object);
                if (isset($subject)) $gets .= "&subject=" . urlencode($subject);
                if (isset($_REQUEST['query'])) $gets .= "&query=" . urlencode($_REQUEST['query']);
+               if (isset($_REQUEST['report'])) $gets .= "&report=" . urlencode($_REQUEST['report']);
                if (isset($_REQUEST['count'])) $gets .= "&count=" . urlencode($_REQUEST['count']);
                if (isset($_REQUEST['return_url'])) $gets .= "&return_url=" . urlencode($_REQUEST['return_url']);
                if (isset($_REQUEST['return_desc'])) $gets .= "&return_desc=" . urlencode($_REQUEST['return_desc']);