Skip to content
Snippets Groups Projects
Commit e134ae17 authored by Balazs Varga's avatar Balazs Varga
Browse files

Merge modifications from the 1.2.4 official version

parent 4a4b7f55
Branches master
No related tags found
No related merge requests found
<?php <?php
/** /**
* Internal Verson: 10.1.0 * Internal Verson: 10.2.0
* Forked from version 1.2.3 (Works out of box with MW 1.7 or above) * Forked from version 1.2.4 (Works out of box with MW 1.7 or above)
* *
* Authentication Plugin for Shibboleth (http://shibboleth.internet2.edu) * Authentication Plugin for Shibboleth (http://shibboleth.internet2.edu)
* Derived from AuthPlugin.php * Derived from AuthPlugin.php
...@@ -196,7 +196,7 @@ class ShibAuthPlugin extends AuthPlugin { ...@@ -196,7 +196,7 @@ class ShibAuthPlugin extends AuthPlugin {
* @param $realname String * @param $realname String
* @return Boolean * @return Boolean
*/ */
public function addUser( $user, $password, $email = '', $realname = '' ) { function addUser( $user, $password, $email = '', $realname = '' ) {
return false; return false;
} }
...@@ -253,7 +253,7 @@ function ShibGetAuthHook() { ...@@ -253,7 +253,7 @@ function ShibGetAuthHook() {
$wgExtensionFunctions[] = 'SetupShibAuth'; $wgExtensionFunctions[] = 'SetupShibAuth';
$wgExtensionCredits['other'][] = array( $wgExtensionCredits['other'][] = array(
'name' => 'Shibboleth Authentication', 'name' => 'Shibboleth Authentication',
'version' => '1.2.3', 'version' => '1.2.4',
'author' => "Regents of the University of California, Steven Langenaken", 'author' => "Regents of the University of California, Steven Langenaken",
'url' => "http://www.mediawiki.org/wiki/Extension:Shibboleth_Authentication", 'url' => "http://www.mediawiki.org/wiki/Extension:Shibboleth_Authentication",
'description' => "Allows logging in through Shibboleth", 'description' => "Allows logging in through Shibboleth",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment