summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/config_cascade.php1
-rw-r--r--inc/events.php4
2 files changed, 3 insertions, 2 deletions
diff --git a/inc/config_cascade.php b/inc/config_cascade.php
index 79567fc56..e4a3df353 100644
--- a/inc/config_cascade.php
+++ b/inc/config_cascade.php
@@ -66,6 +66,7 @@ $config_cascade = array_merge(
),
'plugins' => array(
+ 'default' => array(DOKU_CONF.'plugins.php'),
'local' => array(DOKU_CONF.'plugins.local.php'),
'protected' => array(
DOKU_CONF.'plugins.required.php',
diff --git a/inc/events.php b/inc/events.php
index 621cb64c1..09f3f3c0c 100644
--- a/inc/events.php
+++ b/inc/events.php
@@ -149,8 +149,8 @@ class Doku_Event_Handler {
* @param $method (function) event handler function
* @param $param (mixed) data passed to the event handler
*/
- function register_hook($event, $advise, &$obj, $method, $param=null) {
- $this->_hooks[$event.'_'.$advise][] = array(&$obj, $method, $param);
+ function register_hook($event, $advise, $obj, $method, $param=null) {
+ $this->_hooks[$event.'_'.$advise][] = array($obj, $method, $param);
}
function process_event(&$event,$advise='') {