makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2023-01-17 20:36:38 +01:00
commit 3914f1ec41
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/setup-phpbb.sh vendored
View file

@ -31,6 +31,6 @@ php ../composer.phar install --dev --no-interaction
if [[ "$PHP_VERSION" =~ ^nightly$ || "$PHP_VERSION" =~ ^8 ]] if [[ "$PHP_VERSION" =~ ^nightly$ || "$PHP_VERSION" =~ ^8 ]]
then then
php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \ php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \
&& php ../composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-all-dependencies --ignore-platform-reqs && php ../composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 doctrine/instantiator:^1.4 --dev --update-with-all-dependencies --ignore-platform-reqs
fi fi
cd .. cd ..

2
.github/workflows/tests.yml vendored
View file

@ -560,7 +560,7 @@ jobs:
cd ${env:GITHUB_WORKSPACE}\phpBB cd ${env:GITHUB_WORKSPACE}\phpBB
php ..\composer.phar install php ..\composer.phar install
php ..\composer.phar remove phpunit/dbunit --dev --update-with-dependencies php ..\composer.phar remove phpunit/dbunit --dev --update-with-dependencies
php ..\composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-all-dependencies --ignore-platform-reqs php ..\composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 doctrine/instantiator:^1.4 --dev --update-with-all-dependencies --ignore-platform-reqs
cd .. cd ..
- name: Setup database - name: Setup database
run: | run: |

9
phpBB/cron.php
View file

@ -31,6 +31,12 @@ $cron_type = $request->variable('cron_type', '');
$get_params_array = $request->get_super_global(\phpbb\request\request_interface::GET); $get_params_array = $request->get_super_global(\phpbb\request\request_interface::GET);
/* @var $http_kernel \Symfony\Component\HttpKernel\HttpKernel */
$http_kernel = $phpbb_container->get('http_kernel');
/* @var $symfony_request \phpbb\symfony_request */
$symfony_request = $phpbb_container->get('symfony_request');
/** @var \phpbb\controller\helper $controller_helper */ /** @var \phpbb\controller\helper $controller_helper */
$controller_helper = $phpbb_container->get('controller.helper'); $controller_helper = $phpbb_container->get('controller.helper');
$cron_route = 'phpbb_cron_run'; $cron_route = 'phpbb_cron_run';
@ -42,6 +48,8 @@ try
Response::HTTP_MOVED_PERMANENTLY Response::HTTP_MOVED_PERMANENTLY
); );
$response->send(); $response->send();
$http_kernel->terminate($symfony_request, $response);
exit();
} }
catch (RouteNotFoundException $exception) catch (RouteNotFoundException $exception)
{ {
@ -68,3 +76,4 @@ $response = new Response(
$error_code $error_code
); );
$response->send(); $response->send();
$http_kernel->terminate($symfony_request, $response);

2
phpBB/phpbb/session.php
View file

@ -430,7 +430,7 @@ class session
// Else check the autologin length... and also removing those having autologin enabled but no longer allowed board-wide. // Else check the autologin length... and also removing those having autologin enabled but no longer allowed board-wide.
if (!$this->data['session_autologin']) if (!$this->data['session_autologin'])
{ {
if ($this->data['session_time'] < $this->time_now - ($config['session_length'] + 60)) if ($this->data['session_time'] < $this->time_now - ((int) $config['session_length'] + 60))
{ {
$session_expired = true; $session_expired = true;
} }