Index: branches/5.1.x/core/units/permissions/permissions_tag_processor.php =================================================================== diff -u -N -r12127 -r12657 --- branches/5.1.x/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 12127) +++ branches/5.1.x/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 12657) @@ -1,6 +1,6 @@ Conn->GetCol($sql, 'Perm'); @@ -137,7 +139,7 @@ IF(p.PermissionValue IS NOT NULL, p.PermissionValue, 0) AS InheritedValue FROM '.TABLE_PREFIX.'PermissionConfig pc LEFT JOIN '.$perm_live_table.' p - ON (p.Permission = pc.PermissionName) AND ('.str_replace('#TABLE_PREFIX#', 'p', $pos_sql).') AND (p.GroupId = '.$group_id.') + ON (p.Permission = pc.PermissionName) AND ('.str_replace('#TABLE_PREFIX#', 'p', $pos_sql).') AND (p.GroupId = '.(int)$group_id.') LEFT JOIN '.$perm_temp_table.' tmp_p ON (tmp_p.Permission = pc.PermissionName) AND (tmp_p.CatId = '.$this_cat.') AND (tmp_p.GroupId = '.$group_id.') WHERE ModuleId = "'.$module.'"'; @@ -165,8 +167,9 @@ foreach ($this->Application->ModuleInfo as $module_name => $module_data) { if (!$this->Application->prefixRegistred($module_data['Var']) || !$this->Application->getUnitOption($module_data['Var'], 'CatalogItem')) continue; $params['item_prefix'] = $module_data['Var']; - $ret .= $this->Application->ProcessParsedTag('m', 'MyInclude', $params); + $ret .= $this->Application->IncludeTemplate($params); } + return $ret; } @@ -205,6 +208,4 @@ return $this->Prefix.'['.$this->Application->GetVar('group_id').']['.$this->Application->Parser->GetParam('PermissionName').']['.$params['sub_key'].']'; } - } - -?> \ No newline at end of file + } \ No newline at end of file