Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2012-12-13 10:31:59 +01:00
commit 04e56da75f

View File

@ -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);
}
/**