Skip to content
Permalink
Browse files

Merge from MOODLE_18_STABLE:

Fixing notices, I should 've done grep "BLOCK_TYPE_NUKE" earlier.
  • Loading branch information...
defacer
defacer committed Feb 26, 2007
1 parent 86ce75a commit ccd3dd0ce2ef8559d3ec7e10f07291200efd93d6
Showing with 3 additions and 4 deletions.
  1. +3 −4 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 @@ function _self_test() {
$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;
}

0 comments on commit ccd3dd0

Please sign in to comment.
You can’t perform that action at this time.