mirror of
https://github.com/e107inc/e107.git
synced 2025-03-14 01:19:44 +01:00
Renamed date handler to e_date. BC support added.
This commit is contained in:
parent
0fd399528a
commit
bf9cf05b0e
@ -643,7 +643,7 @@ $text .= "
|
||||
";
|
||||
|
||||
// Date options.
|
||||
$ga = new convert();
|
||||
$ga = e107::getDate();
|
||||
$date1 = $ga->convert_date(time(), "short");
|
||||
$date2 = $ga->convert_date(time(), "long");
|
||||
$date3 = $ga->convert_date(time(), "forum");
|
||||
|
@ -1116,7 +1116,7 @@ class news_shortcodes extends e_shortcode
|
||||
{
|
||||
$news_item = $this->news_item;
|
||||
$param = $this->param;
|
||||
$con = new convert;
|
||||
$con = e107::getDate();
|
||||
$news_item['news_start'] = (isset($news_item['news_start']) && $news_item['news_start'] ? str_replace(' - 00:00:00', '', $con->convert_date($news_item['news_start'], 'long')) : LAN_NEWS_19);
|
||||
$news_item['news_end'] = (isset($news_item['news_end']) && $news_item['news_end'] ? ' to '.str_replace(' - 00:00:00', '', $con->convert_date($news_item['news_end'], 'long')) : '');
|
||||
$info = $news_item['news_render_type'] == 1 ? LAN_NEWS_9 : '';
|
||||
|
@ -227,7 +227,8 @@ class e_date
|
||||
|
||||
|
||||
/**
|
||||
* Converts to new date-mask format or vice-versa when $legacy is TRUE
|
||||
* Converts to new date-mask format or vice-versa when $legacy is TRUE
|
||||
* @see https://github.com/AuspeXeu/bootstrap-datetimepicker
|
||||
*/
|
||||
function toMask($mask, $legacy = false)
|
||||
{
|
||||
@ -258,13 +259,15 @@ class e_date
|
||||
$s = array_keys($convert);
|
||||
$r = array_values($convert);
|
||||
|
||||
if(strpos($mask, '%') === FALSE && $legacy == TRUE)
|
||||
if(strpos($mask, '%') === false && $legacy === true)
|
||||
{
|
||||
return str_replace($r, $s,$mask);
|
||||
$ret = str_replace($r, $s,$mask);
|
||||
return str_replace('%%p', '%P', $ret); // quick fix.
|
||||
}
|
||||
elseif(strpos($mask,'%')!==FALSE)
|
||||
elseif(strpos($mask,'%')!==false)
|
||||
{
|
||||
return str_replace($s,$r, $mask);
|
||||
return str_replace($s,$r, $mask);
|
||||
|
||||
}
|
||||
|
||||
return $mask;
|
||||
|
@ -161,7 +161,7 @@ class e107
|
||||
'UserHandler' => '{e_HANDLER}user_handler.php',
|
||||
'comment' => '{e_HANDLER}comment_class.php',
|
||||
'e_date' => '{e_HANDLER}date_handler.php',
|
||||
'convert' => '{e_HANDLER}date_handler.php', // BC Fix.
|
||||
'convert' => '{e_HANDLER}date_handler.php', // BC Fix.
|
||||
'db' => '{e_HANDLER}mysql_class.php',
|
||||
'e107Email' => '{e_HANDLER}mail.php',
|
||||
'e107_event' => '{e_HANDLER}event_class.php',
|
||||
|
@ -1084,7 +1084,7 @@ if (check_class($search_prefs['google'])) {
|
||||
|
||||
if ($perform_search)
|
||||
{
|
||||
$con = new convert;
|
||||
$con = e107::getDate();
|
||||
|
||||
$sch = new e_search;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user