From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 23 Nov 2010 21:37:27 +0000 (+0000)
Subject: * (bug 26089) add block expiration to blockinfo
X-Git-Tag: 1.31.0-rc.0~33755
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=4aaecdcd9de502463f28d268b3e2d20a857da78b;p=lhc%2Fweb%2Fwiklou.git

* (bug 26089) add block expiration to blockinfo
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a18e376543..85c0bf5d8a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -534,6 +534,7 @@ LocalSettings.php. The specific bugs are listed below in the general notes.
 * (bug 25987) prop=info&inprop=watched now also works for missing pages
 * (bug 26006) prop=langlinks now allows obtaining full URL
 * (bug 26075) ApiDelete.php now calls correctly ArticleDelete hook
+* (bug 26089) add block expiration to blockinfo
 
 === Languages updated in 1.17 ===
 
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 1071ddeefe..219d86ab0d 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -121,7 +121,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 				$this->addJoinConds( array(
 					'ipblocks' => array( 'LEFT JOIN', 'ipb_user=u1.user_id' ),
 					$u2 => array( 'LEFT JOIN', 'ipb_by=u2.user_id' ) ) );
-				$this->addFields( array( 'ipb_reason', 'u2.user_name AS blocker_name' ) );
+				$this->addFields( array( 'ipb_reason', 'u2.user_name AS blocker_name', 'ipb_expiry' ) );
 			}
 
 			$data = array();
@@ -147,6 +147,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 				if ( isset( $this->prop['blockinfo'] ) && !is_null( $row->blocker_name ) ) {
 					$data[$name]['blockedby'] = $row->blocker_name;
 					$data[$name]['blockreason'] = $row->ipb_reason;
+				    $data[$name]['blockexpiry'] = $row->ipb_expiry;
 				}
 
 				if ( isset( $this->prop['emailable'] ) && $user->canReceiveEmail() ) {