diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
index f94bc427d..551e53e3c 100644
--- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
@@ -99,7 +99,7 @@ class forum_shortcodes extends e_shortcode
$text = "".LAN_FORUM_0010." | ".LAN_FORUM_0011."";
if(USER)
{
- $text .= " | ".LAN_FORUM_0012." | ".LAN_FORUM_0013." | ".LAN_FORUM_0014."";
+ $text .= " | ".LAN_FORUM_0012." | ".LAN_FORUM_0013." | ".LAN_FORUM_0014."";
// To be reworked to get the $forum var
if($forum->prefs->get('attach') && (check_class($pref['upload_class']) || getperms('0')))
{
@@ -154,7 +154,7 @@ class forum_shortcodes extends e_shortcode
{
list($oid, $oname) = explode(".", $uinfo, 2);
$c ++;
- $text .= "$oname".($c == MEMBERS_ONLINE ? "." :", ");
+ $text .= "$oname".($c == MEMBERS_ONLINE ? "." :", ");
}
}
@@ -164,7 +164,7 @@ class forum_shortcodes extends e_shortcode
return $text;
}
- function sc_search($parm='')
+ function sc_search($parm=null)
{
if(!deftrue('FONTAWESOME') || !$srchIcon = e107::getParser()->toGlyph('fa-search'))
@@ -215,7 +215,7 @@ class forum_shortcodes extends e_shortcode
{
$total_new_threads = e107::getDb()->count('forum_thread', '(*)', "WHERE thread_datestamp>'".USERLV."' ");
$total_read_threads = 0;
- if (USERVIEWED != "")
+ if (defset('USERVIEWED') != "")
{
$tmp = explode(".", USERVIEWED); // List of numbers, separated by single period
$total_read_threads = count($tmp);
@@ -314,7 +314,7 @@ class forum_shortcodes extends e_shortcode
}
return str_replace("[x]", ($total_topics+$total_replies), LAN_FORUM_0031)." ($total_topics ".($total_topics == 1 ? LAN_FORUM_0032 : LAN_FORUM_0033).", $total_replies ".($total_replies == 1 ? LAN_FORUM_0034 : LAN_FORUM_0035).")
- ".(!defined("e_TRACKING_DISABLED") ? "" : "
".$users." ".($users == 1 ? LAN_FORUM_0059 : LAN_FORUM_0060)." (".$member_users." ".($member_users == 1 ? LAN_FORUM_0061 : LAN_FORUM_0062).", ".$guest_users." ".($guest_users == 1 ? LAN_FORUM_0063 : LAN_FORUM_0064).")
".LAN_FORUM_0066." ".$total_members."
".LAN_FORUM_0065." ".$nuser_name.".\n"); // FIXME cannot find other references to e_TRACKING_DISABLED, use pref?
+ ".(!defined("e_TRACKING_DISABLED") ? "" : "
".$users." ".($users == 1 ? LAN_FORUM_0059 : LAN_FORUM_0060)." (".$member_users." ".($member_users == 1 ? LAN_FORUM_0061 : LAN_FORUM_0062).", ".$guest_users." ".($guest_users == 1 ? LAN_FORUM_0063 : LAN_FORUM_0064).")
".LAN_FORUM_0066." ".$total_members."
".LAN_FORUM_0065." ".$nuser_name.".\n"); // FIXME cannot find other references to e_TRACKING_DISABLED, use pref?
}
@@ -387,7 +387,7 @@ class forum_shortcodes extends e_shortcode
}
- function sc_forumname($parm = '')
+ function sc_forumname($parm = null)
{
if(substr($this->var['forum_name'], 0, 1) == '*')
{
@@ -429,7 +429,7 @@ class forum_shortcodes extends e_shortcode
}
- function sc_threadsx($parm = '') // EQUAL TO SC_THREADS.......................
+ function sc_threadsx($parm = null) // EQUAL TO SC_THREADS.......................
{
$val = ($this->var['forum_threads']) ? $this->var['forum_threads'] : '0';
@@ -442,7 +442,7 @@ class forum_shortcodes extends e_shortcode
}
- function sc_repliesx($parm = '') // EQUAL TO SC_REPLIES.......................
+ function sc_repliesx($parm = null) // EQUAL TO SC_REPLIES.......................
{
//print_a($parm);
$val = ($this->var['forum_replies']) ? $this->var['forum_replies'] : '0';