21 Oct
2011
21 Oct
'11
1:54 p.m.
The branch, master has been updated
via 20a57d1feaf48102c768ca678b695ba06ac3f340 (commit)
via d4cce87b263ed00654588fa068c7ec73422fd465 (commit)
via a3132f6e91f04dc8f885f4141e6d397460421fa4 (commit)
from 4cba6ee2dc7350d313441ed64c8706df3408f5a1 (commit)
- Log -----------------------------------------------------------------
commit 20a57d1feaf48102c768ca678b695ba06ac3f340
Merge: 4cba6ee d4cce87
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Fri Oct 21 11:38:38 2011 +0100
Merge branch 'QA_3_4'
Conflicts:
ChangeLog
Documentation.html
README
libraries/Config.class.php
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
js/functions.js | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0cc4ab1..c59a9f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@ phpMyAdmin - ChangeLog
- bug #3299486 [prettyprint] Order By in a query containing comment character
3.4.8.0 (not yet released)
+- bug #3425230 [interface] enum data split at space char (more space to edit)
3.4.7.0 (not yet released)
- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] =
false
diff --git a/js/functions.js b/js/functions.js
index 19ab7ce..d39e387 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2624,7 +2624,7 @@ $(document).ready(function() {
val = val.substr(1, val.length-2).replace(/''/g,
"'").replace(/\\\\/g, '\\').replace(/\\'/g,
"'").replace(/'/g, "'");
// escape the greater-than symbol
val = val.replace(/>/g, ">");
- $("#enum_editor #values").append("<input
type='text' value=" + val + " />");
+ $("#enum_editor #values").append("<input
type='text' value='" + val + "' />");
}
});
// So we know which column's data is being edited
hooks/post-receive
--
phpMyAdmin