Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -N -r5305 -r5306
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 5305)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 5306)
@@ -174,11 +174,9 @@
ON
(st.st_id = lb.template_id) AND (lb.block_type = 3)
WHERE st.st_parent_id = ".$st_id."
- AND st.st_id != '$system_tpl_id'
- AND st.st_parent_id != '$system_tpl_id'
AND st_id != ".$email_templates_folder_id."
- AND st_path != '/cms'" . $filter . "
AND st.st_id NOT IN ($system_tpl_ids)
+ AND st_path != '/cms'" . $filter . "
ORDER BY st.st_order";
}
else {
@@ -196,13 +194,11 @@
(st.st_id = wb.template_id) AND (wb.block_type = 3)
WHERE st.st_parent_id = ".$st_id."
AND st_id != ".$email_templates_folder_id."
- AND st.st_id != '$system_tpl_id'
- AND st.st_parent_id != '$system_tpl_id'
- AND st_path != '/cms%'" . $filter . "
AND st.st_id NOT IN ($system_tpl_ids)
+ AND st_path != '/cms%'" . $filter . "
ORDER BY st.st_order";
}
-// echo $query."
";
+ //echo $query."
";
$rs = $conn->Execute($query);
if ($rs && !$rs->EOF)
{