Ticket #1333

inc/classes/BxDolModuleQuery.php

@@ -103,6 +103,14 @@ class BxDolModuleQuery extends BxDolDb implements iBxDolSingleton
         $sPostfix = $sWhereClause = $sOrderByClause = "";
 
         switch($aParams['type']) {
+        	case 'type':
+        		if(!is_array($aParams['value']))
+        			$aParams['value'] = array($aParams['value']);
+
+                $sPostfix .= '_type_' . implode('_', $aParams['value']);
+                $sWhereClause .= " AND `type` IN (" . $this->implode_escape($aParams['value']) . ")";
+                break;
+
             case 'modules':
                 $sPostfix .= '_modules';
                 $aMethod['params'][1] = array(

studio/template/scripts/BxBaseStudioBuilderPage.php

@@ -123,7 +123,7 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             )
         );
 
-        $aModulesDb = BxDolModuleQuery::getInstance()->getModulesBy(array('type' => 'modules'));
+        $aModulesDb = BxDolModuleQuery::getInstance()->getModulesBy(array('type' => 'type', 'value' => array(BX_DOL_MODULE_TYPE_MODULE, BX_DOL_MODULE_TYPE_TEMPLATE)));
         foreach($aModulesDb as $aModuleDb) {
         	$sName = $aModuleDb['name'];