Skip to content

Commit

Permalink
MDL-30340 blocks - avoid lockin'blocks in subcontexts.
Browse files Browse the repository at this point in the history
Everytime that one block instance is edited @ any subcontext,
guarantee that the 'bring back' pattern (* = all pages) is
available, so the block can be reseted to its original context
  • Loading branch information
stronk7 committed Dec 3, 2011
1 parent d0e016f commit b2221ee
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions lib/blocklib.php
Expand Up @@ -1660,6 +1660,13 @@ function generate_page_type_patterns($pagetype, $parentcontext = null, $currentc
$patterns = default_page_type_list($pagetype, $parentcontext, $currentcontext);
}

// Ensure that the * pattern is always available if editing block 'at distance', so
// we always can 'bring back' it to the original context. MDL-30340
if ($currentcontext->id != $parentcontext->id && !isset($patterns['*'])) {
// TODO: We could change the string here, showing its 'bring back' meaning
$patterns['*'] = get_string('page-x', 'pagetype');
}

return $patterns;
}

Expand Down

0 comments on commit b2221ee

Please sign in to comment.