diff options
| -rw-r--r-- | browse_foreigners.php | 4 | ||||
| -rw-r--r-- | db_sql.php | 4 | ||||
| -rw-r--r-- | schema_edit.php | 4 | ||||
| -rw-r--r-- | server_databases.php | 20 | ||||
| -rw-r--r-- | server_engines.php | 2 | ||||
| -rw-r--r-- | server_plugins.php | 4 | ||||
| -rw-r--r-- | tbl_addfield.php | 6 | ||||
| -rw-r--r-- | tbl_change.php | 4 | ||||
| -rw-r--r-- | tbl_replace.php | 6 | ||||
| -rw-r--r-- | tbl_sql.php | 4 | ||||
| -rw-r--r-- | tbl_tracking.php | 2 | ||||
| -rw-r--r-- | themes/pmahomme/css/jqplot.css.php | 4 |
12 files changed, 32 insertions, 32 deletions
diff --git a/browse_foreigners.php b/browse_foreigners.php index 81a19e9a0e..9f836e8ede 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -43,8 +43,8 @@ $foreign_limit = PMA_getForeignLimit( $foreignData = PMA_getForeignData( $foreigners, $_REQUEST['field'], true, - isset($_REQUEST['foreign_filter']) - ? $_REQUEST['foreign_filter'] + isset($_REQUEST['foreign_filter']) + ? $_REQUEST['foreign_filter'] : '', isset($foreign_limit) ? $foreign_limit : null ); diff --git a/db_sql.php b/db_sql.php index f5a17061f4..67bbbb59d6 100644 --- a/db_sql.php +++ b/db_sql.php @@ -35,8 +35,8 @@ $back = 'db_sql.php'; $response->addHTML( PMA_getHtmlForSqlQueryForm( true, false, - isset($_REQUEST['delimiter']) - ? htmlspecialchars($_REQUEST['delimiter']) + isset($_REQUEST['delimiter']) + ? htmlspecialchars($_REQUEST['delimiter']) : ';' ) ); diff --git a/schema_edit.php b/schema_edit.php index 3a9b9d191d..210756a1c1 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -103,9 +103,9 @@ if ($cfgRelation['pdfwork']) { if (isset($_REQUEST['do']) && ($_REQUEST['do'] == 'edcoord' - || ($_REQUEST['do']== 'selectpage' && isset($user_schema->chosenPage) + || ($_REQUEST['do']== 'selectpage' && isset($user_schema->chosenPage) && $user_schema->chosenPage != 0) - || ($_REQUEST['do'] == 'createpage' && isset($user_schema->chosenPage) + || ($_REQUEST['do'] == 'createpage' && isset($user_schema->chosenPage) && $user_schema->chosenPage != 0)) ) { diff --git a/server_databases.php b/server_databases.php index 4ecc5938fb..2ee0c2b580 100644 --- a/server_databases.php +++ b/server_databases.php @@ -96,16 +96,16 @@ if ($server > 0) { */ if ($databases_count > 0) { $html .= PMA_getHtmlForDatabase( - $databases, - $databases_count, - $pos, - $dbstats, - $sort_by, - $sort_order, - $is_superuser, - $cfg, - $replication_types, - $replication_info, + $databases, + $databases_count, + $pos, + $dbstats, + $sort_by, + $sort_order, + $is_superuser, + $cfg, + $replication_types, + $replication_info, $url_query ); } else { diff --git a/server_engines.php b/server_engines.php index 65808e945f..12320498a5 100644 --- a/server_engines.php +++ b/server_engines.php @@ -23,7 +23,7 @@ require 'libraries/server_engines.lib.php'; */ $response = PMA_Response::getInstance(); $response->addHTML(PMA_getHtmlForSubPageHeader('engines')); - + /** * start output */ diff --git a/server_plugins.php b/server_plugins.php index ca53ef3a3c..089bfd1d7f 100644 --- a/server_plugins.php +++ b/server_plugins.php @@ -29,8 +29,8 @@ require 'libraries/server_plugins.lib.php'; /** * Prepare plugin list */ -$sql = "SELECT p.plugin_name, p.plugin_type, p.is_active, m.module_name, - m.module_library, m.module_version, m.module_author, +$sql = "SELECT p.plugin_name, p.plugin_type, p.is_active, m.module_name, + m.module_library, m.module_version, m.module_author, m.module_description, m.module_license FROM data_dictionary.plugins p JOIN data_dictionary.modules m USING (module_name) diff --git a/tbl_addfield.php b/tbl_addfield.php index b19a11e2d8..2a0590deaa 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -52,9 +52,9 @@ if (isset($_REQUEST['do_save_data'])) { unset($_REQUEST['do_save_data']); include_once 'libraries/create_addfield.lib.php'; - + list($result, $sql_query) = PMA_tryColumnCreationQuery($db, $table, $err_url); - + if ($result === true) { // If comments were sent, enable relation stuff include_once 'libraries/transformations.lib.php'; @@ -93,7 +93,7 @@ if (isset($_REQUEST['do_save_data'])) { } else { $error_message_html = PMA_Util::mysqlDie('', '', '', $err_url, false); $response->addHTML($error_message_html); - exit; + exit; } } // end do alter table diff --git a/tbl_change.php b/tbl_change.php index b5a4b03aad..c98d76d9c4 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -171,12 +171,12 @@ foreach ($rows as $row_id => $current_row) { } $html_output .= PMA_getHtmlForInsertEditRow( - $url_params, $table_columns, $column, $comments_map, $timestamp_seen, + $url_params, $table_columns, $column, $comments_map, $timestamp_seen, $current_result, $chg_evt_handler, $jsvkey, $vkey, $insert_mode, isset($current_row) ? $current_row : null, $o_rows, $tabindex, $columns_cnt, $is_upload, $tabindex_for_function, $foreigners, $tabindex_for_null, $tabindex_for_value, $table, $db, $row_id, $titles, - $biggest_max_file_size, $text_dir + $biggest_max_file_size, $text_dir ); } // end foreach on multi-edit diff --git a/tbl_replace.php b/tbl_replace.php index 929919891f..0e767b1900 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -349,15 +349,15 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) { } } // end of loop for each $mime_map } - + // Need to check the inline edited value can be truncated by MySQL // without informing while saving $column_name = $_REQUEST['fields_name']['multi_edit'][0][0]; - + PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData( $db, $table, $column_name, $extra_data ); - + /**Get the total row count of the table*/ $extra_data['row_count'] = PMA_Table::countRecords( $_REQUEST['db'], $_REQUEST['table'] diff --git a/tbl_sql.php b/tbl_sql.php index 00927747bd..0035840199 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -42,8 +42,8 @@ require_once 'libraries/tbl_info.inc.php'; $response->addHTML( PMA_getHtmlForSqlQueryForm( true, false, - isset($_REQUEST['delimiter']) - ? htmlspecialchars($_REQUEST['delimiter']) + isset($_REQUEST['delimiter']) + ? htmlspecialchars($_REQUEST['delimiter']) : ';' ) ); diff --git a/tbl_tracking.php b/tbl_tracking.php index ee8c088b53..2abd935c73 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -115,7 +115,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { $html .= PMA_getHtmlForTrackingReport( $url_query, $data, $url_params, $selection_schema, $selection_data, $selection_both, $filter_ts_to, $filter_ts_from, $filter_users - ); + ); } // end of report diff --git a/themes/pmahomme/css/jqplot.css.php b/themes/pmahomme/css/jqplot.css.php index e4c56bf961..e167c9fc86 100644 --- a/themes/pmahomme/css/jqplot.css.php +++ b/themes/pmahomme/css/jqplot.css.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Styles for jqplot + * Styles for jqplot * for the pmahomme theme * * @package PhpMyAdmin-theme @@ -236,7 +236,7 @@ table.jqplot-cursor-tooltip { font-size: 0.75em; z-index: 2; } - + td.jqplot-cursor-legend-swatch { vertical-align: middle; text-align: center; |