Merge from MOODLE_18_STABLE:

Killing BLOCK_NUKE constant, since Martin nuked nuke blocks.

diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 9cfa7ae0060b6c0988cd1a6722af20c545584d9a..3963fb2770f083e2e7902ca0b593a8a6aab5a829 100644 (file)
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -22,11 +22,6 @@ define('BLOCK_TYPE_LIST',    1);
  */
 define('BLOCK_TYPE_TEXT',    2);
 
-/**
- * Block type of nuke. Compitibility with post nuke blocks. Basically treated as  BLOCK_TYPE_TEXT.
- */
-define('BLOCK_TYPE_NUKE',    3);
-
 /**
  * Class for describing a moodle block, all Moodle blocks derive from this class
  *