diff options
| author | Sam Wilson <sam@samwilson.id.au> | 2022-06-11 17:35:37 +0800 |
|---|---|---|
| committer | Sam Wilson <sam@samwilson.id.au> | 2022-06-11 17:35:37 +0800 |
| commit | 2a917876614fedc6d5673b4d0ca06d832512871a (patch) | |
| tree | 358297d0f8622ee1e51c9d117ebbb4ad0c236f27 /includes/session/CookieSessionProvider.php | |
| parent | 2efa42f43776defcedd20b45e4fb5b8c4372c10c (diff) | |
| download | mediawikicore-2a917876614fedc6d5673b4d0ca06d832512871a.tar.gz mediawikicore-2a917876614fedc6d5673b4d0ca06d832512871a.zip | |
Avoid passing null to strcasecmp(), for PHP 8.1
Bug: T307282
Change-Id: I523928b3f5e0e02e23c45e7023d9d2701d986e5c
Diffstat (limited to 'includes/session/CookieSessionProvider.php')
| -rw-r--r-- | includes/session/CookieSessionProvider.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php index f497ceeeb7c3..785b77cc9efa 100644 --- a/includes/session/CookieSessionProvider.php +++ b/includes/session/CookieSessionProvider.php @@ -98,8 +98,8 @@ class CookieSessionProvider extends SessionProvider { ?: $this->getConfig()->get( MainConfigNames::CookiePrefix ) . '_session', ]; - $this->useCrossSiteCookies = - strcasecmp( $this->getConfig()->get( MainConfigNames::CookieSameSite ), 'none' ) === 0; + $sameSite = $this->getConfig()->get( MainConfigNames::CookieSameSite ); + $this->useCrossSiteCookies = $sameSite !== null && strcasecmp( $sameSite, 'none' ) === 0; // @codeCoverageIgnoreStart $this->cookieOptions += [ @@ -110,7 +110,7 @@ class CookieSessionProvider extends SessionProvider { 'secure' => $this->getConfig()->get( MainConfigNames::CookieSecure ) || $this->getConfig()->get( MainConfigNames::ForceHTTPS ), 'httpOnly' => $this->getConfig()->get( MainConfigNames::CookieHttpOnly ), - 'sameSite' => $this->getConfig()->get( MainConfigNames::CookieSameSite ), + 'sameSite' => $sameSite, ]; } |