* (bug 26089) add block expiration to blockinfo

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a18e376..85c0bf5 100644 (file)
--- 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 1071dde..219d86a 100644 (file)
--- 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() ) {