Merge branch 'MDL-30472-master' of git://github.com/ankitagarwal/moodle

diff --combined user/index.php
index 2f4119b,5954571..362d2be
--- 1/user/index.php
--- 2/user/index.php
+++ b/user/index.php
@@@ -135,6 -135,11 +135,6 @@@
  
      $isseparategroups = ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context));
  
 -    if ($course->id===SITEID) {
 -        $PAGE->navbar->ignore_active();
 -    }
 -
 -    $PAGE->navbar->add(get_string('participants'));
      $PAGE->set_title("$course->shortname: ".get_string('participants'));
      $PAGE->set_heading($course->fullname);
      $PAGE->set_pagetype('course-view-' . $course->format);
@@@ -346,6 -351,8 +346,8 @@@
  
      if (!isset($hiddenfields['lastaccess'])) {
          $table->sortable(true, 'lastaccess', SORT_DESC);
+     } else {
+         $table->sortable(true, 'firstname', SORT_ASC);
      }
  
      $table->no_sorting('roles');