| Index: branches/REL1_18/phase3/docs/hooks.txt |
| — | — | @@ -730,7 +730,6 @@ |
| 731 | 731 | |
| 732 | 732 | 'EditPage::showEditForm:initial': before showing the edit form |
| 733 | 733 | $editor: EditPage instance (object) |
| 734 | | -$formCallback: Array for callback of modifying the edit form |
| 735 | 734 | |
| 736 | 735 | Return false to halt editing; you'll need to handle error messages, etc. |
| 737 | 736 | yourself. Alternatively, modifying $error and returning true will cause the |
| Property changes on: branches/REL1_18/phase3/docs/hooks.txt |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 738 | 737 | Merged /branches/new-installer/phase3/docs/hooks.txt:r43664-66004 |
| 739 | 738 | Merged /branches/REL1_15/phase3/docs/hooks.txt:r51646 |
| 740 | 739 | Merged /branches/REL1_17/phase3/docs/hooks.txt:r81445,81448 |
| 741 | 740 | Merged /branches/sqlite/docs/hooks.txt:r58211-58321 |
| 742 | 741 | Merged /trunk/phase3/docs/hooks.txt:r92634,92762,92791,92854,92958,93141,93303,93520,93916 |
| Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -181,8 +181,6 @@ |
| 182 | 182 | the relevant section of the category. |
| 183 | 183 | * (bug 29109) Allow the automatic edit summary for redirect creation |
| 184 | 184 | show the first bit of the new redirect page. |
| 185 | | -* (bug 5800) Added $formCallback as a parameter to the hook |
| 186 | | - EditPage::showEditForm:initial. |
| 187 | 185 | * (bug 29723) mw.util.wikiGetlink() now defaults to wgPageName. |
| 188 | 186 | * (bug 29680) Add GetDefaultSortkey hook to override the default sortkey. |
| 189 | 187 | * (bug 16699) {{#language:}} accepts second parameter to specify the language in |
| Property changes on: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 190 | 188 | Merged /branches/sqlite/RELEASE-NOTES-1.18:r58211-58321 |
| 191 | 189 | Merged /trunk/phase3/RELEASE-NOTES-1.18:r92634,92762,92791,92854,92958,93141,93303,93520,93916 |
| 192 | 190 | Merged /branches/new-installer/phase3/RELEASE-NOTES-1.18:r43664-66004 |
| 193 | 191 | Merged /branches/REL1_15/phase3/RELEASE-NOTES-1.18:r51646 |
| 194 | 192 | Merged /branches/REL1_17/phase3/RELEASE-NOTES-1.18:r81445,81448 |
| Index: branches/REL1_18/phase3/includes/EditPage.php |
| — | — | @@ -1333,7 +1333,7 @@ |
| 1334 | 1334 | $previewOutput = $this->getPreviewText(); |
| 1335 | 1335 | } |
| 1336 | 1336 | |
| 1337 | | - wfRunHooks( 'EditPage::showEditForm:initial', array( &$this, &$formCallback ) ); |
| | 1337 | + wfRunHooks( 'EditPage::showEditForm:initial', array( &$this ) ); |
| 1338 | 1338 | |
| 1339 | 1339 | $this->setHeaders(); |
| 1340 | 1340 | |
| Property changes on: branches/REL1_18/phase3/includes/EditPage.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1341 | 1341 | Merged /branches/sqlite/includes/EditPage.php:r58211-58321 |
| 1342 | 1342 | Merged /trunk/phase3/includes/EditPage.php:r92634,92762,92791,92854,92958,93141,93303,93916 |
| 1343 | 1343 | Merged /branches/new-installer/phase3/includes/EditPage.php:r43664-66004 |
| 1344 | 1344 | Merged /branches/wmf-deployment/includes/EditPage.php:r53381 |
| 1345 | 1345 | Merged /branches/REL1_15/phase3/includes/EditPage.php:r51646 |