Skip to content

Commit 64aaac2

Browse files
Merge pull request #154 from nextcloud/backport/151/stable28
[stable28] ignore null user on logout
2 parents 944dd82 + b73faf6 commit 64aaac2

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

.github/workflows/phpunit-mysql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
matrix:
4141
php-versions: ['8.0', '8.1', '8.2']
42-
server-versions: ['master']
42+
server-versions: ['stable28']
4343

4444
services:
4545
mysql:

.github/workflows/phpunit-oci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
matrix:
4141
php-versions: ['8.0']
42-
server-versions: ['master']
42+
server-versions: ['stable28']
4343

4444
services:
4545
oracle:

.github/workflows/phpunit-pgsql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
matrix:
4141
php-versions: ['8.0']
42-
server-versions: ['master']
42+
server-versions: ['stable28']
4343

4444
services:
4545
postgres:

.github/workflows/phpunit-sqlite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
matrix:
4141
php-versions: ['8.0']
42-
server-versions: ['master']
42+
server-versions: ['stable28']
4343

4444
steps:
4545
- name: Set app env

.github/workflows/phpunit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
php-versions: ['8.0']
2222
databases: ['sqlite']
23-
server-versions: ['master']
23+
server-versions: ['stable28']
2424

2525
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
2626

lib/Listeners/UserLoggedOut.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ public function handle(Event $event): void {
5454
return;
5555
}
5656

57+
$user = $event->getUser();
58+
5759
/** only used in slave mode */
58-
if ($this->globalSiteSelector->getMode() !== GlobalSiteSelector::SLAVE) {
60+
if ($user === null || $this->globalSiteSelector->getMode() !== GlobalSiteSelector::SLAVE) {
5961
return;
6062
}
6163

62-
$this->slave->handleLogoutRequest($event->getUser());
64+
$this->slave->handleLogoutRequest($user);
6365
}
6466
}

0 commit comments

Comments
 (0)