- XHTML compliance, styling outsourced, row marker outsourced

- do not too much if there is no table
phpmyadmin · Oct 20, 2005 · 0a3c8dc · 0a3c8dc
1 parent d76b1a8
commit 0a3c8dc
Show file tree

Hide file tree

Showing 3 changed files with 401 additions and 514 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -19,6 +19,9 @@ $Source$
       every table with class data now has mark and hover effect
     * css/phpmyadmin.css.php: nowrap for IE and pre for the rest
     * css/phpmyadmin.css.php, server_status.php: css cleanup
+    * db_details_structure.php, db_details_db_info.php:
+      - XHTML compliance, styling outsourced, row marker outsourced
+      - do not too much if there is no table
 
 2005-10-19 Alexander M. Turek  <me@derrabus.de>
     * lang/*.inc.php, libraries/mysql_charsets.lib.php: Correct description

diff --git a/db_details_db_info.php b/db_details_db_info.php
@@ -36,7 +36,7 @@ function fillTooltip(&$tooltip_truename, &$tooltip_aliasname, &$tmp) {
 
 // When used in Nested table group mode, only show tables matching the given groupname
 if (!empty($tbl_group) && !$cfg['ShowTooltipAliasTB']) {
-    $tbl_group_sql = ' LIKE \'' . $tbl_group . '%\'';
+    $tbl_group_sql = ' LIKE "' . PMA_escape_mysql_wildcards( $tbl_group ) . '%"';
 } else {
     $tbl_group_sql = '';
 }
@@ -86,9 +86,9 @@ function fillTooltip(&$tooltip_truename, &$tooltip_aliasname, &$tmp) {
                             fillTooltip($tooltip_truename, $tooltip_aliasname, $sts_tmp);
                         }
 
-                        $tables[]    = $sts_tmp;
+                        $tables[$sts_tmp['Name']]    = $sts_tmp;
                     } else { // table in use
-                        $tables[]    = array('Name' => $tmp[0]);
+                        $tables[$tmp[0]]    = array('Name' => $tmp[0]);
                     }
                 }
                 PMA_DBI_free_result($db_info_result);
@@ -120,14 +120,18 @@ function fillTooltip(&$tooltip_truename, &$tooltip_aliasname, &$tmp) {
                 fillTooltip($tooltip_truename, $tooltip_aliasname, $sts_tmp);
             }
 
-            $tables[] = $sts_tmp;
+            $tables[$sts_tmp['Name']] = $sts_tmp;
         }
     }
     @PMA_DBI_free_result($db_info_result);
     unset($db_info_result);
 }
 $num_tables = (isset($tables) ? count($tables) : 0);
 
+if ( $GLOBALS['cfg']['NaturalOrder'] ) {
+    uksort( $tables, 'strnatcasecmp' );
+}
+
 /**
  * Displays top menu links
  */