summaryrefslogtreecommitdiff
path: root/inc/plugin.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-08-29 14:22:01 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-08-29 14:22:01 +0200
commit2c053ed58376c6709596ab48fc40dceb90d4e89d (patch)
treec8d0f78c2f47f373473419396d3c0855ec671eca /inc/plugin.php
parentcb4a07568e84d853fbcd9d5eca37f572fa10786f (diff)
parent5479a8c3341247ca228026819f20f3ab5c34a80f (diff)
downloadrpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz
rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2
Merge branch 'master' into stable
Conflicts: conf/msg lib/plugins/acl/ajax.php
Diffstat (limited to 'inc/plugin.php')
-rw-r--r--inc/plugin.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/plugin.php b/inc/plugin.php
index 364534739..aff07c1e5 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -231,12 +231,12 @@ class DokuWiki_Plugin {
}
/**
- * Allow the plugin to prevent DokuWiki creating a second instance of itself
+ * Allow the plugin to prevent DokuWiki from reusing an instance
*
- * @return bool true if the plugin can not be instantiated more than once
+ * @return bool false if the plugin has to be instantiated
*/
function isSingleton() {
- return false;
+ return true;
}
// deprecated functions