Merge remote-tracking branch 'origin/master'

phpmyadmin · Oct 29, 2014 · bdc4526 · bdc4526
2 parents eda8a2c + b17ff5b
commit bdc4526
Showing 1 changed file with 25 additions and 21 deletions.
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
@@ -11,6 +11,29 @@
 
 require_once 'libraries/relation.lib.php';
 
+/**
+ * Function to get html to display a page selector 
+ *
+ * @param array  $cfgRelation information about the configuration storage
+ * @param string $db          database name
+ *
+ * @return string html content
+ */
+function PMA_getHtmlForPageSelector($cfgRelation, $db)
+{
+    $html = '<select name="selected_page" id="selected_page">';
+    $html .= '<option value="0">-- ' . __('Select page') . ' --</option>';
+    if ($cfgRelation['pdfwork']) {
+        $pages = PMA_getPageIdsAndNames($db);
+        foreach ($pages as $nr => $desc) {
+            $html .= '<option value="' . $nr . '">';
+            $html .= htmlspecialchars($desc) . '</option>';
+        }
+    }
+    $html .= '</select>';
+    return $html;
+}
+
 /**
  * Function to get html for displaying the page edit/delete form
  *
@@ -34,16 +57,7 @@ function PMA_getHtmlForEditOrDeletePages($db, $operation)
         $html .= __("Page to delete");
     }
     $html .= ': </label>';
-    $html .= '<select name="selected_page" id="selected_page">';
-    $html .= '<option value="0">-- ' . __('Select page') . ' --</option>';
-    if ($cfgRelation['pdfwork']) {
-        $pages = PMA_getPageIdsAndNames($db);
-        foreach ($pages as $nr => $desc) {
-            $html .= '<option value="' . $nr . '">';
-            $html .= htmlspecialchars($desc) . '</option>';
-        }
-    }
-    $html .= '</select>';
+    $html .= PMA_getHtmlForPageSelector($cfgRelation, $db);
     $html .= '</fieldset>';
     $html .= '</form>';
     return $html;
@@ -73,17 +87,7 @@ function PMA_getHtmlForPageSaveAs($db)
     $html .= '<tr>';
     $html .= '<td>';
     $html .= '<input type="hidden" name="operation" value="savePage" />';
-    $html .= '<select name="selected_page" id="selected_page">';
-    $html .= '<option value="0">-- ' . __('Select page') . ' --</option>';
-
-    if ($cfgRelation['pdfwork']) {
-        $pages = PMA_getPageIdsAndNames($db);
-        foreach ($pages as $nr => $desc) {
-            $html .= '<option value="' . $nr . '">';
-            $html .= htmlspecialchars($desc) . '</option>';
-        }
-    }
-    $html .= '</select>';
+    $html .= PMA_getHtmlForPageSelector($cfgRelation, $db);
     $html .= '</td>';
     $html .= '</tr>';