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 "Log multiple IPs using the same session or the same user account"
[lhc/web/wiklou.git]
/
includes
/
session
/
SessionManager.php
diff --git
a/includes/session/SessionManager.php
b/includes/session/SessionManager.php
index
2dc8910
..
d3b7a2d
100644
(file)
--- a/
includes/session/SessionManager.php
+++ b/
includes/session/SessionManager.php
@@
-745,13
+745,14
@@
final class SessionManager implements SessionManagerInterface {
if ( $newProviderMetadata !== $providerMetadata ) {
$newParams['metadata'] = $newProviderMetadata;
}
if ( $newProviderMetadata !== $providerMetadata ) {
$newParams['metadata'] = $newProviderMetadata;
}
- } catch (
\UnexpectedValu
eException $ex ) {
+ } catch (
MetadataMerg
eException $ex ) {
$this->logger->warning(
'Session "{session}": Metadata merge failed: {exception}',
array(
'session' => $info,
'exception' => $ex,
$this->logger->warning(
'Session "{session}": Metadata merge failed: {exception}',
array(
'session' => $info,
'exception' => $ex,
- ) );
+ ) + $ex->getContext()
+ );
return false;
}
}
return false;
}
}