Merge branch 'wip-MDL-45045_master' of git://github.com/gjb2048/moodle

Conflicts:
	lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
This commit is contained in:
Sam Hemelryk
2014-04-22 10:46:51 +12:00
5 changed files with 5 additions and 4 deletions
+1
View File
@@ -481,6 +481,7 @@ class block_manager {
if (!isset($bc->attributes['data-block'])) {
$bc->attributes['data-block'] = '_fake';
}
$bc->attributes['class'] .= ' block_fake';
$this->extracontent[$region][] = $bc;
}