Merge branch 'wip-MDL-15930-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 19:34:42 +0000 (20:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 19:34:42 +0000 (20:34 +0100)
1  2 
admin/user.php

diff --cc admin/user.php
              $users = $nusers;
          }
  
-         $override = new stdClass();
-         $override->firstname = 'firstname';
-         $override->lastname = 'lastname';
-         $fullnamelanguage = get_string('fullnamedisplay', '', $override);
-         if (($CFG->fullnamedisplay == 'firstname lastname') or
-             ($CFG->fullnamedisplay == 'firstname') or
-             ($CFG->fullnamedisplay == 'language' and $fullnamelanguage == 'firstname lastname' )) {
-             $fullnamedisplay = "$firstname / $lastname";
-         } else { // ($CFG->fullnamedisplay == 'language' and $fullnamelanguage == 'lastname firstname')
-             $fullnamedisplay = "$lastname / $firstname";
-         }
          $table = new html_table();
          $table->head = array ();
 -        $table->align = array();
 +        $table->colclasses = array();
          $table->head[] = $fullnamedisplay;
 -        $table->align[] = 'left';
 +        $table->attributes['class'] = 'admintable generaltable';
 +        $table->colclasses[] = 'leftalign';
          foreach ($extracolumns as $field) {
              $table->head[] = ${$field};
 -            $table->align[] = 'left';
 +            $table->colclasses[] = 'leftalign';
          }
          $table->head[] = $city;
 -        $table->align[] = 'left';
 +        $table->colclasses[] = 'leftalign';
          $table->head[] = $country;
 -        $table->align[] = 'left';
 +        $table->colclasses[] = 'leftalign';
          $table->head[] = $lastaccess;
 -        $table->align[] = 'left';
 +        $table->colclasses[] = 'leftalign';
          $table->head[] = get_string('edit');
 -        $table->align[] = 'center';
 +        $table->colclasses[] = 'centeralign';
          $table->head[] = "";
 -        $table->align[] = 'center';
 +        $table->colclasses[] = 'centeralign';
  
 -        $table->width = "95%";
 +        $table->id = "users";
          foreach ($users as $user) {
              if (isguestuser($user)) {
                  continue; // do not display guest here