Index: branches/RC/core/kernel/event_manager.php =================================================================== diff -u -N -r10887 -r10893 --- branches/RC/core/kernel/event_manager.php (.../event_manager.php) (revision 10887) +++ branches/RC/core/kernel/event_manager.php (.../event_manager.php) (revision 10893) @@ -584,7 +584,6 @@ * * @param int $event_type */ - function RunRegularEvents($event_type = reBEFORE, $from_cron=false) { if (defined('IS_INSTALL')) return ; @@ -651,47 +650,7 @@ $this->Application->StoreVar('user_id', $user_id, true); // true for optional } - -/* - function RunRegularEvents($event_type = reBEFORE, $from_cron=false) - { - if (defined('IS_INSTALL')) return ; - // if RegularEvents are set to run from cron - if (!$from_cron && $this->Application->ConfigValue('UseCronForRegularEvent')) return ; - $events_source = ($event_type == reBEFORE) ? $this->beforeRegularEvents : $this->afterRegularEvents; - - $sql = 'SELECT Data - FROM '.TABLE_PREFIX.'Cache - WHERE VarName = "RegularEventRuns"'; - $event_last_runs = $this->Conn->GetOne($sql); - $event_last_runs = $event_last_runs ? unserialize($event_last_runs) : Array(); - - $user_id = $this->Application->RecallVar('user_id'); - $this->Application->StoreVar('user_id', -1); // to prevent permission checking inside events - - foreach ($events_source as $short_name => $event_data) { - $event_last_run = getArrayValue($event_last_runs, $short_name); - if ($event_last_run && $event_last_run > adodb_mktime() - $event_data['RunInterval']) { - continue; - } - else { - $event = new kEvent($event_data['EventName']); - $event->redirect = false; - $this->Application->HandleEvent($event); - $event_last_runs[$short_name] = adodb_mktime(); - } - } - - $this->Application->StoreVar('user_id', $user_id); - $fields_hash = Array ( - 'VarName' => 'RegularEventRuns', - 'Data' => serialize($event_last_runs), - 'Cached' => adodb_mktime(), - ); - $this->Conn->doInsert($fields_hash, TABLE_PREFIX.'Cache', 'REPLACE'); - } -*/ /** * Allows to determine, that required event is beeing processed right now *