The branch, master has been updated
via 6cb1bdc030e1d50aa11fa50e83649ad77eb6fadf (commit)
via 36c0339eb00394d4c51ccbf82a20feae7b70fb18 (commit)
from 147ba5e5cb1155ff71252cd4ad1ed4f97510567a (commit)
- Log -----------------------------------------------------------------
commit 6cb1bdc030e1d50aa11fa50e83649ad77eb6fadf
Merge: 147ba5e5cb1155ff71252cd4ad1ed4f97510567a
36c0339eb00394d4c51ccbf82a20feae7b70fb18
Author: Marc Delisle <[email protected]>
Date: Thu Jul 21 10:55:40 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
db_operations.php | 11 -----------
2 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 94861f5..dc2f709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@ phpMyAdmin - ChangeLog
- bug #3367993 [usability] Missing "Generate Password" button
- bug #3363221 [display] Missing Server Parameter on inline sql query
- bug #3367986 [navi] Drop field -> lost active table
+- remove misleading comment on the "Rename database" interface
3.4.3.1 (2011-07-02)
- [security] Fixed possible session manipulation in swekey authentication, see
PMASA-2011-5
diff --git a/db_operations.php b/db_operations.php
index 16630e3..e2d1e2b 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -404,17 +404,6 @@ if ($db != 'mysql') {
?>
</legend>
<input id="new_db_name" type="text" name="newname" size="30"
class="textfield" value="" />
- <?php
- echo '(' . __('Command') . ': ';
- /**
- * @todo (see explanations above in a previous todo)
- */
- //if (PMA_MYSQL_INT_VERSION >= XYYZZ) {
- // echo 'RENAME DATABASE';
- //} else {
- echo 'INSERT INTO ... SELECT';
- //}
- echo ')'; ?>
</fieldset>
<fieldset class="tblFooters">
<input id="rename_db_input" type="submit" value="<?php echo __('Go');
?>" />
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
