From e182f2370bc64ea26f3ec7e28f666b32cd4199b2 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sun, 24 Jun 2012 10:27:05 +0530
Subject: [PATCH] Coding style fixes

---
 libraries/database_interface.lib.php | 13 ++++++++-----
 libraries/display_import.lib.php     |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index f420204f24..c4314e3c90 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -660,7 +660,8 @@ function PMA_DBI_get_tables_full($database, $table = false,
                     $each_tables[$table_name]['TABLE_TYPE'] = 'VIEW';
                 } else {
                     /**
-                     * @todo difference between 'TEMPORARY' and 'BASE TABLE' but how to detect?
+                     * @todo difference between 'TEMPORARY' and 'BASE TABLE'
+                     * but how to detect?
                      */
                     $each_tables[$table_name]['TABLE_TYPE'] = 'BASE TABLE';
                 }
@@ -874,8 +875,9 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
                 $databases[$database_name]['SCHEMA_LENGTH']          = 0;
                 $databases[$database_name]['SCHEMA_DATA_FREE']       = 0;
 
-                $res = PMA_DBI_query('SHOW TABLE STATUS FROM '
-                    . PMA_backquote($database_name) . ';');
+                $res = PMA_DBI_query(
+                    'SHOW TABLE STATUS FROM ' . PMA_backquote($database_name) . ';'
+                );
                 while ($row = PMA_DBI_fetch_assoc($res)) {
                     $databases[$database_name]['SCHEMA_TABLES']++;
                     $databases[$database_name]['SCHEMA_TABLE_ROWS']
@@ -1421,9 +1423,10 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
     if (!PMA_DRIZZLE) {
         if (! empty($GLOBALS['collation_connection'])) {
             PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);
+            $set_collation_con_query = "SET collation_connection = '"
+                . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';";
             PMA_DBI_query(
-                "SET collation_connection = '"
-                    . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';",
+                $set_collation_con_query,
                 $link,
                 PMA_DBI_QUERY_STORE
             );
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 15c664febb..5856ac037a 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -38,7 +38,7 @@ if (empty($import_list)) {
                 $('#upload_form_status').css("display", "inline"); // show progress bar
                 $('#upload_form_status_info').css("display", "inline"); // - || -
 <?php
-if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
+if ($_SESSION[$SESSION_KEY]["handler"] != "noplugin") {
     ?>
                 var finished = false;
                 var percent  = 0.0;
@@ -155,7 +155,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
     </script>
     <form action="import.php" method="post" enctype="multipart/form-data"
         name="import"<?php
-if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
+if ($_SESSION[$SESSION_KEY]["handler"] != "noplugin") {
     echo ' target="import_upload_iframe"';
 } ?>>
     <input type="hidden" name="<?php echo $ID_KEY; ?>" value="<?php echo $upload_id ; ?>" />