Merge remote branch 'upstream/master'

phpmyadmin · Aug 19, 2012 · 14c6a77 · 14c6a77
2 parents 7796fe5 + 6ea1ce6
commit 14c6a77
Show file tree

Hide file tree

Showing 8 changed files with 14,410 additions and 159 deletions.
diff --git a/db_structure.php b/db_structure.php
@@ -140,7 +140,7 @@
 $create_time_all = '';
 $update_time_all = '';
 $check_time_all = '';
-$checked        = !empty($checkall) ? ' checked="checked"' : '';
+$checked        = (!empty($checkall) ? ' checked="checked"' : '');
 $num_columns    = $cfg['PropertiesNumColumns'] > 1
     ? ceil($num_tables / $cfg['PropertiesNumColumns']) + 1
     : 0;
@@ -167,7 +167,7 @@
 
     list($current_table, $formatted_size, $unit, $formatted_overhead,
         $overhead_unit, $overhead_size, $table_is_view, $sum_size)
-            = PMA_getStuffForEnginetable($current_table, $db_is_information_schema,
+            = PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schema,
                 $is_show_stats, $table_is_view, $sum_size, $overhead_size
             );
 
@@ -218,7 +218,7 @@
         );
     }
 
-    list($alias, $truename) = PMA_getAliasAndTruename(
+    list($alias, $truename) = PMA_getAliasAndTrueName(
         $tooltip_aliasname, $current_table, $tooltip_truename
     );
 
@@ -318,7 +318,10 @@
  */
 /* DATABASE WORK */
 /* Printable view of a table */
-$response->addHTML(PMA_getHtmlForPrintViewAndDataDictionaryLinks($url_query));
+$response->addHTML(
+    PMA_getHtmlForTablePrintViewLink($url_query)
+    . PMA_getHtmlForDataDictionaryLink($url_query)
+);
 
 if (empty($db_is_information_schema)) {
     ob_start();

diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
@@ -467,7 +467,7 @@ function PMA_getSqlQueryForCopyTable($tables_full, $sql_query, $move, $db)
 
             if (! PMA_Table::moveCopy(
                 $db, $each_table, $_REQUEST['newname'], $each_table,
-                isset($this_what) ? $this_what : 'data',
+                (isset($this_what) ? $this_what : 'data'),
                 $move, 'db_copy'
             )) {
                 $error = true;
@@ -1033,9 +1033,9 @@ function PMA_getHtmlForCopytable()
 
     $html_output .= '<input type="checkbox" name="switch_to_new" value="true"'
         . 'id="checkbox_switch"'
-        . (isset($pma_switch_to_new) && $pma_switch_to_new == 'true')
+        . ((isset($pma_switch_to_new) && $pma_switch_to_new == 'true')
             ? ' checked="checked"'
-            : '' . '/>';
+            : '' . '/>');
     $html_output .= '<label for="checkbox_switch">'
         . __('Switch to copied table') . '</label>'
         . '</fieldset>';