Merge branch 'wip-MDL-28292-stable20' of git://github.com/phalacee/moodle into MOODLE_20_STABLE

2011-11-07 12:24:15 +13:00
parent 57b290b458 d153f01a53
commit fb3bf9a0d2
1 changed files with 10 additions and 0 deletions
@@ -121,4 +121,14 @@ class block_html extends block_base {

        return true;
    }
+    
+    /**
+     * The block should only be dockable when the title of the block is not empty
+     * and when parent allows docking.
+     *
+     * @return bool
+     */
+    public function instance_can_be_docked() {
+        return (!empty($this->config->title) && parent::instance_can_be_docked());
+    }
 }