jenkins-bot has submitted this change and it was merged.
Change subject: Update documentation and remove unused variable
......................................................................
Update documentation and remove unused variable
Change-Id: I2c87af166b3e7e31ad5b6771f465896f05c6f287
---
M CentralAuthHooks.php
M CentralAuthUser.php
2 files changed, 7 insertions(+), 4 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralAuthHooks.php b/CentralAuthHooks.php
index 49629d0..d1e5aa6 100644
--- a/CentralAuthHooks.php
+++ b/CentralAuthHooks.php
@@ -395,6 +395,7 @@
/**
* @param User $user
* @param CentralAuthUser $centralUser
+ * @param string $inject_html
* @return bool
*/
protected static function doCentralLoginRedirect( User $user,
CentralAuthUser $centralUser, &$inject_html ) {
@@ -930,6 +931,7 @@
* @param $user User
* @param $session
* @param $cookies
+ * @throws MWException
* @return bool
*/
static function onUserSetCookies( $user, &$session, &$cookies ) {
@@ -1040,7 +1042,7 @@
global $wgCentralAuthSilentLogin;
if ( $wgCentralAuthSilentLogin ) {
global $wgCentralAuthLoginWiki,
$wgCentralAuthAutoLoginWikis;
- foreach ( $wgCentralAuthAutoLoginWikis
as $alt => $wiki ) {
+ foreach ( $wgCentralAuthAutoLoginWikis
as $wiki ) {
$wiki = WikiMap::getWiki( $wiki
);
// Use
WikiReference::getFullUrl(), returns a protocol-relative URL if needed
$url = wfAppendQuery(
$wiki->getFullUrl( 'Special:CentralAutoLogin/start' ), array(
diff --git a/CentralAuthUser.php b/CentralAuthUser.php
index 5108af4..042dc4a 100644
--- a/CentralAuthUser.php
+++ b/CentralAuthUser.php
@@ -1967,13 +1967,14 @@
/**
* @static
- * @param $name
- * @param $value
- * @param $exp
+ * @param $name
+ * @param $value
+ * @param $exp
* @param bool $secure
* true: Force setting the secure attribute when setting the cookie
* false: Force NOT setting the secure attribute when setting the
cookie
* null (default): Use the default ($wgCookieSecure) to set the secure
attribute
+ * @throws MWException
* @return void
*/
static function setCookie( $name, $value, $exp = -1, $secure = null ) {
--
To view, visit https://gerrit.wikimedia.org/r/77694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2c87af166b3e7e31ad5b6771f465896f05c6f287
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
