Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix for bug 3510:

Due to stupidly copy/pasting some code, deleting a block instance could,
under some circumstances, throw a fatal error.
  • Loading branch information...
commit 9b8a8597818508f9e638b4ae458f35b2b9a251d2 1 parent d031cf0
defacer authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 lib/blocklib.php
5 lib/blocklib.php
View
@@ -185,10 +185,10 @@ function blocks_delete_instance($instance) {
// Get the block object and call instance_delete() first
if(!$record = blocks_get_record($instance->blockid)) {
- continue;
+ return false;
}
if(!$obj = block_instance($record->name, $instance)) {
- continue;
+ return false;
}
// Return value ignored
@@ -200,6 +200,7 @@ function blocks_delete_instance($instance) {
execute_sql('UPDATE '.$CFG->prefix.'block_instance SET weight = weight - 1 WHERE pagetype = \''.$instance->pagetype.
'\' AND pageid = '.$instance->pageid.' AND position = \''.$instance->position.
'\' AND weight > '.$instance->weight, false);
+ return true;
}
// Accepts an array of block instances and checks to see if any of them have content to display
Please sign in to comment.
Something went wrong with that request. Please try again.