Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-07-15 03:50:24 +02:00
commit 48c895909a

View File

@ -278,7 +278,7 @@ function PMA_userprefsAutoloadGetHeader()
$script_name . '?' . http_build_query($_GET, '', '&')
);
$retval .= '<div id="prefs_autoload" class="notice" style="display:none">';
$retval .= '<div id="prefs_autoload" class="notice print_ignore" style="display:none">';
$retval .= '<form action="prefs_manage.php" method="post" class="disableAjax">';
$retval .= PMA_URL_getHiddenInputs();
$retval .= '<input type="hidden" name="json" value="" />';