diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-19 01:20:01 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-19 01:20:01 +0200 |
| commit | 5091600a16eeee4dbd4c40ca1f051a9774887100 (patch) | |
| tree | c1876da134e70ea93c382afc92b0775a73e94ef1 | |
| parent | 471c6fa860a11da3043067d633caf0822864fe3d (diff) | |
| parent | 98f02ece97cd92de6f71632247a439a1ba25a408 (diff) | |
| download | forums-5091600a16eeee4dbd4c40ca1f051a9774887100.tar forums-5091600a16eeee4dbd4c40ca1f051a9774887100.tar.gz forums-5091600a16eeee4dbd4c40ca1f051a9774887100.tar.bz2 forums-5091600a16eeee4dbd4c40ca1f051a9774887100.tar.xz forums-5091600a16eeee4dbd4c40ca1f051a9774887100.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13062] Fix name of "ORDER_BY" key in SQL array
| -rw-r--r-- | phpBB/viewforum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index a1e8c9814b..6379da6802 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -547,7 +547,7 @@ $sql_ary = array( AND t.topic_type IN (" . POST_NORMAL . ', ' . POST_STICKY . ") $sql_approved $sql_limit_time", - 'ORDER BY' => 't.topic_type ' . ((!$store_reverse) ? 'DESC' : 'ASC') . ', ' . $sql_sort_order, + 'ORDER_BY' => 't.topic_type ' . ((!$store_reverse) ? 'DESC' : 'ASC') . ', ' . $sql_sort_order, ); /** |