The branch, master has been updated via 97daa8961099bfab57eb181019e2f671ec88e093 (commit) via 3650c3671ff58e4c562768e96969cc70eab75fe6 (commit) from 48e9af42e089c6d130c5b4559e2e590b33f22625 (commit)

- Log ----------------------------------------------------------------- commit 97daa8961099bfab57eb181019e2f671ec88e093 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 11:32:52 2011 +0200

Remove double spaces around else

commit 3650c3671ff58e4c562768e96969cc70eab75fe6 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 11:24:02 2011 +0200

Fix order of docs

-----------------------------------------------------------------------

Summary of changes: js/sql.js | 2 +- js/tbl_structure.js | 2 +- libraries/display_tbl.lib.php | 4 ++-- libraries/sqlparser.lib.php | 2 +- tbl_operations.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/sql.js b/js/sql.js index c1106cd..90f843d 100644 --- a/js/sql.js +++ b/js/sql.js @@ -979,7 +979,7 @@ $(document).ready(function() { } PMA_ajaxRemoveMessage($msgbox); }) // end $.get() - } else { + } else { PMA_ajaxShowMessage(PMA_messages['strNoRowSelected']); } }); diff --git a/js/tbl_structure.js b/js/tbl_structure.js index a9b9ada..2d7f471 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -160,7 +160,7 @@ $(document).ready(function() { var url = $form.serialize()+"&ajax_request=true&submit_mult=change"; /*Calling for the changeColumns fucntion*/ changeColumns(action,url); - } else { + } else { PMA_ajaxShowMessage(PMA_messages['strNoRowSelected']); } }); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index ace57e1..12d40c2 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -28,9 +28,9 @@ require_once './libraries/Index.class.php'; * the "display printable view" option. * Of course '0'/'1' means the feature won't/will be enabled. * - * @param &$the_disp_mode string the synthetic value for display_mode (see a few + * @param string &$the_disp_mode the synthetic value for display_mode (see a few * lines above for explanations) - * @param &$the_total integer the total number of rows returned by the SQL query + * @param integer &$the_total the total number of rows returned by the SQL query * without any programmatically appended "LIMIT" clause * (just a copy of $unlim_num_rows if it exists, else * computed inside this function) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 3deaf3a..8469344 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -362,7 +362,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (class_exists('PMA_Message') && $GLOBALS['is_ajax_request'] != true) { PMA_Message::notice(__('Automatically appended backtick to the end of query!'))->display(); } - } else { + } else { $debugstr = __('Unclosed quote') . ' @ ' . $startquotepos. "\n" . 'STR: ' . htmlspecialchars($quotetype); PMA_SQP_throwError($debugstr, $sql); diff --git a/tbl_operations.php b/tbl_operations.php index 64559ab..6cc913d 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -488,7 +488,7 @@ $innodb_engine_plugin = PMA_StorageEngine::getEngine('innodb'); $innodb_plugin_version = $innodb_engine_plugin->getInnodbPluginVersion(); if (!empty($innodb_plugin_version)) { $innodb_file_format = $innodb_engine_plugin->getInnodbFileFormat(); -} else { +} else { $innodb_file_format = ''; } if ('Barracuda' == $innodb_file_format && $innodb_engine_plugin->supportsFilePerTable()) {

hooks/post-receive