Load in visual query builder the default pdf page if such exists

Signed-off-by: Madhura Jayaratne <[email protected]>

db_designer.php

@@ -117,11 +117,13 @@
 $display_page = -1;
 $selected_page = null;
 
-if (! isset($_REQUEST['query'])) {
+if (isset($_REQUEST['query'])) {
+    $display_page = PMA_getDefaultPage($_REQUEST['db']);
+} else {
     if (! empty($_REQUEST['page'])) {
         $display_page = $_REQUEST['page'];
     } else {
-        $display_page = PMA_getDefaultPage($_REQUEST['db']);
+        $display_page = PMA_getLoadingPage($_REQUEST['db']);
     }
 }
 if ($display_page != -1) {

libraries/pmd_common.php

@@ -337,11 +337,10 @@ function PMA_deletePage($pg)
 /**
  * Returns the id of the default pdf page of the database.
  * Default page is the one which has the same name as the database.
- * If no such exists, returns the id of the first page of the database.
  *
  * @param string $db database
  *
- * @return int id of the first pdf page, default is -1
+ * @return int id of the default pdf page for the database
  */
 function PMA_getDefaultPage($db)
 {
@@ -350,8 +349,6 @@ function PMA_getDefaultPage($db)
         return null;
     }
 
-    $page_no = -1;
-
     $query = "SELECT `page_nr`"
         . " FROM " . PMA_Util::backquote($cfgRelation['db'])
         . "." . PMA_Util::backquote($cfgRelation['pdf_pages'])
@@ -367,7 +364,31 @@ function PMA_getDefaultPage($db)
     );
 
     if (count($default_page_no)) {
-        $page_no = $default_page_no[0];
+        return $default_page_no[0];
+    }
+    return -1;
+}
+
+/**
+ * Get the id of the page to load. If a default page exists it will be returned.
+ * If no such exists, returns the id of the first page of the database.
+ *
+ * @param string $db database
+ *
+ * @return int id of the page to load
+ */
+function PMA_getLoadingPage($db)
+{
+    $cfgRelation = PMA_getRelationsParam();
+    if (! $cfgRelation['pdfwork']) {
+        return null;
+    }
+
+    $page_no = -1;
+
+    $default_page_no = PMA_getDefaultPage($db);
+    if ($default_page_no != -1) {
+        $page_no = $default_page_no;
     } else {
         $query = "SELECT MIN(`page_nr`)"
             . " FROM " . PMA_Util::backquote($cfgRelation['db'])