| Index: trunk/phase3/includes/api/ApiQueryLogEvents.php |
| — | — | @@ -140,7 +140,7 @@ |
| 141 | 141 | $this->getResult()->addValue('query', $this->getModuleName(), $data); |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | | - public static function addLogParams($result, &$vals, $params, $type) { |
| | 144 | + public static function addLogParams($result, &$vals, $params, $type, $ts) { |
| 145 | 145 | $params = explode("\n", $params); |
| 146 | 146 | switch ($type) { |
| 147 | 147 | case 'move': |
| — | — | @@ -169,6 +169,8 @@ |
| 170 | 170 | case 'block': |
| 171 | 171 | $vals2 = array(); |
| 172 | 172 | list( $vals2['duration'], $vals2['flags'] ) = $params; |
| | 173 | + $vals2['expiry'] = wfTimestamp(TS_ISO_8601, |
| | 174 | + strtotime($params[0], wfTimestamp(TS_UNIX, $ts))); |
| 173 | 175 | $vals[$type] = $vals2; |
| 174 | 176 | $params = null; |
| 175 | 177 | break; |
| — | — | @@ -200,7 +202,8 @@ |
| 201 | 203 | |
| 202 | 204 | if ($this->fld_details && $row->log_params !== '') { |
| 203 | 205 | self::addLogParams($this->getResult(), $vals, |
| 204 | | - $row->log_params, $row->log_type); |
| | 206 | + $row->log_params, $row->log_type, |
| | 207 | + $row->log_timestamp); |
| 205 | 208 | } |
| 206 | 209 | |
| 207 | 210 | if ($this->fld_user) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -483,6 +483,7 @@ |
| 484 | 484 | * (bug 16526) Added usprop=emailable to list=users |
| 485 | 485 | * (bug 16548) list=search threw errors with an invalid error code |
| 486 | 486 | * (bug 16515) Added pst and onlypst parameters to action=parse |
| | 487 | +* (bug 16541) Added block expiry timestamp to list=logevents output |
| 487 | 488 | |
| 488 | 489 | === Languages updated in 1.14 === |
| 489 | 490 | |