summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Eckelmann <deckelmann@gmail.com>2011-11-19 14:40:11 +0100
committerDominik Eckelmann <deckelmann@gmail.com>2011-11-19 14:40:11 +0100
commita4e0e797f6bce4aaabf4e115a277db8c9a1fa285 (patch)
treec70c1ed286255768f384a9b45b692b40c2fd3cf8
parent2302fb8dc7877fdf7337d405372ff385bea491d0 (diff)
downloadrpg-a4e0e797f6bce4aaabf4e115a277db8c9a1fa285.tar.gz
rpg-a4e0e797f6bce4aaabf4e115a277db8c9a1fa285.tar.bz2
enabled remote as plugintype
-rw-r--r--inc/init.php2
-rw-r--r--inc/load.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/inc/init.php b/inc/init.php
index b3acf2e33..ba62fe079 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -200,7 +200,7 @@ init_paths();
init_files();
// setup plugin controller class (can be overwritten in preload.php)
-$plugin_types = array('admin','syntax','action','renderer', 'helper');
+$plugin_types = array('admin','syntax','action','renderer', 'helper','remote');
global $plugin_controller_class, $plugin_controller;
if (empty($plugin_controller_class)) $plugin_controller_class = 'Doku_Plugin_Controller';
diff --git a/inc/load.php b/inc/load.php
index d30397f6e..b69d58140 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -89,7 +89,7 @@ function load_autoload($name){
}
// Plugin loading
- if(preg_match('/^(helper|syntax|action|admin|renderer)_plugin_([^_]+)(?:_([^_]+))?$/',
+ if(preg_match('/^(helper|syntax|action|admin|renderer|remote)_plugin_([^_]+)(?:_([^_]+))?$/',
$name, $m)) {
//try to load the wanted plugin file
// include, but be silent. Maybe some other autoloader has an idea