diff options
| author | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
| commit | f77fc90de1e477b721442757cd7413f91cccc044 (patch) | |
| tree | 2abb734dacf39419b96b6b70c65115de57228fc3 /lib/plugins/plugin/admin.php | |
| parent | b8c040db1fdc0eee80963e57d95a15fd3813912d (diff) | |
| parent | bd07158f0f2569ae470f980dd49d69b7f1fd2c49 (diff) | |
| download | rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.gz rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.bz2 | |
Merge branch 'master' into indexer_rewrite
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
Diffstat (limited to 'lib/plugins/plugin/admin.php')
| -rw-r--r-- | lib/plugins/plugin/admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
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'); } /** |