Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrack <piotrprz@gmail.com>2010-08-09 00:10:48 +0400
committerCrack <piotrprz@gmail.com>2010-08-09 00:10:48 +0400
commit98cbab04113cac9de1aa8aea07dd92d8ae7f03b7 (patch)
treecbb6eb88eef0e8882cdc6b2b91fdcd2dc37a85bc /prefs_forms.php
parent97c939f8df0ae8e2ccd1357c78e2dfeda2383fad (diff)
second part of error message display changes
Diffstat (limited to 'prefs_forms.php')
-rw-r--r--prefs_forms.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/prefs_forms.php b/prefs_forms.php
index c5cb8d1340..40ea1719f1 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