diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-09 13:10:48 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-09 13:10:48 +0200 |
| commit | 19439b86b85cff6e4ebfe586a113835d2d016ecf (patch) | |
| tree | ac6528a56c0fef509b959f27cd7d24adf3bcfd9c /phpBB/includes/functions.php | |
| parent | 7d5438eb033e8d99a9b77a98292f0f7e89749fa6 (diff) | |
| parent | b64159c0019615b631f6127a8c38b42d2847b9f1 (diff) | |
| download | forums-19439b86b85cff6e4ebfe586a113835d2d016ecf.tar forums-19439b86b85cff6e4ebfe586a113835d2d016ecf.tar.gz forums-19439b86b85cff6e4ebfe586a113835d2d016ecf.tar.bz2 forums-19439b86b85cff6e4ebfe586a113835d2d016ecf.tar.xz forums-19439b86b85cff6e4ebfe586a113835d2d016ecf.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/7057] Use GET for quicksearch and add session id to hidden fields
[ticket/7057] Remove trailing whitespace in functions.php
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b22634ce88..8210a4f2e9 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4390,6 +4390,12 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 $user_lang = substr($user_lang, 0, strpos($user_lang, '-x-')); } + $s_search_hidden_fields = array(); + if ($_SID) + { + $s_search_hidden_fields['sid'] = $_SID; + } + // The following assigns all _common_ variables that may be used at any point in a template. $template->assign_vars(array( 'SITENAME' => $config['sitename'], @@ -4479,6 +4485,8 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'S_LOAD_UNREADS' => ($config['load_unreads_search'] && ($config['load_anon_lastread'] || $user->data['is_registered'])) ? true : false, + 'S_SEARCH_HIDDEN_FIELDS' => build_hidden_fields($s_search_hidden_fields), + 'T_THEME_PATH' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme', 'T_TEMPLATE_PATH' => "{$web_path}styles/" . $user->theme['template_path'] . '/template', 'T_SUPER_TEMPLATE_PATH' => (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? "{$web_path}styles/" . $user->theme['template_inherit_path'] . '/template' : "{$web_path}styles/" . $user->theme['template_path'] . '/template', |