diff --git a/CASAuth.php b/CASAuth.php index 6cac4ac..03a1e0b 100644 --- a/CASAuth.php +++ b/CASAuth.php @@ -156,8 +156,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()); } } } @@ -281,7 +280,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); diff --git a/CASAuthSettings.php.template b/CASAuthSettings.php.template index d955a1a..fd6465e 100644 --- a/CASAuthSettings.php.template +++ b/CASAuthSettings.php.template @@ -9,6 +9,8 @@ # information. # # Default: $CASAuth["phpCAS"]="$IP/extensions/CASAuth/CAS"; +# via composer: $CASAuth["phpCAS"]="$IP/vendor/jasig/phpcas"; + $CASAuth["phpCAS"]="$IP/extensions/CASAuth/CAS"; # Location of the CAS authentication server. You must set this to the location