| Index: trunk/phase3/includes/api/ApiMain.php |
| — | — | @@ -273,7 +273,7 @@ |
| 274 | 274 | // Set the cache expiration at the last moment, as any errors may change the expiration. |
| 275 | 275 | // if $this->mSquidMaxage == 0, the expiry time is set to the first second of unix epoch |
| 276 | 276 | $exp = min($smaxage, $maxage); |
| 277 | | - $expires = $exp == 0 ? 1 : time() + $this->mSquidMaxage; |
| | 277 | + $expires = ($exp == 0 ? 1 : time() + $exp); |
| 278 | 278 | header('Expires: ' . wfTimestamp(TS_RFC2822, $expires)); |
| 279 | 279 | header('Cache-Control: s-maxage=' . $smaxage . ', must-revalidate, max-age=' . $maxage); |
| 280 | 280 | |