Index: trunk/core/kernel/startup.php =================================================================== diff -u -N -r4971 -r5206 --- trunk/core/kernel/startup.php (.../startup.php) (revision 4971) +++ trunk/core/kernel/startup.php (.../startup.php) (revision 5206) @@ -1,9 +1,9 @@ profileStart('inc_globals', KERNEL_PATH.'/globals.php', $globals_start); - $debugger->profileFinish('inc_globals', KERNEL_PATH.'/globals.php', $globals_end); +// $debugger->profileStart('inc_globals', KERNEL_PATH.'/globals.php', $globals_start); +// $debugger->profileFinish('inc_globals', KERNEL_PATH.'/globals.php', $globals_end); $debugger->profilerAddTotal('includes', 'inc_globals'); $debugger->profileStart('inc_debugger', KERNEL_PATH.'/utility/debugger.php', $debugger_start); Index: trunk/kernel/units/categories/cache_updater.php =================================================================== diff -u -N -r5176 -r5206 --- trunk/kernel/units/categories/cache_updater.php (.../cache_updater.php) (revision 5176) +++ trunk/kernel/units/categories/cache_updater.php (.../cache_updater.php) (revision 5206) @@ -108,15 +108,16 @@ $has_deny = array(); - foreach ($this->Deny as $perm => $groups) { + // don't write DACL at all + /*foreach ($this->Deny as $perm => $groups) { if (count($groups) > 0) { $values[] = '('.$this->CatId.', '.$perm.', "", "'.join(',', $groups).'")'; $has_deny[] = $perm; } - } + }*/ foreach ($this->Allow as $perm => $groups) { - if (in_array($perm, $has_deny)) continue; +// if (in_array($perm, $has_deny)) continue; if (count($groups) > 0) { $values[] = '(' .$this->CatId. ', ' .$perm. ', "' .join(',', $groups). '", "")'; } Index: trunk/kernel/units/reviews/reviews_config.php =================================================================== diff -u -N -r4309 -r5206 --- trunk/kernel/units/reviews/reviews_config.php (.../reviews_config.php) (revision 4309) +++ trunk/kernel/units/reviews/reviews_config.php (.../reviews_config.php) (revision 5206) @@ -97,7 +97,7 @@ 'CreatedById' => Array('formatter'=>'kLEFTFormatter','options'=>Array(-1=>'root',-2=>'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), 'ItemType' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'Status' => Array('formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>0 ), + 'Status' => Array('formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>2 ), 'TextFormat' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Module' => Array('type'=>'string','not_null'=>1,'default'=>''), ), Index: trunk/kernel/units/permissions/permissions_event_handler.php =================================================================== diff -u -N -r4612 -r5206 --- trunk/kernel/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 4612) +++ trunk/kernel/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 5206) @@ -3,10 +3,10 @@ class PermissionsEventHandler extends InpDBEventHandler { /** - * Saves permissions while editing group - * - * @param kEvent $event - */ + * Saves permissions while editing group + * + * @param kEvent $event + */ function OnSavePermissions(&$event) { $permissions = $this->Application->GetVar($event->getPrefixSpecial(true)); Index: trunk/core/units/categories/cache_updater.php =================================================================== diff -u -N -r5176 -r5206 --- trunk/core/units/categories/cache_updater.php (.../cache_updater.php) (revision 5176) +++ trunk/core/units/categories/cache_updater.php (.../cache_updater.php) (revision 5206) @@ -108,15 +108,16 @@ $has_deny = array(); - foreach ($this->Deny as $perm => $groups) { + // don't write DACL at all + /*foreach ($this->Deny as $perm => $groups) { if (count($groups) > 0) { $values[] = '('.$this->CatId.', '.$perm.', "", "'.join(',', $groups).'")'; $has_deny[] = $perm; } - } + }*/ foreach ($this->Allow as $perm => $groups) { - if (in_array($perm, $has_deny)) continue; +// if (in_array($perm, $has_deny)) continue; if (count($groups) > 0) { $values[] = '(' .$this->CatId. ', ' .$perm. ', "' .join(',', $groups). '", "")'; } Index: trunk/core/units/permissions/permissions_event_handler.php =================================================================== diff -u -N -r4612 -r5206 --- trunk/core/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 4612) +++ trunk/core/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 5206) @@ -3,10 +3,10 @@ class PermissionsEventHandler extends InpDBEventHandler { /** - * Saves permissions while editing group - * - * @param kEvent $event - */ + * Saves permissions while editing group + * + * @param kEvent $event + */ function OnSavePermissions(&$event) { $permissions = $this->Application->GetVar($event->getPrefixSpecial(true)); Index: trunk/core/units/reviews/reviews_config.php =================================================================== diff -u -N -r4309 -r5206 --- trunk/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 4309) +++ trunk/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 5206) @@ -97,7 +97,7 @@ 'CreatedById' => Array('formatter'=>'kLEFTFormatter','options'=>Array(-1=>'root',-2=>'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), 'ItemType' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'Status' => Array('formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>0 ), + 'Status' => Array('formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active',2=>'la_Pending',0=>'la_Disabled'),'not_null'=>1,'default'=>2 ), 'TextFormat' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Module' => Array('type'=>'string','not_null'=>1,'default'=>''), ),