mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 15:05:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander 2016-03-27 12:37:27 +02:00
commit a7950bd8ce
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/viewforum.php
View File

@ -427,15 +427,16 @@ $sql_array = array(
* @event core.viewforum_get_topic_data * @event core.viewforum_get_topic_data
* @var array forum_data Array with forum data * @var array forum_data Array with forum data
* @var array sql_array The SQL array to get the data of all topics * @var array sql_array The SQL array to get the data of all topics
* @var array forum_id The forum_id whose topics are being listed * @var int forum_id The forum_id whose topics are being listed
* @var array topics_count The total number of topics for display * @var int topics_count The total number of topics for display
* @var array sort_days The oldest topic displayable in elapsed days * @var int sort_days The oldest topic displayable in elapsed days
* @var array sort_key The sorting by. It is one of the first character of (in low case): * @var string sort_key The sorting by. It is one of the first character of (in low case):
* Author, Post time, Replies, Subject, Views * Author, Post time, Replies, Subject, Views
* @var array sort_dir Either "a" for ascending or "d" for descending * @var string sort_dir Either "a" for ascending or "d" for descending
* @since 3.1.0-a1 * @since 3.1.0-a1
* @change 3.1.0-RC4 Added forum_data var * @change 3.1.0-RC4 Added forum_data var
* @change 3.1.4-RC1 Added forum_id, topics_count, sort_days, sort_key and sort_dir vars * @change 3.1.4-RC1 Added forum_id, topics_count, sort_days, sort_key and sort_dir vars
* @change 3.1.9-RC1 Fix types of properties
*/ */
$vars = array( $vars = array(
'forum_data', 'forum_data',