summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorHakan Sandell <sandell.hakan@gmail.com>2011-09-10 14:32:04 +0200
committerHakan Sandell <sandell.hakan@gmail.com>2011-09-10 14:32:04 +0200
commit48e46d886a3fbb772a8a64be7ff642ccd7613701 (patch)
treef3b251a0cf623e1e676418c0470b5b2faa989045 /inc
parent9036904c40c369c2dffd8d0bc44b1239013e8eb5 (diff)
downloadrpg-48e46d886a3fbb772a8a64be7ff642ccd7613701.tar.gz
rpg-48e46d886a3fbb772a8a64be7ff642ccd7613701.tar.bz2
Whitespace and brackets cleanup
Diffstat (limited to 'inc')
-rw-r--r--inc/plugincontroller.class.php15
1 files changed, 7 insertions, 8 deletions
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 2910e6de0..632814d3c 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -139,22 +139,21 @@ 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')) {
// treat this as a default disabled plugin(over-rideable by the plugin manager)
// deprecated 2011-09-10 (usage of disabled files)
- if(empty($this->plugin_cascade['local'][$plugin]))
+ if (empty($this->plugin_cascade['local'][$plugin])) {
$all_plugins[$plugin] = 0;
- else
+ } else {
$all_plugins[$plugin] = 1;
+ }
$this->plugin_cascade['default'][$plugin] = 0;
- }
- elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) ||
- ($plugin === 'plugin' && isset($conf['pluginmanager']) &&
- !$conf['pluginmanager'])){
+ } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) ||
+ ($plugin === 'plugin' && isset($conf['pluginmanager']) && !$conf['pluginmanager'])){
$all_plugins[$plugin] = 0;
- } elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) {
+ } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) {
$all_plugins[$plugin] = 1;
} else {
$all_plugins[$plugin] = 1;