course MDL-19794 Updated a couple of deprecated functions in modedit and view

diff --git a/course/modedit.php b/course/modedit.php
index 3dfee391164ab9632cb5e477a6078925f7225e8b..40a59cc7ba8eae01e43b30d7f8fe6c0b811b8701 100644 (file)
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -37,6 +37,23 @@
 
     $PAGE->set_generaltype('form');
 
+    $url = new moodle_url($CFG->wwwroot.'/course/modedit.php');
+    if (!empty($add)) {
+        $url->param('add', $add);
+    } else if (!empty($update)) {
+        $url->param('update', $update);
+    } else {
+        debugging('Neither add nor update arguments were provided, PAGE->set_url needs to be checked', DEBUG_DEVELOPER);
+    }
+    if (!empty($return)) {
+        $url->param('return', $return);
+    }
+    if (!empty($type)) {
+        $url->param('type', $type);
+    }
+    $PAGE->set_url($url);
+
+
     if (!empty($add)) {
         $section = required_param('section', PARAM_INT);
         $course  = required_param('course', PARAM_INT);
@@ -582,10 +599,6 @@
         $streditinga = get_string('editinga', 'moodle', $fullmodulename);
         $strmodulenameplural = get_string('modulenameplural', $module->name);
 
-        $PAGE->navbar->add($strmodulenameplural, new moodle_url($CFG->wwwroot.'/mod/'.$module->name.'/index.php', array('id'=>$course->id)));
-        if ($navlinksinstancename) {
-            $PAGE->navbar->add($navlinksinstancename['name'], $navlinksinstancename['link']);
-        }
         $PAGE->navbar->add($streditinga);
         $PAGE->set_title($streditinga);
         $PAGE->set_focuscontrol($mform->focus());
@@ -599,9 +612,14 @@
             $currenttab = 'update';
             require($CFG->dirroot.'/'.$CFG->admin.'/roles/tabs.php');
         }
-        $icon = '<img src="'.$OUTPUT->mod_icon_url('icon', $module->name) . '" alt=""/>';
-
-        print_heading_with_help($pageheading, 'mods', $module->name, $icon);
+        
+        $helpicon = new moodle_help_icon();
+        $helpicon->page = 'mods';
+        $helpicon->text = $pageheading;
+        $helpicon->module = $module->name;
+        echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->mod_icon_url('icon', $module->name));
+        
         $mform->display();
+        
         echo $OUTPUT->footer();
     }

diff --git a/course/view.php b/course/view.php
index c8f3d5cae5744456c4431d7be79938c63047ba5d..c2e473e5f9c15961f4c52b50324c53a555f0756e 100644 (file)
--- a/course/view.php
+++ b/course/view.php
@@ -190,12 +190,10 @@
     // (i.e., no breadcrumbs other than the default one added inside this function)
     $buttons = switchroles_form($course->id);
     if ($PAGE->user_allowed_editing()) {
-        $buttons .= update_course_icon($course->id );
+        $buttons .= $OUTPUT->edit_button(new moodle_url($CFG->wwwroot.'/course/view.php', array('id' => $course->id)));
     }
 
-    $title = get_string('course') . ': ' . $course->fullname;
-
-    $PAGE->set_title($title);
+    $PAGE->set_title(get_string('course') . ': ' . $course->fullname);
     $PAGE->set_heading($course->fullname);
     $PAGE->set_button($buttons);
     $PAGE->set_headingmenu(user_login_string($course, $USER));