The branch, master has been updated via 5fdf725d5bd29838e56ca512a6b4352bea613717 (commit) via ac9d911c3f0e5a9445de24e47b6beb2a28ef9690 (commit) from f016533573e2fb8e6707c18c7f9726e71d9f2c01 (commit)

- Log ----------------------------------------------------------------- commit 5fdf725d5bd29838e56ca512a6b4352bea613717 Merge: f016533573e2fb8e6707c18c7f9726e71d9f2c01 ac9d911c3f0e5a9445de24e47b6beb2a28ef9690 Author: Marc Delisle marc@infomarc.info Date: Wed May 18 07:39:51 2011 -0400

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 1 + server_databases.php | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 51672e5..3578aaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@

3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label +- bug #3303869 [interface] Unnecessary scrolling on Databases page

3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host diff --git a/server_databases.php b/server_databases.php index 8c81553..aba73e7 100644 --- a/server_databases.php +++ b/server_databases.php @@ -101,6 +101,16 @@ echo '<h2>' . "\n" .'</h2>' . "\n";

/** + * Create new database. + */ +if ($cfg['ShowCreateDb']) { + echo '<ul><li id="li_create_database">' . "\n"; + require './libraries/display_create_database.lib.php'; + echo ' </li>' . "\n"; + echo '</ul>' . "\n"; +} + +/** * Gets the databases list */ if ($server > 0) { @@ -269,16 +279,6 @@ if ($databases_count > 0) { unset($databases_count);

/** - * Create new database. - */ -if ($cfg['ShowCreateDb']) { - echo '<ul><li id="li_create_database">' . "\n"; - require './libraries/display_create_database.lib.php'; - echo ' </li>' . "\n"; - echo '</ul>' . "\n"; -} - -/** * Sends the footer */ require './libraries/footer.inc.php';

hooks/post-receive