Merge remote-tracking branch 'origin/master' into video-audio

Conflicts:
	inc/parser/xhtml.php

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/plugins/action.php b/lib/plugins/action.php
index a2ad969d7..4b5eef60a 100644
--- a/lib/plugins/action.php
+++ b/lib/plugins/action.php
@@ -14,10 +14,10 @@ if(!defined('DOKU_INC')) die();
  */
 class DokuWiki_Action_Plugin extends DokuWiki_Plugin {
 
-     /**
-      * Registers a callback function for a given event
-      */
-      function register(Doku_Event_Handler $controller) {
+    /**
+     * Registers a callback function for a given event
+     */
+    public function register(Doku_Event_Handler $controller) {
         trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING);
-      }
+    }
 }