MDL-13319 skip disabled modules and blocks in cron; merged from MOODLE_19_STABLE

diff --git a/admin/cron.php b/admin/cron.php
index 58d4cc0b1ef4c449c8de980cf0808fdf52ecfc75..2783d182ae799c6380b43ebea4038bb43457711a 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -101,7 +101,7 @@
 
     mtrace("Starting activity modules");
     get_mailer('buffer');
-    if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron)")) {
+    if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron) AND visible = 1 ")) {
         foreach ($mods as $mod) {
             $libfile = "$CFG->dirroot/mod/$mod->name/lib.php";
             if (file_exists($libfile)) {
@@ -133,7 +133,7 @@
     mtrace("Finished activity modules");
 
     mtrace("Starting blocks");
-    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron)")) {
+    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron) AND visible = 1")) {
         // we will need the base class.
         require_once($CFG->dirroot.'/blocks/moodleblock.class.php');
         foreach ($blocks as $block) {