Index: branches/RC/core/kernel/application.php =================================================================== diff -u -N -r11685 -r11702 --- branches/RC/core/kernel/application.php (.../application.php) (revision 11685) +++ branches/RC/core/kernel/application.php (.../application.php) (revision 11702) @@ -425,14 +425,22 @@ $this->registerModuleConstants(); return false; } + $modules_helper =& $this->recallObject('ModulesHelper'); - $this->ModuleInfo = $this->Conn->Query('SELECT * FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'Name'); + /* @var $modules_helper kModulesHelper */ + $sql = 'SELECT * + FROM ' . TABLE_PREFIX . 'Modules + WHERE Loaded = 1 + ORDER BY LoadOrder'; + $this->ModuleInfo = $this->Conn->Query($sql, 'Name'); + + $sql = 'SELECT * FROM '.TABLE_PREFIX.'Modules WHERE '.$modules_helper->getWhereClause().' ORDER BY LoadOrder'; - $this->ModuleInfo = $this->Conn->Query($sql, 'Name'); + $this->registerModuleConstants(); }