| Index: trunk/phase3/includes/api/ApiQueryUsers.php |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | $this->addJoinConds( array( |
| 123 | 123 | 'ipblocks' => array( 'LEFT JOIN', 'ipb_user=u1.user_id' ), |
| 124 | 124 | $u2 => array( 'LEFT JOIN', 'ipb_by=u2.user_id' ) ) ); |
| 125 | | - $this->addFields( array( 'ipb_reason', 'u2.user_name AS blocker_name' ) ); |
| | 125 | + $this->addFields( array( 'ipb_reason', 'u2.user_name AS blocker_name', 'ipb_expiry' ) ); |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | $data = array(); |
| — | — | @@ -147,6 +147,7 @@ |
| 148 | 148 | if ( isset( $this->prop['blockinfo'] ) && !is_null( $row->blocker_name ) ) { |
| 149 | 149 | $data[$name]['blockedby'] = $row->blocker_name; |
| 150 | 150 | $data[$name]['blockreason'] = $row->ipb_reason; |
| | 151 | + $data[$name]['blockexpiry'] = $row->ipb_expiry; |
| 151 | 152 | } |
| 152 | 153 | |
| 153 | 154 | if ( isset( $this->prop['emailable'] ) && $user->canReceiveEmail() ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -534,6 +534,7 @@ |
| 535 | 535 | * (bug 25987) prop=info&inprop=watched now also works for missing pages |
| 536 | 536 | * (bug 26006) prop=langlinks now allows obtaining full URL |
| 537 | 537 | * (bug 26075) ApiDelete.php now calls correctly ArticleDelete hook |
| | 538 | +* (bug 26089) add block expiration to blockinfo |
| 538 | 539 | |
| 539 | 540 | === Languages updated in 1.17 === |
| 540 | 541 | |