aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-21 19:58:49 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-21 19:58:49 +0100
commitf7051a958cf7e01ec6131940037ad92e669f8043 (patch)
tree6d73dbc7823cfc5be7cff408f2f35fc215ecbc16
parentac33ee22900934e758a1715507e3a4206310aec9 (diff)
parentd6e8cce44b63efe69fa698708fbd3d169ca5ed71 (diff)
downloadforums-f7051a958cf7e01ec6131940037ad92e669f8043.tar
forums-f7051a958cf7e01ec6131940037ad92e669f8043.tar.gz
forums-f7051a958cf7e01ec6131940037ad92e669f8043.tar.bz2
forums-f7051a958cf7e01ec6131940037ad92e669f8043.tar.xz
forums-f7051a958cf7e01ec6131940037ad92e669f8043.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/viewtopic.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 30beea337a..a44169d3f1 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -616,7 +616,9 @@ $base_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=
* @var int topic_id Topic ID
* @var array topic_tracking_info Array with topic tracking data
* @var int total_posts Topic total posts count
+* @var string viewtopic_url URL to the topic page
* @since 3.1.0-RC4
+* @change 3.1.2-RC1 Added viewtopic_url
*/
$vars = array(
'base_url',
@@ -628,6 +630,7 @@ $vars = array(
'topic_id',
'topic_tracking_info',
'total_posts',
+ 'viewtopic_url',
);
extract($phpbb_dispatcher->trigger_event('core.viewtopic_assign_template_vars_before', compact($vars)));