| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -890,6 +890,10 @@ |
| 891 | 891 | # Error messages etc. could be handled within the hook... |
| 892 | 892 | wfProfileOut( $fname ); |
| 893 | 893 | return self::AS_HOOK_ERROR; |
| | 894 | + } elseif ( $this->hookError != '' ) { |
| | 895 | + # ...or the hook could be expecting us to produce an error |
| | 896 | + wfProfileOut( $fname ); |
| | 897 | + return self::AS_HOOK_ERROR_EXPECTED; |
| 894 | 898 | } |
| 895 | 899 | |
| 896 | 900 | # Handle the user preference to force summaries here. Check if it's not a redirect. |
| — | — | @@ -978,6 +982,10 @@ |
| 979 | 983 | # Error messages etc. could be handled within the hook... |
| 980 | 984 | wfProfileOut( $fname ); |
| 981 | 985 | return self::AS_HOOK_ERROR; |
| | 986 | + } elseif ( $this->hookError != '' ) { |
| | 987 | + # ...or the hook could be expecting us to produce an error |
| | 988 | + wfProfileOut( $fname ); |
| | 989 | + return self::AS_HOOK_ERROR_EXPECTED; |
| 982 | 990 | } |
| 983 | 991 | |
| 984 | 992 | # Handle the user preference to force summaries here, but not for null edits |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -441,6 +441,8 @@ |
| 442 | 442 | * (bug 20260) SQLite no longer tries to automatically create the database at |
| 443 | 443 | execution time, this now happens only at install time; if it is not available |
| 444 | 444 | at script execution, it now throws an exception |
| | 445 | +* Fixed EditFilterMerged hook so the hookError parameter serves a purpose |
| | 446 | + (analogous to EditFilter hook) |
| 445 | 447 | |
| 446 | 448 | == API changes in 1.16 == |
| 447 | 449 | |