The branch, master has been updated via 64d4f8b00c03e2d9b20baa307597f856931b3d5b (commit) via 5130615c0a94a3a13d9e97c3845c408732bfc019 (commit) from e5c094d08030cf183c9b0cfbb1dc0414b26a42a7 (commit)

- Log ----------------------------------------------------------------- commit 64d4f8b00c03e2d9b20baa307597f856931b3d5b Merge: e5c094d 5130615 Author: Rouslan Placella rouslan@placella.com Date: Thu Dec 15 23:03:54 2011 +0000

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 1 + libraries/sql_query_form.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index e6628ba..85b0d54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ phpMyAdmin - ChangeLog - bug #3442069 [AJAX] database list not updated after adding/deleting a user + database

3.4.10.0 (not yet released) +- bug #3460090 [interface] TextareaAutoSelect feature broken

3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 4dd2f15..c358f0b 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -166,7 +166,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter

// enable auto select text in textarea if ($GLOBALS['cfg']['TextareaAutoSelect']) { - $auto_sel = ' onfocus="selectContent(this, sql_box_locked, true)"'; + $auto_sel = ' onclick="selectContent(this, sql_box_locked, true)"'; } else { $auto_sel = ''; }

hooks/post-receive