diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 52aabc1a1a..2d1df548f8 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -9,6 +9,8 @@ if (! defined('PHPMYADMIN')) { exit; } +require_once './libraries/Template.class.php'; + /** * Common initialization for user preferences modification pages * @@ -266,35 +268,23 @@ function PMA_userprefsRedirect($file_name, */ function PMA_userprefsAutoloadGetHeader() { - $retval = ''; - if (isset($_REQUEST['prefs_autoload']) && $_REQUEST['prefs_autoload'] == 'hide' ) { $_SESSION['userprefs_autoload'] = true; - } else { - $script_name = basename(basename($GLOBALS['PMA_PHP_SELF'])); - $return_url = htmlspecialchars( - $script_name . '?' . http_build_query($_GET, '', '&') - ); - - $retval .= ''; + return ''; } - return $retval; + + $script_name = basename(basename($GLOBALS['PMA_PHP_SELF'])); + $return_url = htmlspecialchars( + $script_name . '?' . http_build_query($_GET, '', '&') + ); + + return PMA\Template::get('prefs_autoload') + ->render( + array( + 'hiddenInputs' => PMA_URL_getHiddenInputs(), + 'return_url' => $return_url, + ) + ); } diff --git a/templates/prefs_autoload.phtml b/templates/prefs_autoload.phtml new file mode 100644 index 0000000000..bfd7d3f64a --- /dev/null +++ b/templates/prefs_autoload.phtml @@ -0,0 +1,17 @@ + \ No newline at end of file