Merging latest blocks-related stuff from MOODLE_14_STABLE.

diff --git a/admin/site.php b/admin/site.php
index d76248e076c064fcf92ac3376cbc6dd28b22c62f..a55d73bb09540f68e34793f07fc8239fbd2e91e3 100644 (file)
--- a/admin/site.php
+++ b/admin/site.php
@@ -31,8 +31,8 @@
             } else {
                 // [pj] We are about to create the site, so let's add some blocks...
                 // calendar_month is included as a Moodle feature advertisement ;-)
-                require_once('../lib/blocklib.php');
-                $form->blockinfo = blocks_get_default_blocks(NULL, 'site_main_menu,admin,course_list:course_summary,calendar_month');
+                require_once($CFG->dirroot.'/lib/blocklib.php');
+                $form->blockinfo = blocks_get_default_blocks(NULL, BLOCKS_DEFAULT_SITE);
 
                 if ($newid = insert_record("course", $form)) {
                     $cat->name = get_string("miscellaneous");

diff --git a/lib/blocklib.php b/lib/blocklib.php
index f0fc6180b7da905eb4a6261400d05925f1051596..b9252c8c809486e793f26213459842a295d40f27 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -14,24 +14,6 @@ define('BLOCKS_DEFAULT_SOCIAL', 'participants,search_forums,calendar_month,calen
 define('BLOCKS_DEFAULT_TOPICS', 'participants,activity_modules,search_forums,admin,course_list:news_items,calendar_upcoming,recent_activity');
 define('BLOCKS_DEFAULT_WEEKS',  'participants,activity_modules,search_forums,admin,course_list:news_items,calendar_upcoming,recent_activity');
 
-function block_formats_to_array($formatstring) {
-    $retval = array();
-
-    $formats = preg_split('/[+\-]/', $formatstring, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
-    if(!empty($formats)) {
-        foreach($formats as $format) {
-            if($format[1] > 0 && substr ($str, $format[1] - 1, 1) === '-') {
-                $retval[$format[0]] = false;
-            }
-            else {
-                $retval[$format[0]] = true;
-            }
-        }
-    }
-
-    return $retval;
-}
-
 function block_remove_inappropriate_from_course(&$course) {
     $blocks = $course->blockinfo;