| Index: trunk/phase3/includes/api/ApiQueryLogEvents.php |
| — | — | @@ -208,8 +208,12 @@ |
| 209 | 209 | case 'block': |
| 210 | 210 | $vals2 = array(); |
| 211 | 211 | list( $vals2['duration'], $vals2['flags'] ) = $params; |
| 212 | | - $vals2['expiry'] = wfTimestamp( TS_ISO_8601, |
| | 212 | + |
| | 213 | + // Indefinite blocks have no expiry time |
| | 214 | + if ( Block::parseExpiryInput( $params[0] ) !== Block::infinity() ) { |
| | 215 | + $vals2['expiry'] = wfTimestamp( TS_ISO_8601, |
| 213 | 216 | strtotime( $params[0], wfTimestamp( TS_UNIX, $ts ) ) ); |
| | 217 | + } |
| 214 | 218 | $vals[$type] = $vals2; |
| 215 | 219 | $params = null; |
| 216 | 220 | break; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -75,6 +75,7 @@ |
| 76 | 76 | * (bug 22764) uselang parameter for action=parse |
| 77 | 77 | * (bug 22944) API: watchlist options are inconsistent |
| 78 | 78 | * (bug 22339) "Go" result should be available through the API |
| | 79 | +* (bug 22868) don't list infinite block expiry date as "now" in API logevents |
| 79 | 80 | |
| 80 | 81 | === Languages updated in 1.17 === |
| 81 | 82 | |