diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 752a909e7..bbd04f7b4 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2990,10 +2990,10 @@ function PMA_selectUploadFile($import_list, $uploaddir) { } /** - * Build titles and icons for action links + * Build titles and icons for action links * - * @return array the action titles - * @uses PMA_getIcon() + * @return array the action titles + * @uses PMA_getIcon() */ function PMA_buildActionTitles() { $titles = array(); diff --git a/sql.php b/sql.php index 351fb20d8..c0ab15c7e 100644 --- a/sql.php +++ b/sql.php @@ -391,7 +391,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { /** * HTML header. */ - + if($GLOBALS['is_ajax_request'] != true) { require_once './libraries/header.inc.php'; } @@ -545,7 +545,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { require_once './libraries/relation_cleanup.lib.php'; PMA_relationsCleanupColumn($db, $table, $dropped_column); - } // end if column was dropped + } // end if column was dropped } // end else "didn't ask to see php code" // No rows returned -> move back to the calling page @@ -600,7 +600,7 @@ if (0 == $num_rows || $is_affected) { $message->addMessage($_querytime); $message->addMessage(')'); } - + if( $GLOBALS['is_ajax_request'] == true) { /** @@ -680,7 +680,7 @@ if (0 == $num_rows || $is_affected) { if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) { $extra_data['reload'] = 1; $extra_data['db'] = $GLOBALS['db']; - } + } PMA_ajaxResponse($message, $message->isSuccess(), (isset($extra_data) ? $extra_data : '')); } @@ -691,7 +691,7 @@ if (0 == $num_rows || $is_affected) { if (isset($_REQUEST['purge'])) { $table = ''; unset($url_params['table']); - } + } include 'libraries/db_table_exists.lib.php'; if (strpos($goto, 'tbl_') === 0 && ! $is_table) { @@ -745,7 +745,7 @@ else { $GLOBALS['js_include'][] = 'sql.js'; unset($message); - + if( $GLOBALS['is_ajax_request'] != true) { if (strlen($table)) { require './libraries/tbl_common.php'; @@ -776,7 +776,7 @@ else { $fields_meta = PMA_DBI_get_fields_meta($result); $fields_cnt = count($fields_meta); } - + if( $GLOBALS['is_ajax_request'] != true ) { //begin the sqlqueryresults div here. container div echo '
'; @@ -786,7 +786,7 @@ else { if (isset($disp_query) && $cfg['ShowSQL'] == true) { PMA_showMessage($disp_message, $disp_query, 'success'); } - + if (isset($profiling_results)) { PMA_profilingResults($profiling_results, true); }