CRM-16090

sort contribution pages by is_active, then title. fix broken 'All' link on pager.

diff --git a/CRM/Contribute/Page/ContributionPage.php b/CRM/Contribute/Page/ContributionPage.php
index 9e6415ea19f3e4d93935cdff773efe00af20fea5..1cc32d9c9560f6e31a6e8f6a3388fe1362442486 100644 (file)
--- a/CRM/Contribute/Page/ContributionPage.php
+++ b/CRM/Contribute/Page/ContributionPage.php
@@ -405,7 +405,7 @@ AND         cp.page_type = 'contribute'
       $this, FALSE, 0
     );
 
-    if ($this->_sortByCharacter == 1 ||
+    if ($this->_sortByCharacter == 'all' ||
       !empty($_POST)
     ) {
       $this->_sortByCharacter = '';
@@ -432,6 +432,7 @@ AND         cp.page_type = 'contribute'
   SELECT  id
     FROM  civicrm_contribution_page
    WHERE  $whereClause
+   ORDER BY is_active desc, title asc
    LIMIT  $offset, $rowCount";
     $contribPage = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Contribute_DAO_ContributionPage');
     $contribPageIds = array();
@@ -445,7 +446,7 @@ AND         cp.page_type = 'contribute'
 SELECT *
 FROM civicrm_contribution_page
 WHERE $whereClause
-ORDER BY title asc
+ORDER BY is_active desc, title asc
    LIMIT $offset, $rowCount";
 
     $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Contribute_DAO_ContributionPage');