mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8567 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
c41388ce8a
commit
54db19aef0
2 changed files with 6 additions and 1 deletions
|
@ -208,6 +208,11 @@ function get_folder($user_id, $folder_id = false)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($folder_id !== false && !isset($folder[$folder_id]))
|
||||||
|
{
|
||||||
|
trigger_error('UNKNOWN_FOLDER');
|
||||||
|
}
|
||||||
|
|
||||||
return $folder;
|
return $folder;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -493,7 +493,7 @@ function get_pm_from($folder_id, $folder, $user_id)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$pm_count = $folder[$folder_id]['num_messages'];
|
$pm_count = (!empty($folder[$folder_id]['num_messages'])) ? $folder[$folder_id]['num_messages'] : 0;
|
||||||
$sql_limit_time = '';
|
$sql_limit_time = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue