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

Conflicts:
	lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js

lib/blocklib.php

@@ -478,6 +478,7 @@ class block_manager {
             throw new coding_exception('block_manager has already prepared the blocks in region ' .
                     $region . 'for output. It is too late to add a fake block.');
         }
+        $bc->attributes['class'] .= ' block_fake';
         $this->extracontent[$region][] = $bc;
     }
 

lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js

@@ -491,7 +491,7 @@ MANAGER.prototype = {
                 nodes: '.'+CSS.BLOCK,
                 target: true,
                 handles: ['.'+CSS.HEADER],
-                invalid: '.block-hider-hide, .block-hider-show, .moveto',
+                invalid: '.block-hider-hide, .block-hider-show, .moveto, .block_fake',
                 dragConfig: {groups: this.groups}
             });
             dragdelegation.dd.plug(Y.Plugin.DDProxy, {

lib/yui/build/moodle-core-blocks/moodle-core-blocks.js

@@ -487,7 +487,7 @@ MANAGER.prototype = {
                 nodes: '.'+CSS.BLOCK,
                 target: true,
                 handles: ['.'+CSS.HEADER],
-                invalid: '.block-hider-hide, .block-hider-show, .moveto',
+                invalid: '.block-hider-hide, .block-hider-show, .moveto, .block_fake',
                 dragConfig: {groups: this.groups}
             });
             dragdelegation.dd.plug(Y.Plugin.DDProxy, {

lib/yui/src/blocks/js/manager.js

@@ -98,7 +98,7 @@ MANAGER.prototype = {
                 nodes: '.'+CSS.BLOCK,
                 target: true,
                 handles: ['.'+CSS.HEADER],
-                invalid: '.block-hider-hide, .block-hider-show, .moveto',
+                invalid: '.block-hider-hide, .block-hider-show, .moveto, .block_fake',
                 dragConfig: {groups: this.groups}
             });
             dragdelegation.dd.plug(Y.Plugin.DDProxy, {