diff --git a/blocks/calendar_month/block_calendar_month.php b/blocks/calendar_month/block_calendar_month.php index 41cd98e56b5..ace839e7b66 100644 --- a/blocks/calendar_month/block_calendar_month.php +++ b/blocks/calendar_month/block_calendar_month.php @@ -30,15 +30,6 @@ class block_calendar_month extends block_base { $this->title = get_string('pluginname', 'block_calendar_month'); } - /** - * Return preferred_width. - * - * @return int - */ - public function preferred_width() { - return 210; - } - /** * Return the content of this block. * diff --git a/blocks/course_summary/block_course_summary.php b/blocks/course_summary/block_course_summary.php index 281aba3fad8..c2163fca054 100644 --- a/blocks/course_summary/block_course_summary.php +++ b/blocks/course_summary/block_course_summary.php @@ -74,10 +74,6 @@ class block_course_summary extends block_base { return true; } - function preferred_width() { - return 210; - } - } diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php index bbbd72b3d8d..0061a9bdd6c 100644 --- a/blocks/moodleblock.class.php +++ b/blocks/moodleblock.class.php @@ -326,11 +326,6 @@ class block_base { $correct = false; } - $width = $this->preferred_width(); - if (!is_int($width) || $width <= 0) { - $errors[] = 'invalid_width'; - $correct = false; - } return $correct; } @@ -594,17 +589,6 @@ class block_base { return array('moodle/block:view', 'moodle/block:edit'); } - // Methods deprecated in Moodle 2.0 ======================================== - - /** - * Default case: the block wants to be 180 pixels wide - * @deprecated since Moodle 2.0. - * @return int - */ - function preferred_width() { - return 180; - } - /** * Can be overridden by the block to prevent the block from being dockable. * diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php index 27b771de4d1..2838651cd43 100644 --- a/blocks/rss_client/block_rss_client.php +++ b/blocks/rss_client/block_rss_client.php @@ -28,10 +28,6 @@ $this->title = get_string('pluginname', 'block_rss_client'); } - function preferred_width() { - return 210; - } - function applicable_formats() { return array('all' => true, 'tag' => false); // Needs work to make it work on tags MDL-11960 } diff --git a/blocks/tag_flickr/block_tag_flickr.php b/blocks/tag_flickr/block_tag_flickr.php index 46f8c190c05..06f691d388d 100644 --- a/blocks/tag_flickr/block_tag_flickr.php +++ b/blocks/tag_flickr/block_tag_flickr.php @@ -43,10 +43,6 @@ class block_tag_flickr extends block_base { return true; } - function preferred_width() { - return 170; - } - function get_content() { global $CFG, $USER; diff --git a/blocks/tag_youtube/block_tag_youtube.php b/blocks/tag_youtube/block_tag_youtube.php index 3779d42815c..a06588e5e98 100644 --- a/blocks/tag_youtube/block_tag_youtube.php +++ b/blocks/tag_youtube/block_tag_youtube.php @@ -45,10 +45,6 @@ class block_tag_youtube extends block_base { return true; } - function preferred_width() { - return 140; - } - function get_content() { global $CFG; diff --git a/blocks/upgrade.txt b/blocks/upgrade.txt index abd99d2af9a..17e78fc07a7 100644 --- a/blocks/upgrade.txt +++ b/blocks/upgrade.txt @@ -1,6 +1,10 @@ This files describes API changes in /blocks/* - activity modules, information provided here is intended especially for developers. +=== 2.9 === + +* The obsolete method preferred_width() was removed. + === 2.8 === * The instance_config_print() function was removed. It was deprecated in