jenkins-bot has submitted this change and it was merged.

Change subject: Add read-only check to Special:CheckUser
......................................................................


Add read-only check to Special:CheckUser

Logging and blocking requires writing to the DB.
Also little cleanup on noMatchesMessage().

Change-Id: Idf86aba14ff3b6ea06b2220e10017df557568226
---
M specials/SpecialCheckUser.php
1 file changed, 7 insertions(+), 3 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/specials/SpecialCheckUser.php b/specials/SpecialCheckUser.php
index 9f7f0f1..ea7c300 100644
--- a/specials/SpecialCheckUser.php
+++ b/specials/SpecialCheckUser.php
@@ -17,6 +17,8 @@
        public function execute( $subpage ) {
                $this->setHeaders();
                $this->checkPermissions();
+               // Logging and blocking requires writing so stop from here if 
read-only mode
+               $this->checkReadOnly();
 
                $out = $this->getOutput();
                $request = $this->getRequest();
@@ -429,11 +431,13 @@
                        }
                        $lastEdit = max( $revEdit, $logEdit );
                        if ( $lastEdit ) {
+                               $lastEditTime = wfTimestamp( TS_MW, $lastEdit );
                                $lang = $this->getLanguage();
-                               $lastEditDate = $lang->date( wfTimestamp( 
TS_MW, $lastEdit ), true );
-                               $lastEditTime = $lang->time( wfTimestamp( 
TS_MW, $lastEdit ), true );
                                // FIXME: don't pass around parsed messages
-                               return $this->msg( 'checkuser-nomatch-edits', 
$lastEditDate, $lastEditTime )->parseAsBlock();
+                               return $this->msg( 'checkuser-nomatch-edits',
+                                       $lang->date( $lastEditTime, true ),
+                                       $lang->time( $lastEditTime, true )
+                               )->parseAsBlock();
                        }
                }
                return $this->msg( 'checkuser-nomatch' )->parseAsBlock();

-- 
To view, visit https://gerrit.wikimedia.org/r/279716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf86aba14ff3b6ea06b2220e10017df557568226
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to