Commit d38e2b20 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4390 (Fix problems displaying catalogue categories)

parent a58f4415

sources/blocks/main_multi_content.php

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ class Block_main_multi_content 
                }

            }

            if (($category_field_select !== null) && ($category_field_select != $category_field_access) && ($info['category_type'] !== '<page>') && ($info['category_type'] !== '<zone>')) {

                $query .= ' LEFT JOIN ' . get_table_prefix() . 'group_category_access a2 ON (' . db_string_equal_to('a.module_the_name', $category_type_select) . ' AND r.' . $category_field_select . '=a2.category_name)';

                $query .= ' LEFT JOIN ' . get_table_prefix() . 'group_category_access a2 ON (' . db_string_equal_to('a2.module_the_name', $category_type_select) . ' AND r.' . $category_field_select . '=a2.category_name)';

                $query .= ' LEFT JOIN ' . get_table_prefix() . 'member_category_access ma2 ON (' . db_string_equal_to('ma2.module_the_name', $category_type_select) . ' AND r.' . $category_field_select . '=ma2.category_name)';

            }

            if ($category_field_access !== null) {

sources/hooks/systems/content_meta_aware/catalogue_category.php

+3 −3
Original line number Diff line number Diff line
@@ -46,12 +46,12 @@ class Hook_content_meta_aware_catalogue_category 
            'parent_category_meta_aware_type' => 'catalogue_category',

            'is_category' => true,

            'is_entry' => false,

            'category_field' => array('c_name', 'id'), // For category permissions

            'category_type' => array('catalogues_catalogue', 'cc_parent_id'), // For category permissions

            'category_field' => array('cc_parent_id', 'c_name'), // For category permissions

            'category_type' => array('catalogues_category', 'catalogues_catalogue'), // For category permissions

            'parent_spec__table_name' => 'catalogue_categories',

            'parent_spec__parent_name' => 'cc_parent_id',

            'parent_spec__field_name' => 'id',

            'category_is_string' => false,

            'category_is_string' => array(false, true),



            'title_field' => 'cc_title',

            'title_field_dereference' => true,