Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki into plugincontroller

This adds support for the config_cascade when enabling/disabling plugins,
making farming easier.
The changes have been implemented by Piyush Mishra and are a part of the
new extension manager which will follow later. It's the result of a
Google Summer of Code project, the official project page can be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/piyushmishra/26001

Thanks to Piyush for the work and Google for sponsoring it!

Conflicts:
	inc/lang/en/lang.php

1 files changed, 5 insertions, 1 deletions

diff --git a/inc/pluginutils.php b/inc/pluginutils.php
index 85bcaee1e..53cfedf82 100644
--- a/inc/pluginutils.php
+++ b/inc/pluginutils.php
@@ -16,7 +16,7 @@ function plugin_list($type='',$all=false) {
     global $plugin_controller;
     return $plugin_controller->getList($type,$all);
 }
-function &plugin_load($type,$name,$new=false,$disabled=false) {
+function plugin_load($type,$name,$new=false,$disabled=false) {
     global $plugin_controller;
     return $plugin_controller->load($type,$name,$new,$disabled);
 }
@@ -36,3 +36,7 @@ function plugin_directory($plugin) {
     global $plugin_controller;
     return $plugin_controller->get_directory($plugin);
 }
+function plugin_getcascade() {
+    global $plugin_controller;
+    return $plugin_controller->getCascade();
+}