Skip to content
Browse files

MDL-30700 tablelib: Fixed get_sort_for_table to work with text sortin…

…g columns for oracle

This change stores the list of columns that require text sorting in the session,
so the static function "get_sort_for_table" can work without any additional parameters.
  • Loading branch information...
1 parent 4dbdc18 commit 9c2d41fce2b775b99c85870097a845293351fca3 @damyon damyon committed with stronk7 Dec 13, 2012
Showing with 5 additions and 1 deletion.
  1. +5 −1 lib/tablelib.php
View
6 lib/tablelib.php
@@ -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 9c2d41f

Please sign in to comment.
Something went wrong with that request. Please try again.