db

diff --git a/lib/php/db/wp.php b/lib/php/db/wp.php
index e2c3a72965e4c94915a6f48d7f1f725b0339063f..b59de77fb6d1ba2fab0eedc4d3d62c3cc9ef030f 100644 (file)
--- a/lib/php/db/wp.php
+++ b/lib/php/db/wp.php
@@ -30,25 +30,22 @@ class html_table extends WP_List_Table {
       .'<form id="searchform" role="search" method="get" action="'.$_SERVER['SCRIPT_NAME'].'">'
       .'<fieldset class="screen-options">'
       #.'<label>Table:</label>'
-      .'<h1>Table: '
+      #.'<h1>Table: '
 
-      #.'<select name="table" onchange="if(this.value != \'0\') this.form.submit();">'
-      .'<select name="table" onchange="document.location=\''.$base.'&table=\'+this.value">'
-      .join("",array_map(function($a){
-        return sprintf('<option%s value="%s">%s</option>',$this->_table->p('table') == $a ? ' selected="selected"' : '',$a
-          ,$this->_table->prettyText(preg_replace('/^'.$GLOBALS['wpdb']->prefix.'/','',$a))
-        );},array_keys($this->_table->db()->tables())))
-      .'</select>'
-
-      #.'<select name="db" onchange="if(this.value != \'0\') this.form.submit();">'
       .'<select name="db" onchange="document.location=\''.$base.'&db=\'+this.value">'
-      #.'<select name="db" onchange="if(this.value != \'0\'){var v=this.value;this.form.reset();this.value=v;this.form.submit();}">'
       .join("",array_map(function($a){
-        return sprintf('<option%s value="%s">%s</option>',$this->_table->p('db') == $a ? ' selected="selected"' : '',$a
+        return sprintf('<option%s value="%s">%s</option>',$this->_table->db()->name == $a ? ' selected="selected"' : '',$a
           ,$this->_table->prettyText($a)
         );},$this->_table->db()->dbs))
       .'</select>'
 
+      .'<select name="table" onchange="document.location=\''.$base.'&table=\'+this.value">'
+      .join("",array_map(function($a){
+        return sprintf('<option%s value="%s">%s</option>',$this->_table->name == $a ? ' selected="selected"' : '',$a
+          ,$this->_table->prettyText(preg_replace('/^'.$GLOBALS['wpdb']->prefix.'/','',$a))
+        );},array_keys($this->_table->db()->tables())))
+      .'</select>'
+
       .'<select name="limit" onchange="if(this.value != \'0\') this.form.submit();">'
       .join("",array_map(function($a){
         return sprintf('<option%s value="%s">%s</option>',$this->_table->p('limit') == $a ? ' selected="selected"' : '',$a
@@ -60,7 +57,7 @@ class html_table extends WP_List_Table {
 
            .get_submit_button( __( 'Search' ), 'button', '', false, array('id' => 'search-submit') )
       .'<a class="page-title-action" href="/wp-admin/post-new.php?post_type=page&amp;action=edit&amp;table='.($this->_table->db()->p('table')).'">Add New</a>'
-    .'</h1>'
+    #.'</h1>'
     ;
     echo '<p id="search" class="search-box">';