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

Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-12-13 10:32:38 +01:00
commit 87e9ea1f67
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/tablelib.php
View file

@ -419,6 +419,7 @@ class flexible_table {
$SESSION->flextable[$this->uniqueid]->sortby = array(); $SESSION->flextable[$this->uniqueid]->sortby = array();
$SESSION->flextable[$this->uniqueid]->i_first = ''; $SESSION->flextable[$this->uniqueid]->i_first = '';
$SESSION->flextable[$this->uniqueid]->i_last = ''; $SESSION->flextable[$this->uniqueid]->i_last = '';
$SESSION->flextable[$this->uniqueid]->textsort = $this->column_textsort;
} }
$this->sess = &$SESSION->flextable[$this->uniqueid]; $this->sess = &$SESSION->flextable[$this->uniqueid];
@ -513,8 +514,11 @@ class flexible_table {
if (empty($sess->sortby)) { if (empty($sess->sortby)) {
return ''; return '';
} }
if (empty($sess->textsort)) {
$sess->textsort = array();
}
return self::construct_order_by($sess->sortby); return self::construct_order_by($sess->sortby, $sess->textsort);
} }
/** /**