mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-15 11:04:18 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2910 from lonalore/bugfixes

Browse Source 
Several fixes to suppress PHP notices, also contains fix for Website Status dashboard chart.
This commit is contained in:
Cameron
2017-12-10 11:33:44 -08:00
committed by GitHub
parent fabbef1bfc e3621e489f
commit c31dbad0dd
15 changed files with 83 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_core/shortcodes/batch/user_shortcodes.php
View File

@@ -165,15 +165,15 @@ class user_shortcodes extends e_shortcode
//require_once(e_HANDLER."level_handler.php");
//$ldata = get_level($this->var['user_id'], $this->var['user_forums'], $this->var['user_comments'], $this->var['user_chats'], $this->var['user_visits'], $this->var['user_join'], $this->var['user_admin'], $this->var['user_perms'], $pref);
$ldata = array();
if (strstr($ldata[0], "IMAGE_rank_main_admin_image"))
if (isset($ldata[0]) && strstr($ldata[0], "IMAGE_rank_main_admin_image"))
{
return LAN_USER_31;
}
elseif(strstr($ldata[0], "IMAGE"))
elseif(isset($ldata[0]) && strstr($ldata[0], "IMAGE"))
{
return LAN_USER_32;
}
else
elseif(isset($ldata[1]))
{
return $ldata[1];
}
@@ -738,7 +738,7 @@ class user_shortcodes extends e_shortcode
$cat_name = true; //XXX TEMP Fix.
if($cat_name != FALSE && count($ueFieldList[$catnum]))
if($cat_name != FALSE && isset($ueFieldList[$catnum]) && count($ueFieldList[$catnum]))
{
$ret .= str_replace("{EXTENDED_NAME}", $key, $EXTENDED_CATEGORY_START);

4
e107_core/shortcodes/single/user_extended.php
View File

@@ -110,6 +110,10 @@
if ($parms[1] == 'text')
{
if(!isset($ueStruct['user_'.$parms[0]]))
{
return FALSE;
}
$text_val = $ueStruct['user_'.$parms[0]]['user_extended_struct_text'];
if($text_val)
{