------------------------------------------------------------
revno: 1034
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Wed 2012-01-18 15:54:11 +0100
message:
bug in plugins
modified:
libs/Plugins.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'libs/Plugins.php'
--- libs/Plugins.php 2012-01-05 18:48:50 +0000
+++ libs/Plugins.php 2012-01-18 14:54:11 +0000
@@ -62,7 +62,7 @@
" WHERE plconf_active='active'" .
" ORDER BY plconf_priority";
$configurations = $db->get_results($sql);
-
+
if (is_null($configurations)) {
return;
}
@@ -78,16 +78,19 @@
}
}
+
// init plugins: set action and load configuration
if ( count($pluginsActivated) > 0 ) {
+
$sql =
"SELECT plugin_id, plugin_file,plugin_class_name FROM aiki_plugins " .
" WHERE plugin_state='available' AND (plugin_id='" .
- implode("OR plugin_id='", array_keys($pluginsActivated)) . "')";
+ implode("' OR plugin_id='", array_keys($pluginsActivated)) . "')";
$toload= $db->get_results($sql);
+
if (!is_null($toload)) {
foreach ( $toload as $load ) {
- $file = $AIKI_ROOT_DIR . "/" . AIKI_PLUGIN_DIR . "/" . $load->plugin_file;
+ $file = $AIKI_ROOT_DIR . "/" . AIKI_PLUGIN_DIR . "/" . $load->plugin_file;
if (file_exists($file)) {
include_once($file);
$this->plugins[] = new $load->plugin_class_name($this, $pluginsActivated[$load->plugin_id]);
@@ -351,4 +354,4 @@
}
-?>
\ No newline at end of file
+?>
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
