| Index: trunk/php/wmerrors/wmerrors.c |
| — | — | @@ -106,7 +106,9 @@ |
| 107 | 107 | TSRMLS_FETCH(); |
| 108 | 108 | |
| 109 | 109 | if ( !WMERRORS_G(enabled) |
| 110 | | - || (type != E_ERROR && type != E_CORE_ERROR && type != E_COMPILE_ERROR && type != E_USER_ERROR) |
| | 110 | + || (type == E_RECOVERABLE_ERROR && PG(error_handling) == EH_THROW && !EG(exception)) |
| | 111 | + || (type != E_ERROR && type != E_CORE_ERROR && type != E_COMPILE_ERROR |
| | 112 | + && type != E_USER_ERROR && type != E_RECOVERABLE_ERROR) |
| 111 | 113 | || strncmp(sapi_module.name, "apache", 6) |
| 112 | 114 | || WMERRORS_G(recursion_guard)) |
| 113 | 115 | { |
| Index: trunk/php/wmerrors/package2.xml |
| — | — | @@ -16,9 +16,9 @@ |
| 17 | 17 | <email>tstarling@wikimedia.org</email> |
| 18 | 18 | <active>yes</active> |
| 19 | 19 | </lead> |
| 20 | | -<date>2008-07-26</date> |
| | 20 | +<date>2008-09-04</date> |
| 21 | 21 | <version> |
| 22 | | - <release>1.0.1</release> |
| | 22 | + <release>1.0.2</release> |
| 23 | 23 | <api>1.0.1</api> |
| 24 | 24 | </version> |
| 25 | 25 | <stability> |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | <api>beta</api> |
| 28 | 28 | </stability> |
| 29 | 29 | <license>Whatever</license> |
| 30 | | -<notes>Fixed bug on x86_64.</notes> |
| | 30 | +<notes>Display catchable fatal errors that won't be thrown.</notes> |
| 31 | 31 | <contents> |
| 32 | 32 | <dir name="/"> |
| 33 | 33 | <file name="config.w32" role="src"/> |