mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 04:24:31 +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-02-26 23:11:16 +01:00
parent 49d42e2881 ec70ec96e7
commit 30db51a86e
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
phpBB/includes/functions_content.php
View File

@ -47,7 +47,7 @@ if (!defined('IN_PHPBB'))
*/ */
function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, &$sort_dir, &$s_limit_days, &$s_sort_key, &$s_sort_dir, &$u_sort_param, $def_st = false, $def_sk = false, $def_sd = false) function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, &$sort_dir, &$s_limit_days, &$s_sort_key, &$s_sort_dir, &$u_sort_param, $def_st = false, $def_sk = false, $def_sd = false)
{ {
global $user; global $user, $phpbb_dispatcher;
$sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']); $sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);
@ -106,6 +106,42 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
$u_sort_param .= ($selected !== $sort_ary['default']) ? ((strlen($u_sort_param)) ? '&' : '') . "{$name}={$selected}" : ''; $u_sort_param .= ($selected !== $sort_ary['default']) ? ((strlen($u_sort_param)) ? '&' : '') . "{$name}={$selected}" : '';
} }
/**
* Run code before generated sort selects are returned
*
* @event core.gen_sort_selects_after
* @var int limit_days Days limit
* @var array sort_by_text Sort by text options
* @var int sort_days Sort by days flag
* @var string sort_key Sort key
* @var string sort_dir Sort dir
* @var string s_limit_days String of days limit
* @var string s_sort_key String of sort key
* @var string s_sort_dir String of sort dir
* @var string u_sort_param Sort URL params
* @var bool def_st Default sort days
* @var bool def_sk Default sort key
* @var bool def_sd Default sort dir
* @var array sorts Sorts
* @since 3.1.9-RC1
*/
$vars = array(
'limit_days',
'sort_by_text',
'sort_days',
'sort_key',
'sort_dir',
's_limit_days',
's_sort_key',
's_sort_dir',
'u_sort_param',
'def_st',
'def_sk',
'def_sd',
'sorts',
);
extract($phpbb_dispatcher->trigger_event('core.gen_sort_selects_after', compact($vars)));
return; return;
} }