From c45608df2e8efbaeb1b4c29d87b976c0e6366ad1 Mon Sep 17 00:00:00 2001
From: Adrian Lang <dokuwiki@adrianlang.de>
Date: Sun, 6 Feb 2011 19:59:37 +0100
Subject: [PATCH] Honor conf[pluginmanager] again (closes FS#1856)
---
inc/plugincontroller.class.php | 5 ++++-
lib/plugins/plugin/admin.php | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index ad394e11f..6e361e172 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -125,6 +125,7 @@ class Doku_Plugin_Controller {
}
function _populateMasterList() {
+ global $conf;
if ($dh = opendir(DOKU_PLUGIN)) {
while (false !== ($plugin = readdir($dh))) {
if ($plugin[0] == '.') continue; // skip hidden entries
@@ -134,7 +135,9 @@ class Doku_Plugin_Controller {
// the plugin was disabled by rc2009-01-26
// disabling mechanism was changed back very soon again
// to keep everything simple we just skip the plugin completely
- }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled')){
+ }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled') ||
+ ($plugin === 'plugin' && isset($conf['pluginmanager']) &&
+ !$conf['pluginmanager'])){
$this->list_disabled[] = $plugin;
} else {
$this->list_enabled[] = $plugin;
diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php
index c662b565a..b2108f185 100644
--- a/lib/plugins/plugin/admin.php
+++ b/lib/plugins/plugin/admin.php
@@ -44,7 +44,7 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin {
function admin_plugin_plugin() {
global $conf;
- $this->disabled = (isset($conf['pluginmanager']) && ($conf['pluginmanager'] == 0));
+ $this->disabled = plugin_isdisabled('plugin');
}
/**
--
GitLab