Fix struct editor missing on DokuWiki master #545
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
annda
requested changes
Jan 2, 2021
Contributor
annda
left a comment
annda
left a comment
There was a problem hiding this comment.
Excellent, thank you for the fix. Just please adjust the two lines addressed by comments.
action/edit.php
Outdated
| * | ||
| * Handles the FORM_EDIT_OUTPUT event | ||
| */ | ||
| public function addFromData(Doku_Event $event, $_param): bool |
Contributor
There was a problem hiding this comment.
This declaration should be changed to retain compatibility with PHP 5.6, still officially supported by DokuWiki.
Contributor
Author
There was a problem hiding this comment.
Hogfather still supports PHP 5.6? 🧐
Fixed.
action/edit.php
Outdated
| return true; | ||
| } | ||
|
|
||
| private function getEditorHtml(): string |
Contributor
There was a problem hiding this comment.
PHP 5.6 incompatible declaration
In the big refactoring of html.php in Dokuwiki, the events like HTML_EDITFORM_OUTPUT were removed and replaced with FORM_EDIT_OUTPUT. See dokuwiki/dokuwiki#3198 This PR adds support for the new event and maintains the support for the legacy one. It is expected to work both on the currently released version of DokuWiki and the current tip of the development branch.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the big refactoring of html.php in Dokuwiki, the events like
HTML_EDITFORM_OUTPUTwere removed and replaced withFORM_EDIT_OUTPUT. See dokuwiki/dokuwiki#3198This PR adds support for the new event and maintains the support for the legacy one. It is expected to work both on the currently released version of DokuWiki and the current tip of the development branch.
This is broken since mid-October. I'm surprised nobody has complained so far?