diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-04-11 07:01:57 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-04-11 07:01:57 +0200 |
| commit | 6dd0e40d02272fca63b2bc5b3fa727e7a70c5c86 (patch) | |
| tree | bb2580ec6f06582d63f0a9ca98dd154a57021456 | |
| parent | 716f514ee9717906e2d62c9c401b78cab80a2141 (diff) | |
| parent | 6bb55e80a4070fa82c09f2b7442cde3391a5c184 (diff) | |
| download | forums-6dd0e40d02272fca63b2bc5b3fa727e7a70c5c86.tar forums-6dd0e40d02272fca63b2bc5b3fa727e7a70c5c86.tar.gz forums-6dd0e40d02272fca63b2bc5b3fa727e7a70c5c86.tar.bz2 forums-6dd0e40d02272fca63b2bc5b3fa727e7a70c5c86.tar.xz forums-6dd0e40d02272fca63b2bc5b3fa727e7a70c5c86.zip | |
Merge remote-tracking branch 'p/ticket/10136' into develop
* p/ticket/10136:
[ticket/10136] Added missing $request globalizations in functions.php.
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0638cfccb6..86c6bc2505 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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) { - global $config, $user; + global $config, $user, $request; $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) { - global $db, $tracking_topics, $user, $config; + global $db, $tracking_topics, $user, $config, $request; // Determine the users last forum mark time if not given. if ($mark_time_forum === false) |