Merge branch 'master' into stable

Conflicts:
	doku.php

1 files changed, 12 insertions, 1 deletions

diff --git a/inc/load.php b/inc/load.php
index ef6f7f31c..d30397f6e 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -43,7 +43,7 @@ require_once(DOKU_INC.'inc/auth.php');
  * require()s their associated php files when an object is instantiated.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
- * @todo   add generic loading of plugins and other generically named classes
+ * @todo   add generic loading of renderers and auth backends
  */
 function load_autoload($name){
     static $classes = null;
@@ -87,5 +87,16 @@ function load_autoload($name){
         require_once($classes[$name]);
         return;
     }
+
+    // Plugin loading
+    if(preg_match('/^(helper|syntax|action|admin|renderer)_plugin_([^_]+)(?:_([^_]+))?$/',
+                  $name, $m)) {
+                //try to load the wanted plugin file
+        // include, but be silent. Maybe some other autoloader has an idea
+        // how to load this class.
+        $c = ((count($m) === 4) ? "/{$m[3]}" : '');
+        @include DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php";
+        return;
+    }
 }