Permalink
Browse files

MDL-37943 upgrade: logic error in upgrade_plugins_blocks.

Derek Woolhead tracked down the problem and what needed to be fixed. I
just made the patch.

The problem was that if $plugin->cron had changed in version.php, then
the version number in the database could end up wrong after the upgrade,
and so the upgrade would immediately run a second time.
  • Loading branch information...
1 parent 6319737 commit 1fa845437c268401aa45066c58a426d3e2784ee4 @timhunt timhunt committed Feb 8, 2013
Showing with 1 addition and 2 deletions.
  1. +1 −2 lib/upgradelib.php
View
@@ -825,8 +825,7 @@ function upgrade_plugins_blocks($startcallback, $endcallback, $verbose) {
if ($currblock->cron != $block->cron) {
// update cron flag if needed
- $currblock->cron = $block->cron;
- $DB->update_record('block', $currblock);
+ $DB->set_field('block', 'cron', $block->cron, array('id' => $currblock->id));
}
// Upgrade various components

0 comments on commit 1fa8454

Please sign in to comment.