diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-02-11 15:21:00 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-02-11 21:48:20 +0100 |
| commit | f27cdad73e7a4af913414522d85855136bf50b31 (patch) | |
| tree | 33ce0eb4d82bdf011b6235b60daea812c3902982 /phpBB/viewtopic.php | |
| parent | 59ad9401d9db8c6b6612f01f7b295f12c4cdccf7 (diff) | |
| parent | 45199adebdfc00f436a719de1c5772429367b756 (diff) | |
| download | forums-f27cdad73e7a4af913414522d85855136bf50b31.tar forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.gz forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.bz2 forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.xz forums-f27cdad73e7a4af913414522d85855136bf50b31.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 01c5f9ed42..7510a1281d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -703,7 +703,7 @@ $base_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t= * @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 +* @changed 3.1.2-RC1 Added viewtopic_url */ $vars = array( 'base_url', @@ -1203,7 +1203,7 @@ $sql_ary = array( * @var int start Pagination information * @var array sql_ary The SQL array to get the data of posts and posters * @since 3.1.0-a1 -* @change 3.1.0-a2 Added vars forum_id, topic_id, topic_data, post_list, sort_days, sort_key, sort_dir, start +* @changed 3.1.0-a2 Added vars forum_id, topic_id, topic_data, post_list, sort_days, sort_key, sort_dir, start */ $vars = array( 'forum_id', @@ -2015,9 +2015,9 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) * @var array post_row Template block array of the post * @var array topic_data Array with topic data * @since 3.1.0-a1 - * @change 3.1.0-a3 Added vars start, current_row_number, end, attachments - * @change 3.1.0-b3 Added topic_data array, total_posts - * @change 3.1.0-RC3 Added poster_id + * @changed 3.1.0-a3 Added vars start, current_row_number, end, attachments + * @changed 3.1.0-b3 Added topic_data array, total_posts + * @changed 3.1.0-RC3 Added poster_id */ $vars = array( 'start', @@ -2115,7 +2115,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) * @var array post_row Template block array of the post * @var array topic_data Array with topic data * @since 3.1.0-a3 - * @change 3.1.0-b3 Added topic_data array, total_posts + * @changed 3.1.0-b3 Added topic_data array, total_posts */ $vars = array( 'start', @@ -2278,7 +2278,7 @@ $page_title = $topic_data['topic_title'] . ($start ? ' - ' . sprintf($user->lang * @var int start Start offset used to calculate the page * @var array post_list Array with post_ids we are going to display * @since 3.1.0-a1 -* @change 3.1.0-RC4 Added post_list var +* @changed 3.1.0-RC4 Added post_list var */ $vars = array('page_title', 'topic_data', 'forum_id', 'start', 'post_list'); extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_page_title', compact($vars))); |