Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 07:37:05 +0000 (15:37 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 07:37:05 +0000 (15:37 +0800)
Conflicts:
login/change_password.php

1  2 
course/management.php
course/tests/behat/behat_course.php
lib/adminlib.php
lib/moodlelib.php
login/change_password.php
report/outline/user.php

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -120,10 -122,10 +124,8 @@@ if ($mform->is_cancelled()) 
  
      $strpasswordchanged = get_string('passwordchanged');
  
 -    add_to_log($course->id, 'user', 'change password', "view.php?id=$USER->id&amp;course=$course->id", "$USER->id");
 -
      $fullname = fullname($USER, true);
  
-     $PAGE->navbar->add($fullname, new moodle_url('/user/view.php', array('id'=>$USER->id, 'course'=>$course->id)));
-     $PAGE->navbar->add($strpasswordchanged);
      $PAGE->set_title($strpasswordchanged);
      $PAGE->set_heading($COURSE->fullname);
      echo $OUTPUT->header();
@@@ -53,9 -54,16 +54,9 @@@ if (!report_outline_can_access_user_rep
      require_capability('report/outline:view', $coursecontext);
  }
  
 -// Trigger a content view event.
 -$event = \report_outline\event\content_viewed::create(array('courseid' => $course->id,
 -                                                            'other'    => array('content' => 'user outline')));
 -$event->set_page_detail();
 -$event->set_legacy_logdata(array($course->id, 'course', 'report outline', "report/outline/user.php?id=$user->id&course=$course->id&mode=$mode", $course->id));
 -$event->trigger();
 -
  $stractivityreport = get_string('activityreport');
  
- $PAGE->set_pagelayout('admin');
+ $PAGE->set_pagelayout('report');
  $PAGE->set_url('/report/outline/user.php', array('id'=>$user->id, 'course'=>$course->id, 'mode'=>$mode));
  $PAGE->navigation->extend_for_user($user);
  $PAGE->navigation->set_userid_for_parent_checks($user->id); // see MDL-25805 for reasons and for full commit reference for reversal when fixed.