[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1607-gfc86057

[Michal Čihař]

The branch, master has been updated
       via  fc86057b861abd478689d929c123c2e78a1bb45f (commit)
       via  a0e72168efcda25c38b54e9c559562fb308d6ffb (commit)
       via  38b4d8fd184008969b7324f13176260068878eba (commit)
      from  c7c774f7b8f2bb8028f56e1fd2ae59a8d42a6e2f (commit)


- Log -----------------------------------------------------------------
commit fc86057b861abd478689d929c123c2e78a1bb45f
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Feb 2 16:46:34 2011 +0100

    Also here exclude size of image

commit a0e72168efcda25c38b54e9c559562fb308d6ffb
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Feb 2 16:40:52 2011 +0100

    Whitespace cleanup

commit 38b4d8fd184008969b7324f13176260068878eba
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Feb 2 16:40:48 2011 +0100

    Use caption instead of tr/th for table caption

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

Summary of changes:
 db_operations.php      |    2 +-
 server_binlog.php      |    1 -
 server_synchronize.php |    8 +++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/db_operations.php b/db_operations.php
index 3e674cb..46591bc 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -297,7 +297,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
     }
 
     /**
-     * Database has been successfully renamed/moved.  If in an Ajax request, 
+     * Database has been successfully renamed/moved.  If in an Ajax request,
      * generate the output with {@link PMA_ajaxResponse} and exit
      */
     if( $GLOBALS['is_ajax_request'] == true) {
diff --git a/server_binlog.php b/server_binlog.php
index 60a5b57..2126bc8 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -177,7 +177,6 @@ if ($dontlimitchars) {
         <a href="./server_binlog.php<?php echo PMA_generate_common_url($this_url_params); ?>"
             title="<?php __('Show Full Queries'); ?>">
                 <img src="<?php echo $pmaThemeImage; ?>s_fulltext.png"
-                    width="50" height="20" border="0"
                     alt="<?php echo __('Show Full Queries'); ?>" /></a>
     <?php
 }
diff --git a/server_synchronize.php b/server_synchronize.php
index 32a6cb5..b49aa9e 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -1021,8 +1021,8 @@ if (isset($_REQUEST['synchronize_db'])) {
         if (isset($alter_str_array[$p])) {
             PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields,
             $criteria, $matching_tables_keys, $target_tables_keys, $p, true);
-            unset($alter_str_array[$p]);        
-        }                                                           
+            unset($alter_str_array[$p]);
+        }
         if (! empty($add_column_array[$p])) {
             PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys,
             $trg_db, $trg_link, $src_db, $src_link);
@@ -1111,9 +1111,7 @@ if (isset($_REQUEST['synchronize_db'])) {
         }
 ?>
       <table id="serverconnection_<?php echo $type; ?>_remote" class="data">
-      <tr>
-	  <th colspan="2"><?php echo $database_header; ?></th>
-      </tr>
+      <caption class="tblHeaders"><?php echo $database_header; ?></caption>
       <tr class="odd">
 	  <td colspan="2" style="text-align: center">
 	     <select name="<?php echo $type; ?>_type" id="<?php echo $type; ?>_type" class="server_selector">


hooks/post-receive
-- 
phpMyAdmin