Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284222
Change subject: Avoid read-only exceptions in updateCUEmailData()
......................................................................
Avoid read-only exceptions in updateCUEmailData()
Change-Id: Ib970ac1f341baeceead19effb6da12752d23c1fa
---
M CheckUser.hooks.php
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser
refs/changes/22/284222/1
diff --git a/CheckUser.hooks.php b/CheckUser.hooks.php
index 7a5a8df..f83a6f5 100755
--- a/CheckUser.hooks.php
+++ b/CheckUser.hooks.php
@@ -125,9 +125,13 @@
*/
public static function updateCUEmailData( $to, $from, $subject, $text )
{
global $wgSecretKey, $wgRequest, $wgCUPublicKey;
+
if ( !$wgSecretKey || $from->name == $to->name ) {
return true;
+ } elseif ( wfReadOnly() ) {
+ return true;
}
+
$userFrom = User::newFromName( $from->name );
$userTo = User::newFromName( $to->name );
$hash = md5( $userTo->getEmail() . $userTo->getId() .
$wgSecretKey );
--
To view, visit https://gerrit.wikimedia.org/r/284222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib970ac1f341baeceead19effb6da12752d23c1fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
