Merged r1409 and r1410 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1411 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/sort_helper.rb

@@ -83,7 +83,7 @@ module SortHelper
   # Use this to sort the controller's table items collection.
   #
   def sort_clause()
-    session[@sort_name][:key] + ' ' + session[@sort_name][:order]
+    session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC')
   end
 
   # Returns a link which sorts by the named column.