blocklib: MDL-19010 eliminate remaining calls to blocks_repopulate_page

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index f56d5b2bd7f47542fd49d91486a7bbd3d95438b2..6861a937496fda7d6b8d69755063f5b0da3aefb4 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -1109,8 +1109,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
         if ($newid = $DB->insert_record('course', $newsite)) {
             // Site created, add blocks for it
-            $page = page_create_object(PAGE_COURSE_VIEW, $newid);
-            blocks_repopulate_page($page); // Return value not checked because you can always edit later
+            blocks_add_default_course_blocks($DB->get_record('course', array('id' => $newid)));
 
             // create default course category
             $cat = get_course_category();

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 4f2862943eea7a785ef64f4d1af5e6fcf37a7e02..504db381e45d6f11fd0f787a43b1f66667f1eb47 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -842,8 +842,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
         if (empty($backup_block_format)) {     // This is a backup from Moodle < 1.5
             if (empty($blockinfo)) {
                 // Looks like it's from Moodle < 1.3. Let's give the course default blocks...
-                $newpage = page_create_object(PAGE_COURSE_VIEW, $restore->course_id);
-                blocks_repopulate_page($newpage);
+                blocks_add_default_course_blocks($DB->get_record('course', array('id' => $restore->course_id)));
             } else {
                 // We just have a blockinfo field, this is a legacy 1.4 or 1.3 backup
                 $blockrecords = $DB->get_records('block', null, '', 'name, id');

diff --git a/course/pending.php b/course/pending.php
index 8da776591841c16e58ffa56fb3af866bd0be274e..d8b1d6b499cf0cfc3465cd2dba1d73faf5ba0eb3 100644 (file)
--- a/course/pending.php
+++ b/course/pending.php
@@ -67,13 +67,13 @@
         }
 
     /// Insert the record.
-        if ($courseid = $DB->insert_record("course",$course)) {
-            $page = page_create_object(PAGE_COURSE_VIEW, $courseid);
-            blocks_repopulate_page($page); // Return value not checked because you can always edit later
+        if ($courseid = $DB->insert_record('course', $course)) {
+            $course = $DB->get_record('course', array('id' => $courseid));
+            blocks_add_default_course_blocks($course);
             $context = get_context_instance(CONTEXT_COURSE, $courseid);
             role_assign($CFG->creatornewroleid, $teacherid, 0, $context->id); // assing teacher role
-            $course->id = $courseid;
-            if (!empty($CFG->restrictmodulesfor) && $CFG->restrictmodulesfor != 'none' && !empty($CFG->restrictbydefault)) { // if we're all or requested we're ok.
+            if (!empty($CFG->restrictmodulesfor) && $CFG->restrictmodulesfor != 'none' && !empty($CFG->restrictbydefault)) {
+                // if we're all or requested we're ok.
                 $allowedmods = explode(',',$CFG->defaultallowedmodules);
                 update_restricted_mods($course,$allowedmods);
             }

diff --git a/enrol/database/enrol.php b/enrol/database/enrol.php
index 5812b4a88d7bcf1b0bc0af167d2650111d4014a0..99c0c2e6962c2912b753807f1dec364c9b3fbf90 100644 (file)
--- a/enrol/database/enrol.php
+++ b/enrol/database/enrol.php
@@ -607,8 +607,8 @@ function create_course ($course,$skip_fix_course_sortorder=0){
         $section->course  = $newcourseid;   // Create a default section.
         $section->section = 0;
         $section->id = $DB->insert_record("course_sections", $section);
-        $page = page_create_object(PAGE_COURSE_VIEW, $newcourseid);
-        blocks_repopulate_page($page); // Return value no
+        $course = $DB->get_record('course', array('id' => $newcourseid));
+        blocks_add_default_course_blocks($course);
 
         if (!$skip_fix_course_sortorder){
             fix_course_sortorder();

diff --git a/enrol/imsenterprise/enrol.php b/enrol/imsenterprise/enrol.php
index 4277b3b16b2e234b77096f60cca9d4f02c4d2eda..af064cdbf1a6917ab1325169ee051e73d37e1393 100644 (file)
--- a/enrol/imsenterprise/enrol.php
+++ b/enrol/imsenterprise/enrol.php
@@ -536,11 +536,11 @@ function process_group_tag($tagcontents){
                 // Choose a sort order that puts us at the start of the list!
                 $course->sortorder = 0;
 
-                if($course->id = $DB->insert_record('course', $course)){
+                if ($courseid = $DB->insert_record('course', $course)) {
 
                     // Setup the blocks
-                    $page = page_create_object(PAGE_COURSE_VIEW, $course->id);
-                    blocks_repopulate_page($page); // Return value not checked because you can always edit later
+                    $course = $DB->get_record('course', array('id' => $courseid));
+                    blocks_add_default_course_blocks($course);
 
                     $section = new object();
                     $section->course = $course->id;   // Create a default section.

diff --git a/enrol/ldap/enrol.php b/enrol/ldap/enrol.php
index c0adcb46f8afa7e8525929e1471cb8e5b7646aeb..8a840012b7345aeb361784ba7c71709530d580a6 100755 (executable)
--- a/enrol/ldap/enrol.php
+++ b/enrol/ldap/enrol.php
@@ -593,8 +593,8 @@ function create_course ($course_ext,$skip_fix_course_sortorder=0){
         $section->course  = $newcourseid;   // Create a default section.
         $section->section = 0;
         $section->id = $DB->insert_record("course_sections", $section);
-        $page = page_create_object(PAGE_COURSE_VIEW, $newcourseid);
-        blocks_repopulate_page($page); // Return value no
+        $course = $DB->get_record('course', array('id' => $newcourseid));
+        blocks_add_default_course_blocks($course);
 
         if (!$skip_fix_course_sortorder){ 
             fix_course_sortorder(); 

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 11e9225e097fda2afc315d4bb4bedf0a29458e24..14e4e75eca2872914d61e2d3b297d8ce2f6e854c 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -735,7 +735,7 @@ function blocks_delete_instance($instance, $nolongerused = false, $skipblockstab
 function blocks_delete_all_on_page($pagetype, $pageid) {
     global $DB;
 
-    debugging('Call to deprecated function blocks_repopulate_page. ' .
+    debugging('Call to deprecated function blocks_delete_all_on_page. ' .
             'This function cannot work any more. Doing nothing. ' .
             'Please update your code to use another method.', DEBUG_DEVELOPER);
     return false;