Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
This commit is contained in:
+5
-1
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user