diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php index 5320d1a2d..1256cc032 100644 --- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php @@ -292,13 +292,24 @@ return "" . $text . ''; } - function sc_joined() + + /** + * @example {JOINED: dateformat=relative} + */ + function sc_joined($parm = '') { - $gen = e107::getDate(); if($this->postInfo['post_user']) { - return LAN_FORUM_2031 . ': ' . $gen->convert_date($this->postInfo['user_join'], 'forum') . '
'; + + if(empty($parm['dateformat'])) + { + return LAN_FORUM_2031 . ': ' . $gen->convert_date($this->postInfo['user_join'], 'forum') . '
'; + } + else + { + return LAN_FORUM_2031 . ': ' . $gen->convert_date($this->postInfo['user_join'], $parm['dateformat']) . '
'; + } } }