Sort by country,second_name,first_name for pdf generation of international mailings

(change currently disabled / commented out -- sudoman)

diff --git a/CRM/Utils/Sort.php b/CRM/Utils/Sort.php
index 617e4c33e16c6ed7059da97e84604f681c2c1fc9..40a8c5c0aade3afcd9a1b3b73d74484cd885dd10 100644 (file)
--- a/CRM/Utils/Sort.php
+++ b/CRM/Utils/Sort.php
@@ -136,10 +136,18 @@ class CRM_Utils_Sort {
       $this->_vars[$this->_currentSortID]['direction'] == self::DONTCARE
     ) {
       $this->_vars[$this->_currentSortID]['name'] = str_replace(' ', '_', $this->_vars[$this->_currentSortID]['name']);
+      // quidam: hack to reorder by country,second_name,first_name on pdf generation
+      // un-comment next two lines to re-enable quidam's hack
+      //if ($this->_vars[$this->_currentSortID]['title'] == 'Country'){
+      //  return CRM_Utils_Type::escape($this->_vars[$this->_currentSortID]['name'], 'MysqlColumnNameOrAlias') . ' asc,last_name asc,first_name asc'; }
       return CRM_Utils_Type::escape($this->_vars[$this->_currentSortID]['name'], 'MysqlColumnNameOrAlias') . ' asc';
     }
     else {
       $this->_vars[$this->_currentSortID]['name'] = str_replace(' ', '_', $this->_vars[$this->_currentSortID]['name']);
+      // quidam: hack to reorder by country,second_name,first_name on pdf generation
+      // un-comment next two lines to re-enable quidam's hack
+      //if ($this->_vars[$this->_currentSortID]['title'] == 'Country'){
+      //  return CRM_Utils_Type::escape($this->_vars[$this->_currentSortID]['name'], 'MysqlColumnNameOrAlias') . ' desc,last_name asc,first_name asc'; }
       return CRM_Utils_Type::escape($this->_vars[$this->_currentSortID]['name'], 'MysqlColumnNameOrAlias') . ' desc';
     }
   }