jenkins-bot has submitted this change and it was merged.
Change subject: Remove $wgSessionStarted
......................................................................
Remove $wgSessionStarted
This variable is useless since there is the check "session_id() !== ''"
to do the same, that works correctly if the session has been started
during the request.
Change-Id: I5081e79e30e01c97aa0e59b106cc75e9d1ba951a
---
M includes/Setup.php
1 file changed, 4 insertions(+), 7 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Setup.php b/includes/Setup.php
index 18d1e33..391bc13 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -551,13 +551,10 @@
session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix .
'_session' );
}
-if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
- if ( $wgRequest->checkSessionCookie() || isset(
$_COOKIE[$wgCookiePrefix . 'Token'] ) ) {
- wfSetupSession();
- $wgSessionStarted = true;
- } else {
- $wgSessionStarted = false;
- }
+if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode &&
+ ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix .
'Token'] ) )
+) {
+ wfSetupSession();
}
wfProfileOut( $fname . '-session' );
--
To view, visit https://gerrit.wikimedia.org/r/132624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5081e79e30e01c97aa0e59b106cc75e9d1ba951a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex <coderev...@emsenhuber.ch>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: IAlex <coderev...@emsenhuber.ch>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: PleaseStand <pleasest...@live.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
