Permalink
Browse files

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

…ODLE_23_STABLE
  • Loading branch information...
2 parents 137d63f + 4d8125b commit 87e9ea1f675efc8f5def622c55f215f8addc538e @stronk7 stronk7 committed Dec 13, 2012
Showing with 5 additions and 1 deletion.
  1. +5 −1 lib/tablelib.php
View
@@ -419,6 +419,7 @@ function setup() {
$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 @@ public static function get_sort_for_table($uniqueid) {
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);
}
/**

0 comments on commit 87e9ea1

Please sign in to comment.