Skip to content

Two tweaks to make this compatible with 1.29 #4

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

Open
caseywatts wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Two tweaks to make this compatible with 1.29 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3327f86
wfSetupSession is deprecated, so using \$session->persist() instead.
caseywatts Jun 13, 2017
68b6c42
remove action=purge from post-login screen, because now it makes the …
caseywatts Jun 13, 2017
4cefdfd
add in path to use jasig/phpcas via composer
caseywatts Jun 13, 2017
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
6 changes: 3 additions & 3 deletions CASAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
}
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions CASAuthSettings.php.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down