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/viewforum.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/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 0ab29315ee..03388c6454 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -435,9 +435,9 @@ $sql_array = array( * Author, Post time, Replies, Subject, Views * @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 +* @changed 3.1.0-RC4 Added forum_data var +* @changed 3.1.4-RC1 Added forum_id, topics_count, sort_days, sort_key and sort_dir vars +* @changed 3.1.9-RC1 Fix types of properties */ $vars = array( 'forum_data', |