Merge pull request #135 from itnova/master

Fix cron groups in default cron. Relates to issue #130
AOEpeople · Jul 10, 2015 · 3d16b7c · 3d16b7c
2 parents 5684052 + fb2ddf8
commit 3d16b7c
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/shell/scheduler.php b/shell/scheduler.php
@@ -349,11 +349,18 @@ public function cronAction()
         switch ($mode) {
             case 'always':
             case 'default':
-                $includeGroups = array_filter(array_map('trim', explode(',', $this->getArg('include'))));
-                $excludeGroups = array_filter(array_map('trim', explode(',', $this->getArg('exclude'))));
+                $includeGroups = array_filter(array_map('trim', explode(',', $this->getArg('includeGroups'))));
+                $excludeGroups = array_filter(array_map('trim', explode(',', $this->getArg('excludeGroups'))));
+                $includeJobs = array_filter(array_map('trim', explode(',', $this->getArg('includeJobs'))));
+                $excludeJobs = array_filter(array_map('trim', explode(',', $this->getArg('excludeJobs'))));
                 Mage::getConfig()->init()->loadEventObservers('crontab');
                 Mage::app()->addEventArea('crontab');
-                Mage::dispatchEvent($mode, array('include' => $includeGroups, 'exclude' => $excludeGroups));
+                Mage::dispatchEvent($mode, array(
+                    'include_groups' => $includeGroups,
+                    'exclude_groups' => $excludeGroups,
+                    'include_jobs' => $includeJobs,
+                    'exclude_jobs' => $excludeJobs,
+                ));
                 break;
             default:
                 echo "\nInvalid mode!\n\n";