Merge branch 'k0nsl-ticket/12677' into develop-ascraeus

* k0nsl-ticket/12677:
  [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
This commit is contained in:
Joas Schilling 2014-06-09 15:43:58 +02:00
commit 223c8c4784

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';
$is_watching = 0;
// Is user watching this thread?
// Is user watching this topic?
if ($user_id != ANONYMOUS)
{
$can_watch = true;