Merge remote branch 'origin/master'

2010-11-30 14:40:06 +01:00
parent 189170462a 7fc5ae3545
commit ff628b3a75
1 changed files with 1 additions and 1 deletions
--- 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();