jenkins-bot has submitted this change and it was merged.
Change subject: Documentation fixups
......................................................................
Documentation fixups
Explicitly define some variables
Change-Id: Ie556bdb89bebfe421e2957a610dc1e64d61f3954
---
M CheckUserEncryptedData.php
M CheckUserLogPager.php
M api/ApiQueryCheckUser.php
M specials/SpecialCheckUser.php
4 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CheckUserEncryptedData.php b/CheckUserEncryptedData.php
index 3e64aec..08b3334 100644
--- a/CheckUserEncryptedData.php
+++ b/CheckUserEncryptedData.php
@@ -55,7 +55,6 @@
*
* @param $data String
* @param $publicKey String with ascii-armored block, or the return of
openssl_get_publickey
- * @return String plaintext
*/
private function encryptData( $data, $publicKey ) {
openssl_seal( $data, $encryptedString, $envelopeKeys, array(
$publicKey ), $this->algName );
diff --git a/CheckUserLogPager.php b/CheckUserLogPager.php
index 5f13d9c..caecd87 100644
--- a/CheckUserLogPager.php
+++ b/CheckUserLogPager.php
@@ -8,7 +8,7 @@
/**
* @param IContextSource $context
- * @param array $opts Should include 'queryConds', 'year', and 'month'
keys
+ * @param array $conds Should include 'queryConds', 'year', and 'month'
keys
*/
public function __construct( IContextSource $context, array $conds ) {
parent::__construct( $context );
diff --git a/api/ApiQueryCheckUser.php b/api/ApiQueryCheckUser.php
index 82f1642..e315adb 100644
--- a/api/ApiQueryCheckUser.php
+++ b/api/ApiQueryCheckUser.php
@@ -11,7 +11,7 @@
public function execute() {
global $wgCheckUserForceSummary;
- $db = $this->getDB( DB_SLAVE );
+ $db = $this->getDB();
$params = $this->extractRequestParams();
list( $request, $target, $reason, $timecond, $limit, $xff ) =
array(
diff --git a/specials/SpecialCheckUser.php b/specials/SpecialCheckUser.php
index 2ed1992..3dd0bbd 100644
--- a/specials/SpecialCheckUser.php
+++ b/specials/SpecialCheckUser.php
@@ -1021,7 +1021,7 @@
)
);
- $users_first = $users_last = $users_edits = $users_ids =
array();
+ $users_first = $users_last = $users_edits = $users_ids =
$users_agentsets = $users_infosets = array();
if ( !$dbr->numRows( $ret ) ) {
$s = $this->noMatchesMessage( $ip, !$xfor ) . "\n";
} else {
@@ -1480,13 +1480,13 @@
protected static function buildGroupLink( $group, $username ) {
static $cache = array();
if ( !isset( $cache[$group] ) ) {
- $cache[$group] = User::makeGroupLinkHtml( $group,
User::getGroupMember( $group, $username ) );
+ $cache[$group] = User::makeGroupLinkHTML( $group,
User::getGroupMember( $group, $username ) );
}
return $cache[$group];
}
/**
- * @param DatabaseBase $db
+ * @param IDatabase $db
* @param string $ip
* @param string|bool $xfor
* @return array|false array for valid conditions, false if invalid
--
To view, visit https://gerrit.wikimedia.org/r/314872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie556bdb89bebfe421e2957a610dc1e64d61f3954
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Reedy <[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
