Index: branches/5.1.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -N -r13956 -r14110 --- branches/5.1.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 13956) +++ branches/5.1.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 14110) @@ -1,6 +1,6 @@ Application->ConfigValue('AdvancedUserManagement')) { - $section_ajustments = $this->Application->getUnitOption($event->Prefix, 'SectionAdjustments'); - if (!$section_ajustments) { - $section_ajustments = Array (); - } + $section_ajustments = $this->Application->getUnitOption($event->Prefix, 'SectionAdjustments', Array()); + if ( !$this->Application->ConfigValue('AdvancedUserManagement') ) { $section_ajustments['in-portal:user_groups'] = 'remove'; + } - $this->Application->setUnitOption($event->Prefix, 'SectionAdjustments', $section_ajustments); + if ( $this->Application->ConfigValue('UsePopups') ) { // 1 - pop-up, 2 - modal + $section_ajustments['in-portal:main_import'] = Array('onclick' => 'direct_edit(\'adm\', this.href);'); } + + $this->Application->setUnitOption($event->Prefix, 'SectionAdjustments', $section_ajustments); } /**