mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-11 05:48:51 +00:00
Merge remote-tracking branch 'p/ticket/10136' into develop
* p/ticket/10136: [ticket/10136] Added missing $request globalizations in functions.php.
This commit is contained in:
commit
6dd0e40d02
1 changed files with 2 additions and 2 deletions
|
@ -1344,7 +1344,7 @@ function get_topic_tracking($forum_id, $topic_ids, &$rowset, $forum_mark_time, $
|
||||||
*/
|
*/
|
||||||
function get_complete_topic_tracking($forum_id, $topic_ids, $global_announce_list = false)
|
function get_complete_topic_tracking($forum_id, $topic_ids, $global_announce_list = false)
|
||||||
{
|
{
|
||||||
global $config, $user;
|
global $config, $user, $request;
|
||||||
|
|
||||||
$last_read = array();
|
$last_read = array();
|
||||||
|
|
||||||
|
@ -1586,7 +1586,7 @@ function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $s
|
||||||
*/
|
*/
|
||||||
function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_time = false, $mark_time_forum = false)
|
function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_time = false, $mark_time_forum = false)
|
||||||
{
|
{
|
||||||
global $db, $tracking_topics, $user, $config;
|
global $db, $tracking_topics, $user, $config, $request;
|
||||||
|
|
||||||
// Determine the users last forum mark time if not given.
|
// Determine the users last forum mark time if not given.
|
||||||
if ($mark_time_forum === false)
|
if ($mark_time_forum === false)
|
||||||
|
|
Loading…
Add table
Reference in a new issue