From be5845bf46b8a3fdba13e45fbdf6918f70fe6eb8 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Tue, 22 Jan 2013 00:20:44 -0800
Subject: [PATCH] More datepicker fixes
---
e107_handlers/date_handler.php | 13 ++++++++++---
e107_handlers/form_handler.php | 1 -
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/e107_handlers/date_handler.php b/e107_handlers/date_handler.php
index f7b94b740..a8997f4b1 100644
--- a/e107_handlers/date_handler.php
+++ b/e107_handlers/date_handler.php
@@ -75,6 +75,13 @@ class convert
}
// $datestamp += TIMEOFFSET;
break;
+
+ default:
+ if(strpos($mask, '%') === FALSE)
+ {
+ $mask = $this->toMask($mask);
+ }
+ break;
}
//
@@ -98,9 +105,9 @@ class convert
/**
- * Converts from one date function mask to the other and vice-versa.
+ * Converts to new date-mask format or vice-versa when $legacy is TRUE
*/
- function toMask($mask)
+ function toMask($mask, $legacy = false)
{
$convert = array(
'%Y' => 'yy',
@@ -129,7 +136,7 @@ class convert
$s = array_keys($convert);
$r = array_values($convert);
- if(strpos($mask, '%') === FALSE)
+ if(strpos($mask, '%') === FALSE && $legacy == TRUE)
{
return str_replace($r, $s,$mask);
}
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 42857cfde..4fe25c7d9 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -589,7 +589,6 @@ class e_form
);
$defdisp = (isset($def[$type])) ? $def[$type] : $def['date'];
- // $defdisp = e107::getDate()->toMask($defdisp);
if ($datestamp)
{