aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-03-27 12:37:27 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-03-27 12:37:27 +0200
commita7950bd8ced7cae6b472052456efe4626dd94337 (patch)
treee890086ec071d1ec1a35ed7b49a6af15d7e61450
parent465eabbc65c16608b0358f9b13f56c90bddbc755 (diff)
parent50737da051bc949b71aa7516dda8bebbfe61c73c (diff)
downloadforums-a7950bd8ced7cae6b472052456efe4626dd94337.tar
forums-a7950bd8ced7cae6b472052456efe4626dd94337.tar.gz
forums-a7950bd8ced7cae6b472052456efe4626dd94337.tar.bz2
forums-a7950bd8ced7cae6b472052456efe4626dd94337.tar.xz
forums-a7950bd8ced7cae6b472052456efe4626dd94337.zip
Merge branch '3.1.x' into 3.2.x
-rw-r--r--phpBB/viewforum.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index a2ab4d56f5..7db5b8759c 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -427,15 +427,16 @@ $sql_array = array(
* @event core.viewforum_get_topic_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 forum_id The forum_id whose topics are being listed
-* @var array topics_count The total number of topics for display
-* @var array 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 int forum_id The forum_id whose topics are being listed
+* @var int topics_count The total number of topics for display
+* @var int sort_days The oldest topic displayable in elapsed days
+* @var string sort_key The sorting by. It is one of the first character of (in low case):
* 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
* @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.9-RC1 Fix types of properties
*/
$vars = array(
'forum_data',