Merge remote-tracking branch 'upstream/master'

phpmyadmin · Jul 1, 2012 · f330f78 · f330f78
2 parents 9ca636f + 2c6f80a
commit f330f78
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -42,6 +42,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 + [import] New plugin: import mediawiki
 + Add Ajax support to Fast filter in order to search the term in all database tables
 - bug #3535015 [navi] DbFilter, TableFilter clear button hidden on Chrome
++ rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table
 
 3.5.3.0 (not yet released)
 

diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
@@ -675,7 +675,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix,
         $html_output .= PMA_getPmaTypeSet(
             $column, $extracted_columnspec, $backup_field,
             $column_name_appendix, $unnullify_trigger, $tabindex,
-            $tabindex_for_value, $idindex
+            $tabindex_for_value, $idindex, $data
         );
 
     } elseif ($column['is_binary'] || $column['is_blob']) {
@@ -999,13 +999,14 @@ function PMA_getRadioButtonDependingOnLength(
  * @param integer $tabindex             tab index
  * @param integer $tabindex_for_value   offset for the values tabindex
  * @param integer $idindex              id index
+ * @param array   $data                 description of the column field
  *
  * @return string                       an html snippet
  */
 function PMA_getPmaTypeSet(
     $column, $extracted_columnspec, $backup_field,
     $column_name_appendix, $unnullify_trigger, $tabindex,
-    $tabindex_for_value, $idindex
+    $tabindex_for_value, $idindex, $data
 ) {
     list($column_set_values, $select_size) = PMA_getColumnSetValueAndSelectSize(
         $column, $extracted_columnspec

diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
@@ -143,7 +143,17 @@ function PMA_replication_print_status_table($type, $hidden = false, $title = tru
         } else {
             echo '<span>';
         }
-        echo ${"server_{$type}_replication"}[0][$variable];
+        // allow wrapping long table lists into multiple lines
+        static $variables_wrap = array(
+            'Replicate_Do_DB', 'Replicate_Ignore_DB',
+            'Replicate_Do_Table', 'Replicate_Ignore_Table',
+            'Replicate_Wild_Do_Table', 'Replicate_Wild_Ignore_Table');
+        if (in_array($variable, $variables_wrap)) {
+            echo str_replace(',', ', ', ${"server_{$type}_replication"}[0][$variable]);
+        }
+        else {
+            echo ${"server_{$type}_replication"}[0][$variable];
+        }
         echo '</span>';
 
         echo '  </td>';

diff --git a/tbl_replace.php b/tbl_replace.php
@@ -371,7 +371,7 @@
     exit;
 }
 
-if (isset($return_to_sql_query)) {
+if (! empty($return_to_sql_query)) {
     $disp_query = $GLOBALS['sql_query'];
     $disp_message = $message;
     unset($message);