From 98cbab04113cac9de1aa8aea07dd92d8ae7f03b7 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Sun, 8 Aug 2010 22:10:48 +0200
Subject: [PATCH] second part of error message display changes

---
 prefs_forms.php  | 6 +++++-
 prefs_manage.php | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/prefs_forms.php b/prefs_forms.php
index c5cb8d134..40ea1719f 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -47,6 +47,7 @@ if (isset($_POST['revert'])) {
     exit;
 }
 
+$error = null;
 if ($form_display->process(false) && !$form_display->hasErrors()) {
     // save settings
     $old_settings = PMA_load_userprefs();
@@ -67,11 +68,14 @@ if ($form_display->process(false) && !$form_display->hasErrors()) {
 $GLOBALS['js_include'][] = 'config.js';
 require './libraries/header.inc.php';
 require './libraries/user_preferences.inc.php';
+if ($error) {
+    $error->display();
+}
 if ($form_display->hasErrors()) {
     // form has errors
     ?>
     <div class="warning config-form">
-        <b><?php echo __('Submitted form contains errors') ?></b>
+        <b><?php echo __('Cannot save settings, submitted form contains errors') ?></b>
         <?php $form_display->displayErrors(); ?>
     </div>
     <?php
diff --git a/prefs_manage.php b/prefs_manage.php
index 8d47e9039..d678f8a88 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -213,6 +213,12 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
 $GLOBALS['js_include'][] = 'config.js';
 require './libraries/header.inc.php';
 require './libraries/user_preferences.inc.php';
+if ($error) {
+    if (!$error instanceof PMA_Message) {
+        $error = PMA_Message::error($error);
+    }
+    $error->display();
+}
 ?>
 <script type="text/javascript">
 <?php