aboutsummaryrefslogtreecommitdiffstats
path: root/includes/session
diff options
context:
space:
mode:
authorGergő Tisza <tgr.huwiki@gmail.com>2016-01-21 04:24:43 -0800
committerGergő Tisza <tgr.huwiki@gmail.com>2016-01-21 04:24:43 -0800
commitbfed32eb78b6c720b16bc7ed60153fd2fe257a9e (patch)
tree1e374df493b3a0559fdefa95394269ad7a9ade41 /includes/session
parent23164604db9727b44d6d420b3344636da4934be1 (diff)
downloadmediawikicore-bfed32eb78b6c720b16bc7ed60153fd2fe257a9e.tar.gz
mediawikicore-bfed32eb78b6c720b16bc7ed60153fd2fe257a9e.zip
Do not raise a PHP warning when session write fails
Bug: T124126 Change-Id: I3482d8dba4a4d9fe92a39439df41c0e70bfef35d
Diffstat (limited to 'includes/session')
-rw-r--r--includes/session/PHPSessionHandler.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/session/PHPSessionHandler.php b/includes/session/PHPSessionHandler.php
index 44d14cd009ac..53443211f0d6 100644
--- a/includes/session/PHPSessionHandler.php
+++ b/includes/session/PHPSessionHandler.php
@@ -238,10 +238,12 @@ class PHPSessionHandler {
$session = $this->manager->getSessionById( $id, true );
if ( !$session ) {
+ // This can happen under normal circumstances, if the session exists but is
+ // invalid. Let's emit a log warning instead of a PHP warning.
$this->logger->warning(
__METHOD__ . ": Session \"$id\" cannot be loaded, skipping write."
);
- return false;
+ return true;
}
// First, decode the string PHP handed us