Merge branch 'master' into psr2

* master: typo link to avanced geshi options. fixes #2352 unlock in cancel action unlock pages on viewing them add user interface back to resendpwd action. fixes #2349
dokuwiki · Apr 30, 2018 · ffc2cc4 · ffc2cc4
2 parents 5c2aad1 + f4c7bdb
commit ffc2cc4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
@@ -418,6 +418,8 @@ class HelloWorldApp {
 
 The following language strings are currently recognized: //4cs 6502acme 6502kickass 6502tasm 68000devpac abap actionscript3 actionscript ada aimms algol68 apache applescript apt_sources arm asm asp asymptote autoconf autohotkey autoit avisynth awk bascomavr bash basic4gl batch bf biblatex bibtex blitzbasic bnf boo caddcl cadlisp ceylon cfdg cfm chaiscript chapel cil c_loadrunner clojure c_mac cmake cobol coffeescript c cpp cpp-qt cpp-winapi csharp css cuesheet c_winapi dart dcl dcpu16 dcs delphi diff div dos dot d ecmascript eiffel email epc e erlang euphoria ezt f1 falcon fo fortran freebasic freeswitch fsharp gambas gdb genero genie gettext glsl gml gnuplot go groovy gwbasic haskell haxe hicest hq9plus html html4strict html5 icon idl ini inno intercal io ispfpanel java5 java javascript jcl j jquery julia kixtart klonec klonecpp kotlin latex lb ldif lisp llvm locobasic logtalk lolcode lotusformulas lotusscript lscript lsl2 lua m68k magiksf make mapbasic mathematica matlab mercury metapost mirc mk-61 mmix modula2 modula3 mpasm mxml mysql nagios netrexx newlisp nginx nimrod nsis oberon2 objc objeck ocaml-brief ocaml octave oobas oorexx oracle11 oracle8 oxygene oz parasail parigp pascal pcre perl6 perl per pf phix php-brief php pic16 pike pixelbender pli plsql postgresql postscript povray powerbuilder powershell proftpd progress prolog properties providex purebasic pycon pys60 python qbasic qml q racket rails rbs rebol reg rexx robots rpmspec rsplus ruby rust sas sass scala scheme scilab scl sdlbasic smalltalk smarty spark sparql sql standardml stonescript swift systemverilog tclegg tcl teraterm texgraph text thinbasic tsql twig typoscript unicon upc urbi uscript vala vbnet vb vbscript vedit verilog vhdl vim visualfoxpro visualprolog whitespace whois winbatch xbasic xml xojo xorg_conf xpp yaml z80 zxbasic//
 
+There are additional [[doku>syntax_highlighting|advanced options]] available for syntax highlighting, such as highlighting lines or adding line numbers.
+
 ==== Downloadable Code Blocks ====
 
 When you use the ''%%<code>%%'' or ''%%<file>%%'' syntax as above, you might want to make the shown code available for download as well. You can do this by specifying a file name after language code like this:

diff --git a/inc/Action/Cancel.php b/inc/Action/Cancel.php
@@ -13,7 +13,11 @@
  */
 class Cancel extends AbstractAliasAction {
 
+    /** @inheritdoc */
     public function preProcess() {
+        global $ID;
+        unlock($ID);
+
         // continue with draftdel -> redirect -> show
         throw new ActionAbort('draftdel');
     }

diff --git a/inc/Action/Resendpwd.php b/inc/Action/Resendpwd.php
@@ -37,6 +37,11 @@ public function preProcess() {
         }
     }
 
+    /** @inheritdoc */
+    public function tplContent() {
+        html_resendpwd();
+    }
+
     /**
      * Send a  new password
      *

diff --git a/inc/Action/Show.php b/inc/Action/Show.php
@@ -22,6 +22,12 @@ public function minimumPermission() {
         return AUTH_READ;
     }
 
+    /** @inheritdoc */
+    public function preProcess() {
+        global $ID;
+        unlock($ID);
+    }
+
     /** @inheritdoc */
     public function tplContent() {
         html_show();

diff --git a/inc/html.php b/inc/html.php
@@ -1904,7 +1904,7 @@ function html_edit(){
                 array('id' => 'edbtn__preview', 'accesskey' => 'p', 'tabindex' => '5')
             )
         );
-        $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_cancel'], array('tabindex'=>'6')));
+        $form->addElement(form_makeButton('submit', 'cancel', $lang['btn_cancel'], array('tabindex'=>'6')));
         $form->addElement(form_makeCloseTag('div'));
         $form->addElement(form_makeOpenTag('div', array('class'=>'summary')));
         $form->addElement(