diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-04-09 21:20:24 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-04-09 21:20:24 +0000 |
| commit | fc394d6302b45ff61d8c55e3e9516f3c212bf04c (patch) | |
| tree | 4be365327698f094cb78f0a3825a19498d954843 /phpBB/includes/functions.php | |
| parent | 5b24c3a7fb5eaef0c6a1374eff1435322097f0b9 (diff) | |
| download | forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.tar forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.tar.gz forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.tar.bz2 forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.tar.xz forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.zip | |
- check m_ permission for quickmod [Bug #1317]
- don't sync the global forum (id 0) [Bug #1383]
- corrections to available time zones [Bug #1306]
- only display open reports on mcp_front
- added whois information to mcp_post [Bug #1400]
- copy "dot" when copying a topic [Bug #1321]
- some language corrections [Bugs #1324, #1255, #1317]
- mozWrap scrolls back to previous position now [Bug #1190]
- some style related corrections [Bugs #1322, #1454, #1316]
- corrected copyrights [Bug #1468]
- fixed links on search results page [Bug #1469]
git-svn-id: file:///svn/phpbb/trunk@5779 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index da93b4e403..0a6bf8d126 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -544,8 +544,10 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $mat /** * Marks a topic/forum as read * Marks a topic as posted to +* +* @param int $user_id can only be used with $mode == 'post' */ -function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0) +function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $user_id = 0) { global $db, $user, $config; @@ -786,7 +788,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0) $db->sql_return_on_error(true); $sql_ary = array( - 'user_id' => $user->data['user_id'], + 'user_id' => (!$user_id) ? $user->data['user_id'] : $user_id, 'topic_id' => $topic_id, 'topic_posted' => 1 ); |