makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-05-31 12:05:05 +02:00
commit 2bf92024c7
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 53 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/develop/create_variable_overview.php
View file

@ -464,7 +464,7 @@ $old_char = '';
foreach ($lang_references as $lang_var => $filenames) foreach ($lang_references as $lang_var => $filenames)
{ {
$var = preg_replace('#^L_(.*?)#', '\1', $lang_var); $var = preg_replace('#^L_(.*?)#', '\1', $lang_var);
$char = $var{0}; $char = $var[0];
if ($old_char != $char) if ($old_char != $char)
{ {
$old_char = $char; $old_char = $char;
@ -480,7 +480,7 @@ foreach ($lang_references as $lang_var => $filenames)
echo '.'; echo '.';
flush(); flush();
$var = preg_replace('#^L_(.*?)#', '\1', $lang_var); $var = preg_replace('#^L_(.*?)#', '\1', $lang_var);
$char = $var{0}; $char = $var[0];
if ($old_char != $char) if ($old_char != $char)
{ {
$old_char = $char; $old_char = $char;

53
phpBB/phpbb/controller/helper.php
View file

@ -143,11 +143,58 @@ class helper
'body' => $template_file, 'body' => $template_file,
)); ));
$this->display_footer(); $run_cron = true;
$page_footer_override = false;
$headers = !empty($this->user->data['is_bot']) ? array('X-PHPBB-IS-BOT' => 'yes') : array(); /**
* Execute code and/or overwrite page_footer()
*
* @event core.page_footer
* @var bool run_cron Shall we run cron tasks
* @var bool page_footer_override Shall we skip displaying the page footer
* @since 3.1.0-a1
* @changed 3.3.1-RC1 Added to controller helper render() method for backwards compatibility
*/
$vars = ['run_cron', 'page_footer_override'];
extract($this->dispatcher->trigger_event('core.page_footer', compact($vars)));
return new Response($this->template->assign_display('body'), $status_code, $headers); if (!$page_footer_override)
{
$this->display_footer($run_cron);
}
$headers = !empty($this->user->data['is_bot']) ? ['X-PHPBB-IS-BOT' => 'yes'] : [];
$display_template = true;
$exit_handler = true; // not used
/**
* Execute code and/or modify output before displaying the template.
*
* @event core.page_footer_after
* @var bool display_template Whether or not to display the template
* @var bool exit_handler Whether or not to run the exit_handler() (no effect on controller pages)
*
* @since 3.1.0-RC5
* @changed 3.3.1-RC1 Added to controller helper render() method for backwards compatibility
*/
$vars = ['display_template', 'exit_handler'];
extract($this->dispatcher->trigger_event('core.page_footer_after', compact($vars)));
$response = new Response($display_template ? $this->template->assign_display('body') : '', $status_code, $headers);
/**
* Modify response before output
*
* @event core.controller_helper_render_response
* @var Response response Symfony response object
*
* @since 3.3.1-RC1
*/
$vars = ['response'];
extract($this->dispatcher->trigger_event('core.controller_helper_render_response', compact($vars)));
return $response;
} }
/** /**

2
tests/test_framework/phpbb_session_test_case.php
View file

@ -63,7 +63,7 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case
FROM ' . SESSIONS_TABLE . ' FROM ' . SESSIONS_TABLE . '
WHERE session_time < ' . ($time_now - (int) $config['session_length']) . ' WHERE session_time < ' . ($time_now - (int) $config['session_length']) . '
AND session_user_id <> ' . ANONYMOUS . ' AND session_user_id <> ' . ANONYMOUS . '
GROUP BY session_user_id'; GROUP BY session_user_id ORDER BY session_user_id ASC';
$this->assertSqlResultEquals($expected_sessions, $sql, $message); $this->assertSqlResultEquals($expected_sessions, $sql, $message);
} }