moved plugincontroller and event handler creation to init.php

1 files changed, 12 insertions, 0 deletions

diff --git a/inc/init.php b/inc/init.php
index ae44ad1a9..3a9988fcf 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -246,9 +246,21 @@ init_files();
 scriptify(DOKU_CONF.'users.auth');
 scriptify(DOKU_CONF.'acl.auth');
 
+// setup plugin controller class (can be overwritten in preload.php)
+$plugin_types = array('admin','syntax','action','renderer', 'helper');
+global $plugin_controller_class, $plugin_controller;
+if (empty($plugin_controller_class)) $plugin_controller_class = 'Doku_Plugin_Controller';
+
 // load libraries
 require_once(DOKU_INC.'inc/load.php');
 
+// initialize plugin controller
+$plugin_controller = new $plugin_controller_class();
+
+// initialize the event handler
+global $EVENT_HANDLER;
+$EVENT_HANDLER = new Doku_Event_Handler();
+
 // setup authentication system
 if (!defined('NOSESSION')) {
     auth_setup();