aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-11-22 02:57:41 +0000
committerrvelices <rv-github@modusoptimus.com>2006-11-22 02:57:41 +0000
commitf3db3ef388192e4f004e5c36524608e7e300cb47 (patch)
tree69bc00a594e2c5ba81e7aebfd3d5ec3d92a68adc /include
parenta557904d2a1389ef05c05a38bc363227487ea834 (diff)
- action.php makes use of Last-Modified and If-Modified-Since HTTP headers
- renamed $conf['disble_plugins'] to $conf['enable_plugins'] git-svn-id: http://piwigo.org/svn/trunk@1616 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/config_default.inc.php4
-rw-r--r--include/functions_plugins.inc.php16
2 files changed, 9 insertions, 11 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 56c656451..d43323a4b 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -532,6 +532,6 @@ $conf['email_admin_on_new_user']=false;
// stored on user informations
//$conf['default_admin_layout']='yoga/dark';
-
-$conf['disable_plugins']=false;
+// should we load the active plugins ? true=Yes, false=No
+$conf['enable_plugins']=true;
?>
diff --git a/include/functions_plugins.inc.php b/include/functions_plugins.inc.php
index 92adb22e9..3eda2e3f8 100644
--- a/include/functions_plugins.inc.php
+++ b/include/functions_plugins.inc.php
@@ -243,16 +243,14 @@ function load_plugin($plugin)
function load_plugins()
{
global $conf;
- if ($conf['disable_plugins'])
+ if ($conf['enable_plugins'])
{
- return;
- }
-
- $plugins = get_db_plugins('active');
- foreach( $plugins as $plugin)
- {// include main from a function to avoid using same function context
- load_plugin($plugin);
+ $plugins = get_db_plugins('active');
+ foreach( $plugins as $plugin)
+ {// include main from a function to avoid using same function context
+ load_plugin($plugin);
+ }
+ trigger_action('plugins_loaded');
}
- trigger_action('plugins_loaded');
}
?> \ No newline at end of file