diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 15:47:42 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 15:47:42 +0200 |
| commit | ca259c1760a2da3a808de8dd4d264413952aba29 (patch) | |
| tree | 06d24726085924c01952c927cc232e5b49a09a7d | |
| parent | d1055bdd9e5211bc3017f763f41672c275cc693a (diff) | |
| parent | 223c8c4784a76599042e8f505ca8ca954a898167 (diff) | |
| download | forums-ca259c1760a2da3a808de8dd4d264413952aba29.tar forums-ca259c1760a2da3a808de8dd4d264413952aba29.tar.gz forums-ca259c1760a2da3a808de8dd4d264413952aba29.tar.bz2 forums-ca259c1760a2da3a808de8dd4d264413952aba29.tar.xz forums-ca259c1760a2da3a808de8dd4d264413952aba29.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index ea5ff08c01..03996f9fc2 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -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; |