[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-250-g16886bc

[Marc Delisle]

The branch, master has been updated
       via  16886bc3fb49d357fb583d7e28c51de99103280a (commit)
      from  975d4650de7606de6218d5cc4fd97cc7cc825071 (commit)


- Log -----------------------------------------------------------------
commit 16886bc3fb49d357fb583d7e28c51de99103280a
Author: bhdouglass <dougboybhd at users.sourceforge.net>
Date:   Mon Mar 22 17:40:04 2010 -0400

    Patch #2974341 In db Structure, clicking on table name should Browse if possible

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    2 ++
 db_structure.php |    5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9ec21d..69a860d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Uzbek update, thanks to Orzu Samarqandiy
 + rfe #2958013 [import] After import, also list uploaded filename, thanks
   to Pavel Konnikov and Herman van Rink
++ patch #2974341 [structure] Clicking on table name in db Structure should 
+  Browse the table if possible, thanks to bhdouglass - dougboybhd
 
 3.3.2.0 (not yet released)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/db_structure.php b/db_structure.php
index 2111edd..a4d99cb 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -300,9 +300,11 @@ foreach ($tables as $keyname => $each_table) {
     if ($each_table['TABLE_ROWS'] > 0) {
         $browse_table = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $titles['Browse'] . '</a>';
         $search_table = '<a href="tbl_select.php?' . $tbl_url_query . '">' . $titles['Search'] . '</a>';
+        $browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $truename . '</a>';
     } else {
         $browse_table = $titles['NoBrowse'];
         $search_table = $titles['NoSearch'];
+        $browse_table_label = '<a href="tbl_structure.php?' . $tbl_url_query . '">' . $truename . '</a>';
     }
 
     if (! $db_is_information_schema) {
@@ -382,8 +384,7 @@ foreach ($tables as $keyname => $each_table) {
         <input type="checkbox" name="selected_tbl[]"
             value="<?php echo htmlspecialchars($each_table['TABLE_NAME']); ?>"
             id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> /></td>
-    <th><label for="checkbox_tbl_<?php echo $i; ?>"
-            title="<?php echo $alias; ?>" style="<?php echo $ignored ? ' ignored' : ''; ?>"><?php echo $truename; ?></label>
+    <th><?php echo $browse_table_label; ?>
         <?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?>
     </th>
    <?php if ($server_slave_status) { ?><td align="center"><?php echo $ignored ? ' <img class="icon" src="' . $pmaThemeImage . 's_cancel.png" width="16" height="16"  alt="NOT REPLICATED" />' : ''. $do ? ' <img class="icon" src="' . $pmaThemeImage . 's_success.png" width="16" height="16"  alt="REPLICATED" />' : ''; ?></td><?php } ?>


hooks/post-receive
-- 
phpMyAdmin