Merge from MOODLE_18_STABLE:

Fixing notices, I should 've done grep "BLOCK_TYPE_NUKE" earlier.

diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 3963fb2770f083e2e7902ca0b593a8a6aab5a829..a5d1169715536d8868517009d401b532c901507f 100644 (file)
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -1,8 +1,7 @@
 <?php  // $Id$
 
 /**
- * This file contains the parent class for moodle blocks, block_base,
- * as well as the block_nuke subclass.
+ * This file contains the parent class for moodle blocks, block_base.
  *
  * @author Jon Papaioannou
  * @version  $Id$
@@ -43,7 +42,7 @@ class block_base {
     var $title         = NULL;
 
     /**
-     * The type of content that this block creates. Currently support options - BLOCK_TYPE_LIST, BLOCK_TYPE_TEXT, BLOCK_TYPE_NUKE
+     * The type of content that this block creates. Currently support options - BLOCK_TYPE_LIST, BLOCK_TYPE_TEXT
      * @var int $content_type
      */
     var $content_type  = BLOCK_TYPE_TEXT;
@@ -398,7 +397,7 @@ class block_base {
             $errors[] = 'title_not_set';
             $correct = false;
         }
-        if (!in_array($this->get_content_type(), array(BLOCK_TYPE_LIST, BLOCK_TYPE_TEXT, BLOCK_TYPE_NUKE))) {
+        if (!in_array($this->get_content_type(), array(BLOCK_TYPE_LIST, BLOCK_TYPE_TEXT))) {
             $errors[] = 'invalid_content_type';
             $correct = false;
         }