The branch, master has been updated
via 7fc5ae35454acf9210b4539fd6bac98a54f515ff (commit)
via 2a2a08c5ae135c6125d1d76b137737cf6cb756e2 (commit)
via e9c8531a234bb590feb7d871c0628982e91021f8 (commit)
from 7489e2c3e63d48680e7557740443b5c2917ba6d7 (commit)
- Log -----------------------------------------------------------------
commit 7fc5ae35454acf9210b4539fd6bac98a54f515ff
Merge: 7489e2c3e63d48680e7557740443b5c2917ba6d7 2a2a08c5ae135c6125d1d76b137737cf6cb756e2
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Nov 30 07:34:22 2010 -0500
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
main.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/main.php b/main.php
index e3f054d..48e98fc 100644
--- a/main.php
+++ b/main.php
@@ -132,7 +132,7 @@ if ($GLOBALS['cfg']['ThemeManager']) {
// see js/main_custom_color.js
echo '<li id="li_custom_color" class="hide">';
- echo PMA_escapeJsString(__('Background color')) . ': ';
+ echo __('Background color') . ': ';
echo '<input type="submit" name="custom_color_choose"
value="' . __('Choose...') . '" />';
echo '<form name="colorform" id="colorform"
method="post" action="index.php" target="_parent">';
echo PMA_generate_common_hidden_inputs();
hooks/post-receive
--
phpMyAdmin