3 files changed, 6 insertions, 3 deletions
diff --git a/inc/Action/Export.php b/inc/Action/Export.php
index 1eec27ec3..6b46b276e 100644
--- a/inc/Action/Export.php
+++ b/inc/Action/Export.php
@@ -3,6 +3,7 @@
 namespace dokuwiki\Action;
 
 use dokuwiki\Action\Exception\ActionAbort;
+use dokuwiki\Extension\Event;
 
 /**
  * Class Export
@@ -96,7 +97,7 @@ class Export extends AbstractAction {
         $data['headers'] = $headers;
         $data['output'] =& $output;
 
-        trigger_event('ACTION_EXPORT_POSTPROCESS', $data);
+        Event::createAndTrigger('ACTION_EXPORT_POSTPROCESS', $data);
 
         if(!empty($data['output'])) {
             if(is_array($data['headers'])) foreach($data['headers'] as $key => $val) {
diff --git a/inc/Action/Redirect.php b/inc/Action/Redirect.php
index ed67d66d7..dca911a22 100644
--- a/inc/Action/Redirect.php
+++ b/inc/Action/Redirect.php
@@ -3,6 +3,7 @@
 namespace dokuwiki\Action;
 
 use dokuwiki\Action\Exception\ActionAbort;
+use dokuwiki\Extension\Event;
 
 /**
  * Class Redirect
@@ -41,7 +42,7 @@ class Redirect extends AbstractAliasAction {
         }
 
         // execute the redirect
-        trigger_event('ACTION_SHOW_REDIRECT', $opts, array($this, 'redirect'));
+        Event::createAndTrigger('ACTION_SHOW_REDIRECT', $opts, array($this, 'redirect'));
 
         // should never be reached
         throw new ActionAbort('show');
diff --git a/inc/Action/Subscribe.php b/inc/Action/Subscribe.php
index c16571022..0e7054336 100644
--- a/inc/Action/Subscribe.php
+++ b/inc/Action/Subscribe.php
@@ -4,6 +4,7 @@ namespace dokuwiki\Action;
 
 use dokuwiki\Action\Exception\ActionAbort;
 use dokuwiki\Action\Exception\ActionDisabledException;
+use dokuwiki\Extension\Event;
 
 /**
  * Class Subscribe
@@ -67,7 +68,7 @@ class Subscribe extends AbstractUserAction {
         if(empty($params['action']) || !checkSecurityToken()) return;
 
         // Handle POST data, may throw exception.
-        trigger_event('ACTION_HANDLE_SUBSCRIBE', $params, array($this, 'handlePostData'));
+        Event::createAndTrigger('ACTION_HANDLE_SUBSCRIBE', $params, array($this, 'handlePostData'));
 
         $target = $params['target'];
         $style = $params['style'];