Skip to content

fixes for Mediawiki 1.35 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tpokorra wants to merge 2 commits into from
Closed

fixes for Mediawiki 1.35 #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e2d0b1
fix for Mediawiki 1.35
tpokorra Apr 10, 2021
cabb556
another fix for signing out
tpokorra Apr 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions CASAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,7 @@ function casLogin($user) {
if ($returnto) {
$target = Title::newFromText($returnto);
if ($target) {
//action=purge is used to purge the cache
$wgOut->redirect($target->getFullUrl('action=purge'));
$wgOut->redirect($target->getFullUrl());
}
}
}
Expand Down Expand Up @@ -226,8 +225,11 @@ function casPrefs($user, &$preferences) {
function casPostAuth($ticket2logout) {

// remember the current session name and id
$old_session_name=session_name();
$old_session_id=session_id();
$session = MediaWiki\Session\SessionManager::getGlobalSession();
$session->clear();
return;
// $old_session_name=$session->getName();
$old_session_id=$session->getId();

// close the current session for now
session_write_close();
Expand Down Expand Up @@ -297,7 +299,8 @@ function casSetup() {
global $casIsSetUp;

// Make the session persistent so that phpCAS doesn't change the session id
wfSetupSession();
$session = MediaWiki\Session\SessionManager::getGlobalSession();
$session->persist();

require_once($CASAuth["phpCAS"]."/CAS.php");
phpCAS::client($CASAuth["Version"], $CASAuth["Server"], $CASAuth["Port"], $CASAuth["Url"], false);
Expand Down