mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-12 10:36:20 +02:00
Code Issues Releases Wiki Activity

Revert Datehandler changes for now.

Browse Source
This commit is contained in:
Cameron
2018-03-15 22:27:25 -07:00
parent 3bb77c6d0c
commit 75ff5fc36d
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_handlers/date_handler.php
View File

@ -235,7 +235,6 @@ class convert
$convert = array( $convert = array(
'%Y' => 'yyyy', // jquery-ui docs say 'yy' but yy produces '13' instead of '2013' '%Y' => 'yyyy', // jquery-ui docs say 'yy' but yy produces '13' instead of '2013'
'%d' => 'dd', '%d' => 'dd',
// '%e' => 'd',
'%m' => 'mm', '%m' => 'mm',
'%B' => 'MM', // Full month name, based on the locale '%B' => 'MM', // Full month name, based on the locale
'%A' => 'DD', // A full textual representation of the day '%A' => 'DD', // A full textual representation of the day
@ -250,9 +249,9 @@ class convert
'%H' => 'hh', // 24 hour format - leading zero '%H' => 'hh', // 24 hour format - leading zero
'%M' => 'ii', // Two digit representation of the minute '%M' => 'ii', // Two digit representation of the minute
'%S' => 'ss', // Two digit representation of the second '%S' => 'ss', // Two digit representation of the second
'%P' => 'a', // lower-case 'am' or 'pm' based on the given time '%P' => 'p', // %P lower-case 'am' or 'pm' based on the given time
'%p' => 'A', // UPPER-CASE 'AM' or 'PM' based on the given time '%p' => 'P', // %p UPPER-CASE 'AM' or 'PM' based on the given time
'%T' => 'hh:mm:ss', '%T' => 'hh:mm:ss',
'%r' => "hh:mmm:ss TT" // 12 hour format '%r' => "hh:mmm:ss TT" // 12 hour format
); );
@ -262,10 +261,7 @@ class convert
if(strpos($mask, '%') === FALSE && $legacy == TRUE) if(strpos($mask, '%') === FALSE && $legacy == TRUE)
{ {
$text = str_replace($r, $s,$mask); return str_replace($r, $s,$mask);
$text = str_replace('%d', '^^', $text);
$text = str_replace('d','%e',$text);
return str_replace('^^','%d', $text);
} }
elseif(strpos($mask,'%')!==FALSE) elseif(strpos($mask,'%')!==FALSE)
{ {
@ -276,7 +272,6 @@ class convert
// Keep this info here: // Keep this info here:
/* /*
*
* $options allowed keys: * $options allowed keys:
* *