diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-26 22:48:52 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-26 22:48:52 +0100 |
| commit | 48d208a3a62fea25faaba90ca131194294d810e2 (patch) | |
| tree | 68516ee0bc9b0efd33409fa1650d58c6bd3504b6 /phpBB | |
| parent | 72f7c5e9c241aba2daba21d545e44788c20ea26e (diff) | |
| parent | 4928afedc642593e6529f4056ca07e27f57ac99b (diff) | |
| download | forums-48d208a3a62fea25faaba90ca131194294d810e2.tar forums-48d208a3a62fea25faaba90ca131194294d810e2.tar.gz forums-48d208a3a62fea25faaba90ca131194294d810e2.tar.bz2 forums-48d208a3a62fea25faaba90ca131194294d810e2.tar.xz forums-48d208a3a62fea25faaba90ca131194294d810e2.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/functions_mcp.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_mcp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_mcp.php b/phpBB/includes/functions_mcp.php index a674d0972c..ad3b1a8e28 100644 --- a/phpBB/includes/functions_mcp.php +++ b/phpBB/includes/functions_mcp.php @@ -369,7 +369,7 @@ function phpbb_get_pm_data($pm_ids) */ function phpbb_mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, &$sort_order_sql, &$total, $forum_id = 0, $topic_id = 0, $where_sql = 'WHERE') { - global $db, $user, $auth, $template, $request; + global $db, $user, $auth, $template, $request, $phpbb_dispatcher; $sort_days = $request->variable('st', 0); $min_time = ($sort_days) ? time() - ($sort_days * 86400) : 0; |