Merge remote-tracking branch 'origin/master'

libraries/Console.class.php

@@ -165,8 +165,7 @@ class PMA_Console
             // The templates, use sprintf() to output them
             // There're white space at the end of every <span>,
             // for double-click selection
-            $tpl_query_actions
-                    = '<span class="action collapse">' . __('Collapse') . '</span> '
+            $tpl_query_actions = '<span class="action collapse">' . __('Collapse') . '</span> '
                     . '<span class="action expand">' . __('Expand') . '</span> '
                     . '<span class="action requery">' . __('Requery') . '</span> '
                     . '<span class="action reedit">' . __('Edit') . '</span> '
@@ -214,13 +213,13 @@ class PMA_Console
                             . '" targettable="' . htmlspecialchars($record['table'])
                             . '"><div class="action_content">'
                             . sprintf(
-                                  $tpl_query_actions,
-                                  $record['db'],
-                                  (isset($record['timevalue'])
-                                      ? $record['timevalue']
-                                      : __('During current session')
-                                  )
-                              )
+                                $tpl_query_actions,
+                                $record['db'],
+                                (isset($record['timevalue'])
+                                    ? $record['timevalue']
+                                    : __('During current session')
+                                )
+                            )
                             . '</div><span class="query">'
                             . htmlspecialchars($record['sqlquery'])
                             . '</span></div>';

libraries/error_report.lib.php

@@ -52,7 +52,7 @@ function PMA_getPrettyReportData()
  * returns the error report data collected from the current configuration or
  * from the request parameters sent by the error reporting js code.
  *
- * @param string  $exception_type whether exception is 'js' or 'php'
+ * @param string $exception_type whether exception is 'js' or 'php'
  *
  * @return Array error report if success, Empty Array otherwise
  */

libraries/sql.lib.php

@@ -1085,8 +1085,8 @@ function PMA_findRealEndOfRows($db, $table)
 /**
  * Function to get values for the relational columns
  *
- * @param String $db            the current database
- * @param String $table         the current table
+ * @param String $db    the current database
+ * @param String $table the current table
  *
  * @return void
  */