nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: user preferences don't work correctly without output buffering

Browse Source
This commit is contained in:
Crack
2010-08-01 22:52:15 +02:00
parent 9a73307003
commit 279724d6f8
4 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
prefs_manage.php
View File

@@ -18,6 +18,8 @@ require_once './libraries/config/Form.class.php';
require_once './libraries/config/FormDisplay.class.php';
require './libraries/config/user_preferences.forms.php';
PMA_userprefs_pageinit();
$error = '';
if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == 'text_file') {
// export to JSON file
@@ -103,8 +105,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
}
if (!$all_ok) {
// mimic original form and post json in a hidden field
require_once './libraries/header.inc.php';
require_once './libraries/user_preferences.inc.php';
require './libraries/header.inc.php';
require './libraries/user_preferences.inc.php';
$msg = PMA_Message::warning(__('Configuration contains incorrect data for some fields.'));
$msg->display();
echo '<div class="config-form">';
@@ -205,8 +207,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
}
$GLOBALS['js_include'][] = 'config.js';
require_once './libraries/header.inc.php';
require_once './libraries/user_preferences.inc.php';
require './libraries/header.inc.php';
require './libraries/user_preferences.inc.php';
?>
<script type="text/javascript">
<?php