From 78fc9a64bdd7fc1ac11c8718e097799236c0ba23 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sun, 03 Nov 2013 07:23:46 -0500
Subject: [PATCH] Merge branch 'master' of /home/git/repositories/florian030/ispconfig3
---
interface/lib/classes/validate_datetime.inc.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/validate_datetime.inc.php b/interface/lib/classes/validate_datetime.inc.php
index b13e0ac..42afeaf 100755
--- a/interface/lib/classes/validate_datetime.inc.php
+++ b/interface/lib/classes/validate_datetime.inc.php
@@ -74,7 +74,8 @@
*/
function _get_timestamp_value($field_value)
{
- $second = 0;
+ if(!is_array($field_value)) return 0;
+ $second = 0;
$filtered_values = array_map(create_function('$item','return (int)$item;'), $field_value);
extract($filtered_values, EXTR_OVERWRITE);
@@ -93,6 +94,7 @@
*/
function not_empty($field_name, $field_value, $validator)
{
+ if(!is_array($field_value)) return $this->_get_error($validator['errmsg']);
extract($field_value);
if ( !($day > 0 && $month > 0 && $year > 0) ) {
return $this->_get_error($validator['errmsg']);
--
Gitblit v1.9.1