Skip to content

Commit 07e5691

Browse files
committed
Fix Frusterick Manners regression
1 parent 2f22696 commit 07e5691

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

Diff for: action.php

+17-10
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,14 @@ function _edit_form(Doku_Event $event, $param) {
3030
function _action_act_preprocess(Doku_Event $event, $param) {
3131
global $ACT;
3232
global $INFO;
33+
;
34+
$action =& $event->data;
3335

34-
if ($event->data != 'changes') return;
36+
if (!( /* Valid cases */
37+
$action == 'changes' // Greebo
38+
// Frusterick Manners and below... probably
39+
|| is_array($action) && array_key_exists('changes', $action)
40+
)) return;
3541

3642
/* Check for DokuWiki release Greebo and above */
3743
if (class_exists('\\dokuwiki\\ActionRouter', false)) {
@@ -41,18 +47,19 @@ function _action_act_preprocess(Doku_Event $event, $param) {
4147
$this->savedraft();
4248
$ae->preProcess();
4349

50+
$event->stopPropagation();
4451
$event->preventDefault();
45-
}
46-
else if('preview' == act_permcheck('preview')
47-
&& 'preview' == act_draftsave('preview')
48-
&& $INFO['editable']
49-
&& 'preview' == act_edit('preview')) {
50-
// DokuWiki releases before Greebo
52+
} else /* DokuWiki release Frusterick Manners or below */
53+
// Same setup as preview: permissions and environment
54+
if ('preview' == act_permcheck('preview')
55+
&& 'preview' == act_edit('preview'))
56+
{
57+
act_draftsave('preview');
5158
$ACT = 'changes';
52-
$event->stoppropagation();
59+
60+
$event->stopPropagation();
5361
$event->preventDefault();
54-
$this->_change_headers = true;
55-
}else{
62+
} else {
5663
$ACT = 'preview';
5764
}
5865
}

Diff for: plugin.info.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
base diffpreview
2-
author Mikhail I. Izmestev
2+
author Mikhail I. Izmestev, Ivan Smirnov, Tilwa Qendov
33
4-
date 2014-07-16
4+
date 2019-04-09
55
name diffpreview
66
desc Adds button for diff preview in edit mode.
77
url http://dokuwiki.org/plugin:diffpreview

0 commit comments

Comments
 (0)