[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6105-gd0fc397

The branch, master has been updated via d0fc397fe1c474150883e85a791a012a7ae03380 (commit) from 3e2af13bf54c141abebfe168e2601b76b149fd43 (commit) - Log ----------------------------------------------------------------- commit d0fc397fe1c474150883e85a791a012a7ae03380 Author: Marc Delisle <marc@infomarc.info> Date: Wed Jul 28 13:05:24 2010 -0400 new database format string ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 2 +- libraries/display_export.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 19b0cf0..0162c7f 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1117,7 +1117,7 @@ $cfg['Export']['file_template_table'] = '@TABLE@'; * * @global string $cfg['Export']['file_template_database'] */ -$cfg['Export']['file_template_database'] = '@DB@'; +$cfg['Export']['file_template_database'] = '@DATABASE@'; /** * diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index c795281..303902b 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -144,7 +144,7 @@ echo PMA_pluginGetJavascript($export_list); $trans->addMessage('@SERVER@/'); $trans->addString(__('server name')); if ($export_type == 'database' || $export_type == 'table') { - $trans->addMessage('@DB@/'); + $trans->addMessage('@DATABASE@/'); $trans->addString(__('database name')); if ($export_type == 'table') { $trans->addMessage('@TABLE@/'); hooks/post-receive -- phpMyAdmin
participants (1)
-
Marc Delisle