[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-370-g03e2097

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  03e2097232a79458cefa2d12fa715f2199f4c876 (commit)
       via  f3ec5438601b172eca56719e4ec3d8543182e5e3 (commit)
      from  6bb3395484c8d8a3aca05d746d341261d147c3dd (commit)

Summary of changes:
 UPGRADING.mysql                    |    5 +++--
 share/html/Elements/CollectionList |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit f3ec5438601b172eca56719e4ec3d8543182e5e3
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Apr 30 23:46:17 2010 +0400

    mention binary character set in UPGRADING.mysql

diff --git a/UPGRADING.mysql b/UPGRADING.mysql
index accaa97..37b0dda 100644
--- a/UPGRADING.mysql
+++ b/UPGRADING.mysql
@@ -15,7 +15,8 @@ instructions below even if your old RT was installed on MySQL 4.1 or newer.
 
 === Upgrading RT from versions prior to 3.8.0 ===
 
-1) Backup RT's database. Test that you can restore from this backup.
+1) Backup RT's database. Use --default-character-set=binary if mysql
+server is 4.1 or newer. Test that you can restore from this backup.
 
 2) Follow instructions in the README file to step 7.
 
@@ -79,7 +80,7 @@ do the following:
 4) Configure MySQL 4.1 and newer to use Latin1 as default character set
    everywhere.
 5) Import the dump into the new MySQL server, replacing your empty database you
-   created at step 1.
+   created at step 1, use --default-character-set=binary on restore.
 6) At this point you have RT 3.8.x code base using an old database. You can
    upgrade RT using the instructions above.
 

commit 03e2097232a79458cefa2d12fa715f2199f4c876
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Apr 13 02:35:13 2010 +0400

    apply order when sorting is not allowed, but arg is there
    
    If sorting is allowed then we use arguments or no sorting
    if arguments are empty.
    
    If sorting is not allowed then we only apply order arguments
    when collection has no predefined order

diff --git a/share/html/Elements/CollectionList b/share/html/Elements/CollectionList
index 14d5d92..c7bdfd9 100644
--- a/share/html/Elements/CollectionList
+++ b/share/html/Elements/CollectionList
@@ -54,7 +54,9 @@ if (!$Collection && $Class eq 'RT::Tickets') {
 my $TotalFound = $Collection->CountAll();
 return '' if !$TotalFound && !$ShowEmpty;
 
-if ( @OrderBy && $AllowSorting ) {
+# XXX: ->{'order_by'} is hacky, but there is no way to check if
+# collection is ordered or not
+if ( @OrderBy && ($AllowSorting || !$Collection->{'order_by'}) ) {
     if ( $OrderBy[0] =~ /\|/ ) {
         @OrderBy = split /\|/, $OrderBy[0];
         @Order = split /\|/,$Order[0];

-----------------------------------------------------------------------