From 05dbdb86255cc3069241d850c8090cf8503eaea0 Mon Sep 17 00:00:00 2001
From: Nick Liu <deltik@gmx.com>
Date: Sat, 28 Nov 2020 18:06:51 +0100
Subject: [PATCH] Fix null and undefined issues in user_shortcodes.php

---
 e107_core/shortcodes/batch/user_shortcodes.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
index 412db1a06..793c508a4 100644
--- a/e107_core/shortcodes/batch/user_shortcodes.php
+++ b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -21,6 +21,8 @@ class user_shortcodes extends e_shortcode
 
 	function __construct()
 	{
+		parent::__construct();
+
 		$pref = e107::getPref();
 
 		$this->commentsDisabled = vartrue($pref['comments_disabled']);
@@ -797,7 +799,7 @@ class user_shortcodes extends e_shortcode
 						$extended_record = str_replace("EXTENDED_VALUE","USER_EXTENDED={$key}.value.{$this->var['user_id']}", $extended_record);
 						$extended_record = str_replace('{EXTENDED_ID}',$frm->name2id('user_'.$key), $extended_record);
 
-						if(HIDE_EMPTY_FIELDS === TRUE)
+						if(defined('HIDE_EMPTY_FIELDS') && HIDE_EMPTY_FIELDS === TRUE)
 						{
 							$this_value = $tp->parseTemplate("{USER_EXTENDED={$key}.value.{$this->var['user_id']}}", TRUE);