| Index: branches/apiedit/phase3/includes/api/ApiQueryBlocks.php |
| — | — | @@ -125,12 +125,7 @@ |
| 126 | 126 | if($fld_timestamp) |
| 127 | 127 | $block['timestamp'] = wfTimestamp(TS_ISO_8601, $row->ipb_timestamp); |
| 128 | 128 | if($fld_expiry) |
| 129 | | - { |
| 130 | | - if($row->ipb_expiry == Block::infinity()) |
| 131 | | - $block['expiry'] = 'infinity'; |
| 132 | | - else |
| 133 | | - $block['expiry'] = wfTimestamp(TS_ISO_8601, $row->ipb_expiry); |
| 134 | | - } |
| | 129 | + $block['expiry'] = Block::decodeExpiry($row->ipb_expiry, TS_ISO_8601); |
| 135 | 130 | if($fld_reason) |
| 136 | 131 | $block['reason'] = $row->ipb_reason; |
| 137 | 132 | if($fld_range) |