From 60e0c7ba42535c206964f5b4ca6dfbd93c0ae100 Mon Sep 17 00:00:00 2001
From: real_nowhereman <real_nowhereman@aa359531-4221-0410-9edc-b0b45c38dadb>
Date: Fri, 25 Sep 2009 11:56:39 +0000
Subject: [PATCH] fixed a bug in config panel. added nicer temporary error
 message for missing language fields

---
 admin/includes/panels.prototypes.php          | 2 +-
 admin/panels/config/admin.config.tpl          | 3 ++-
 fp-interface/lang/en-us/lang.admin.config.php | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/includes/panels.prototypes.php b/admin/includes/panels.prototypes.php
index f6051ff..101f135 100644
--- a/admin/includes/panels.prototypes.php
+++ b/admin/includes/panels.prototypes.php
@@ -254,7 +254,7 @@
 						$l = $lang['admin'][ADMIN_PANEL][ADMIN_PANEL_ACTION];
 					}
 					
-					$errors[$field] = $l['error'][$field];
+					$errors[$field] = isset($l['error'][$field])? $l['error'][$field] : htmlspecialchars($field);
 					if ($halt)
 						break;
 				} else {
diff --git a/admin/panels/config/admin.config.tpl b/admin/panels/config/admin.config.tpl
index 2bdffb7..e352fae 100755
--- a/admin/panels/config/admin.config.tpl
+++ b/admin/panels/config/admin.config.tpl
@@ -10,6 +10,7 @@
 {validate id="timeoffset" message=$panelstrings.error.maxentries append="error"}
 {validate id="timeformat" message=$panelstrings.error.maxentries append="error"}
 {validate id="dateformat" message=$panelstrings.error.maxentries append="error"}
+{validate id="dateformatshort" message=$panelstrings.error.maxentries append="error"}
 {validate id="lang" message=$panelstrings.error.maxentries append="error"}
 {validate id="charset" message=$panelstrings.error.maxentries append="error"}
 
@@ -132,7 +133,7 @@
 		
 		<dt> <label for="charset"> {$panelstrings.charset} </label></dt>
 		<dd> <p><input type="text" name="charset" id="charset" 
-			class="smalltextinput{$error.dateformat|notempty:" field-error"}" 
+			class="smalltextinput{$error.charset|notempty:" field-error"}" 
 			value="{$fp_config.locale.charset}" /></p>
 			<p>{$panelstrings.charsettip}</p>
 		</dd>
diff --git a/fp-interface/lang/en-us/lang.admin.config.php b/fp-interface/lang/en-us/lang.admin.config.php
index 847bf01..1bf4813 100755
--- a/fp-interface/lang/en-us/lang.admin.config.php
+++ b/fp-interface/lang/en-us/lang.admin.config.php
@@ -63,6 +63,7 @@
 						'You can use floating point (e.g. 2h30" => 2.5)',
 		'timeformat'=>	'You must insert a format string for time',
 		'dateformat'=>	'You must insert a format string for date',
+		'dateformatshort'=>	'You must insert a format string for date (short)',
 		'charset'	=>	'You must insert a charset id',
 		'lang'		=>	'The language you chose is not available'
 		);