moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'patch-2' of https://github.com/do-you-even-curl/moodle

Browse source
This commit is contained in:
Andrew Nicols 2018-04-16 08:04:32 +08:00
commit 53ea0e2ccf
1 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/tablelib.php
View file

@ -913,12 +913,8 @@ class flexible_table {
/** /**
* This function is not part of the public api. * This function is not part of the public api.
* @return string initial of first name we are currently filtering by * @return string initial of first name we are currently filtering by
*
* @deprecated since Moodle 3.3
*/ */
function get_initial_first() { function get_initial_first() {
debugging('Method get_initial_first() is no longer used and has been deprecated, ' .
'to print initials bar call print_initials_bar()', DEBUG_DEVELOPER);
if (!$this->use_initials) { if (!$this->use_initials) {
return NULL; return NULL;
} }
@ -929,12 +925,8 @@ class flexible_table {
/** /**
* This function is not part of the public api. * This function is not part of the public api.
* @return string initial of last name we are currently filtering by * @return string initial of last name we are currently filtering by
*
* @deprecated since Moodle 3.3
*/ */
function get_initial_last() { function get_initial_last() {
debugging('Method get_initial_last() is no longer used and has been deprecated, ' .
'to print initials bar call print_initials_bar()', DEBUG_DEVELOPER);
if (!$this->use_initials) { if (!$this->use_initials) {
return NULL; return NULL;
} }
@ -982,21 +974,17 @@ class flexible_table {
function print_initials_bar() { function print_initials_bar() {
global $OUTPUT; global $OUTPUT;
if ((!empty($this->prefs['i_last']) || !empty($this->prefs['i_first']) ||$this->use_initials) $ifirst = $this->get_initial_first();
&& isset($this->columns['fullname'])) { $ilast = $this->get_initial_last();
if (is_null($ifirst)) {
if (!empty($this->prefs['i_first'])) {
$ifirst = $this->prefs['i_first'];
} else {
$ifirst = ''; $ifirst = '';
} }
if (is_null($ilast)) {
if (!empty($this->prefs['i_last'])) {
$ilast = $this->prefs['i_last'];
} else {
$ilast = ''; $ilast = '';
} }
if ((!empty($ifirst) || !empty($ilast) ||$this->use_initials)
&& isset($this->columns['fullname'])) {
$prefixfirst = $this->request[TABLE_VAR_IFIRST]; $prefixfirst = $this->request[TABLE_VAR_IFIRST];
$prefixlast = $this->request[TABLE_VAR_ILAST]; $prefixlast = $this->request[TABLE_VAR_ILAST];
echo $OUTPUT->initials_bar($ifirst, 'firstinitial', get_string('firstname'), $prefixfirst, $this->baseurl); echo $OUTPUT->initials_bar($ifirst, 'firstinitial', get_string('firstname'), $prefixfirst, $this->baseurl);