dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Allow users who are partially blocked to delete revisions."
[lhc/web/wiklou.git]
/
includes
/
session
/
ImmutableSessionProviderWithCookie.php
diff --git
a/includes/session/ImmutableSessionProviderWithCookie.php
b/includes/session/ImmutableSessionProviderWithCookie.php
index
1cab3d3
..
149bb80
100644
(file)
--- a/
includes/session/ImmutableSessionProviderWithCookie.php
+++ b/
includes/session/ImmutableSessionProviderWithCookie.php
@@
-41,6
+41,7
@@
abstract class ImmutableSessionProviderWithCookie extends SessionProvider {
/** @var string|null */
protected $sessionCookieName = null;
/** @var string|null */
protected $sessionCookieName = null;
+ /** @var mixed[] */
protected $sessionCookieOptions = [];
/**
protected $sessionCookieOptions = [];
/**
@@
-84,9
+85,7
@@
abstract class ImmutableSessionProviderWithCookie extends SessionProvider {
);
}
);
}
- $prefix = isset( $this->sessionCookieOptions['prefix'] )
- ? $this->sessionCookieOptions['prefix']
- : $this->config->get( 'CookiePrefix' );
+ $prefix = $this->sessionCookieOptions['prefix'] ?? $this->config->get( 'CookiePrefix' );
$id = $request->getCookie( $this->sessionCookieName, $prefix );
return SessionManager::validateSessionId( $id ) ? $id : null;
}
$id = $request->getCookie( $this->sessionCookieName, $prefix );
return SessionManager::validateSessionId( $id ) ? $id : null;
}
@@
-141,9
+140,7
@@
abstract class ImmutableSessionProviderWithCookie extends SessionProvider {
return [];
}
return [];
}
- $prefix = isset( $this->sessionCookieOptions['prefix'] )
- ? $this->sessionCookieOptions['prefix']
- : $this->config->get( 'CookiePrefix' );
+ $prefix = $this->sessionCookieOptions['prefix'] ?? $this->config->get( 'CookiePrefix' );
return [ $prefix . $this->sessionCookieName ];
}
return [ $prefix . $this->sessionCookieName ];
}