mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
This commit is contained in:
Joas Schilling
2014-06-09 15:47:42 +02:00
parent d1055bdd9e 223c8c4784
commit ca259c1760
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_display.php
View File

@@ -1157,7 +1157,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
$u_url .= ($mode == 'forum') ? '&f' : '&f=' . $forum_id . '&t'; $u_url .= ($mode == 'forum') ? '&f' : '&f=' . $forum_id . '&t';
$is_watching = 0; $is_watching = 0;
// Is user watching this thread? // Is user watching this topic?
if ($user_id != ANONYMOUS) if ($user_id != ANONYMOUS)
{ {
$can_watch = true; $can_watch = true;