Index: branches/5.2.x/core/units/permissions/permissions_tag_processor.php =================================================================== diff -u -N -r15137 -r16243 --- branches/5.2.x/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 15137) +++ branches/5.2.x/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 16243) @@ -1,6 +1,6 @@ Application->recallObject('SectionsHelper'); /* @var $sections_helper kSectionsHelper */ - $section_data =& $sections_helper->getSectionData($section_name); + $section_name = $sections_helper->getPermSection($section_name); - if ($section_data && isset($section_data['perm_prefix'])) { - // using permission from other prefix - $section_name = $this->Application->getUnitOption($section_data['perm_prefix'].'.main', 'PermSection'); - } - $permissions_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $permissions_helper kPermissionsHelper */ @@ -228,4 +223,4 @@ return $this->Prefix.'['.$this->Application->GetVar('group_id').']['.$this->Application->Parser->GetParam('PermissionName').']['.$params['sub_key'].']'; } - } \ No newline at end of file + } Index: branches/5.2.x/core/units/permissions/permissions_event_handler.php =================================================================== diff -u -N -r15145 -r16243 --- branches/5.2.x/core/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 15145) +++ branches/5.2.x/core/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 16243) @@ -1,6 +1,6 @@ $section_permissions) { - $section_data =& $sections_helper->getSectionData($section_name); + $section_name = $sections_helper->getPermSection($section_name); - if ( $section_data && isset($section_data['perm_prefix']) ) { - // using permission from other prefix - $section_name = $this->Application->getUnitOption($section_data['perm_prefix'] . '.main', 'PermSection'); - } - foreach ($section_permissions as $perm_name => $perm_value) { if ( !$permissions_helper->isOldPermission($section_name, $perm_name) ) { $perm_name = $section_name . '.' . $perm_name; @@ -263,4 +258,4 @@ } } -} \ No newline at end of file +}