diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 15:43:58 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 15:43:58 +0200 |
| commit | 223c8c4784a76599042e8f505ca8ca954a898167 (patch) | |
| tree | 323903aad21aeed857ab061a2eea8e5d1a93a6a9 /phpBB/includes/functions_display.php | |
| parent | 5e9cb35457bbaf15655146ea5f9ad1180c372bb2 (diff) | |
| parent | 4d3fcd19ac020b8bcb8e170e4fa2067d2c4501a9 (diff) | |
| download | forums-223c8c4784a76599042e8f505ca8ca954a898167.tar forums-223c8c4784a76599042e8f505ca8ca954a898167.tar.gz forums-223c8c4784a76599042e8f505ca8ca954a898167.tar.bz2 forums-223c8c4784a76599042e8f505ca8ca954a898167.tar.xz forums-223c8c4784a76599042e8f505ca8ca954a898167.zip | |
Merge branch 'k0nsl-ticket/12677' into develop-ascraeus
* k0nsl-ticket/12677:
[ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -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; |