Index: branches/RC/core/install/upgrades.sql =================================================================== diff -u -r10335 -r10336 --- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 10335) +++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 10336) @@ -234,6 +234,3 @@ ALTER TABLE Stylesheets ADD INDEX (Enabled), ADD INDEX (LastCompiled); ALTER TABLE Counters ADD INDEX (IsClone), ADD INDEX (LifeTime), ADD INDEX (LastCounted); ALTER TABLE Skins ADD INDEX (IsPrimary), ADD INDEX (LastCompiled); - -# due bug in 4.2.2 release theese variables were inserted in Proj-Base module instead of In-Portal -UPDATE ConfigurationValues SET ModuleOwner = 'In-Portal' WHERE VariableName IN ('MenuFrameWidth', 'DefaultSettingsUserId', 'KeepSessionOnBrowserClose'); Index: branches/RC/core/kernel/utility/event.php =================================================================== diff -u -r8929 -r10336 --- branches/RC/core/kernel/utility/event.php (.../event.php) (revision 8929) +++ branches/RC/core/kernel/utility/event.php (.../event.php) (revision 10336) @@ -292,6 +292,10 @@ // 1. get section by current top_prefix $top_prefix = $this->getEventParam('top_prefix'); + if ($top_prefix == false) { + $top_prefix = $this->Application->GetTopmostPrefix($this->Prefix, true); + $this->setEventParam('top_prefix', $top_prefix); + } $section = $this->Application->getUnitOption($top_prefix.'.main', 'PermSection'); // 2. check if this section has perm_prefix mapping to other prefix Index: branches/RC/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r10334 -r10336 --- branches/RC/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 10334) +++ branches/RC/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 10336) @@ -239,10 +239,7 @@ continue; } - $event = new kEvent($prefix.':OnAfterConfigRead'); - $event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true)); - $this->Application->HandleEvent($event); - + $this->Application->HandleEvent( new kEvent($prefix.':OnAfterConfigRead') ); $this->AfterConfigProcessed[] = $prefix; } @@ -317,10 +314,7 @@ continue; } - $event = new kEvent($prefix.':OnAfterConfigRead'); - $event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true)); - $this->Application->HandleEvent($event); - + $this->Application->HandleEvent( new kEvent($prefix.':OnAfterConfigRead') ); $this->AfterConfigProcessed[] = $prefix; } } @@ -665,9 +659,7 @@ array_unshift($clones, $prefix); $clones = array_unique($clones); foreach ($clones as $a_prefix) { - $event = new kEvent($a_prefix.':OnAfterConfigRead'); - $event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true)); - $this->Application->HandleEvent($event); + $this->Application->HandleEvent( new kEvent($a_prefix.':OnAfterConfigRead') ); } } }