The branch, QA_3_5 has been updated via c9c9e549daef6e59e336b0a06ebdcc44694795e0 (commit) via b78bd8e8a42572f4917b1c141ad2891cd7337650 (commit) via 304283ce372966e27e575340304822d51fa8d372 (commit) from ac4f2a9d0320830a945217dbf44dec2641fdf39e (commit)

- Log ----------------------------------------------------------------- commit c9c9e549daef6e59e336b0a06ebdcc44694795e0 Author: Michal Čihař michal@cihar.com Date: Tue Jan 31 11:03:03 2012 +0100

Use uniqid to display this message every time configuration is saved

commit b78bd8e8a42572f4917b1c141ad2891cd7337650 Author: Michal Čihař michal@cihar.com Date: Tue Jan 31 11:00:41 2012 +0100

Avoid specifying database server name

commit 304283ce372966e27e575340304822d51fa8d372 Author: Michal Čihař michal@cihar.com Date: Tue Jan 31 11:00:14 2012 +0100

This is about MySQL server, not web

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

Summary of changes: setup/frames/index.inc.php | 3 ++- setup/lib/index.lib.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index bbd631b..57a766e 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -90,7 +90,8 @@ if (!$is_https) { // Check for done action info and set notice message if present switch ($action_done) { case 'config_saved': - messages_set('notice', 'config_saved', __('Configuration saved.'), + /* Use uniqid to display this message every time configuration is saved */ + messages_set('notice', uniqid('config_saved'), __('Configuration saved.'), PMA_lang(__('Configuration saved to file config/config.inc.php in phpMyAdmin top level directory, copy it to top level one and delete directory config to use it.'))); break; default: diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 3e60019..20341cc 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -320,7 +320,7 @@ function perform_config_checks() 'notice', "Servers/$i/ssl", $title, - __('You should use SSL connections if your web server supports it.')); + __('You should use SSL connections if your database server supports it.')); }

//

hooks/post-receive