| Index: branches/wmf/1.16wmf4/includes/api/ApiQueryUsers.php |
| — | — | @@ -123,7 +123,7 @@ |
| 124 | 124 | $this->addJoinConds( array( |
| 125 | 125 | 'ipblocks' => array( 'LEFT JOIN', 'ipb_user=u1.user_id' ), |
| 126 | 126 | $u2 => array( 'LEFT JOIN', 'ipb_by=u2.user_id' ) ) ); |
| 127 | | - $this->addFields( array( 'ipb_reason', 'u2.user_name AS blocker_name' ) ); |
| | 127 | + $this->addFields( array( 'ipb_reason', 'u2.user_name AS blocker_name', 'ipb_expiry' ) ); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | $data = array(); |
| — | — | @@ -142,6 +142,7 @@ |
| 143 | 143 | if ( isset( $this->prop['blockinfo'] ) && !is_null( $r->blocker_name ) ) { |
| 144 | 144 | $data[$name]['blockedby'] = $r->blocker_name; |
| 145 | 145 | $data[$name]['blockreason'] = $r->ipb_reason; |
| | 146 | + $data[$name]['blockexpiry'] = $r->ipb_expiry; |
| 146 | 147 | } |
| 147 | 148 | if ( isset( $this->prop['emailable'] ) && $user->canReceiveEmail() ) |
| 148 | 149 | $data[$name]['emailable'] = ''; |
| Property changes on: branches/wmf/1.16wmf4/includes/api/ApiQueryUsers.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 149 | 150 | Merged /branches/wmf-deployment/includes/api/ApiQueryUsers.php:r53381,59952,60970 |
| 150 | 151 | Merged /branches/REL1_15/phase3/includes/api/ApiQueryUsers.php:r51646 |
| 151 | 152 | Merged /branches/REL1_16/phase3/includes/api/ApiQueryUsers.php:r69932 |
| 152 | 153 | Merged /branches/sqlite/includes/api/ApiQueryUsers.php:r58211-58321 |
| 153 | 154 | Merged /trunk/phase3/includes/api/ApiQueryUsers.php:r63549,63764,63897-63901,64454,66486,69339,69347,69350,69369,69379,69776,69931,70078,71059,71098,77187-77210 |