Index: branches/RC/core/kernel/nparser/compiler.php =================================================================== diff -u -N -r11661 -r11685 --- branches/RC/core/kernel/nparser/compiler.php (.../compiler.php) (revision 11661) +++ branches/RC/core/kernel/nparser/compiler.php (.../compiler.php) (revision 11685) @@ -79,9 +79,10 @@ $this->FindTemplateFiles($template_path, $options); } - // find Front-End templates + // find Front-End templates (from enabled themes only) $sql = 'SELECT Name - FROM ' . $this->Application->getUnitOption('theme', 'TableName'); + FROM ' . $this->Application->getUnitOption('theme', 'TableName') . ' + WHERE Enabled = 1'; $themes = $this->Conn->GetCol($sql); $options = Array ();