mirror of
https://github.com/moodle/moodle.git
synced 2025-01-31 04:33:13 +01:00
Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle
This commit is contained in:
commit
04e56da75f
@ -419,6 +419,7 @@ class flexible_table {
|
||||
$SESSION->flextable[$this->uniqueid]->sortby = array();
|
||||
$SESSION->flextable[$this->uniqueid]->i_first = '';
|
||||
$SESSION->flextable[$this->uniqueid]->i_last = '';
|
||||
$SESSION->flextable[$this->uniqueid]->textsort = $this->column_textsort;
|
||||
}
|
||||
|
||||
$this->sess = &$SESSION->flextable[$this->uniqueid];
|
||||
@ -513,8 +514,11 @@ class flexible_table {
|
||||
if (empty($sess->sortby)) {
|
||||
return '';
|
||||
}
|
||||
if (empty($sess->textsort)) {
|
||||
$sess->textsort = array();
|
||||
}
|
||||
|
||||
return self::construct_order_by($sess->sortby);
|
||||
return self::construct_order_by($sess->sortby, $sess->textsort);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user