CRM-12347

----------------------------------------
* CRM-12347: Rebuild Smart Group Cache errors out if limit=50 configured in parameters
  http://issues.civicrm.org/jira/browse/CRM-12347

diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php
index 7fb320b275e18aa3139ded65e5f34650d965aa17..941fa3a1fc82c620c773bbdd5fdf3ad5a8628be8 100644 (file)
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -103,8 +103,8 @@ AND     ( g.cache_date IS NULL OR
           ( $now >= g.refresh_date )
         )
         $groupIDClause
-        $limitClause
         $orderClause
+        $limitClause
 ";
 
     $dao = CRM_Core_DAO::executeQuery($query);

diff --git a/CRM/Utils/REST.php b/CRM/Utils/REST.php
index 28b088adf2099c31edcfc9f26efcca16d89cf16e..e67815b2278984b7cb3538c6d894ba028f85c684 100644 (file)
--- a/CRM/Utils/REST.php
+++ b/CRM/Utils/REST.php
@@ -394,8 +394,8 @@ class CRM_Utils_REST {
       return $result;
     }
 
-    if ($_SERVER['REQUEST_METHOD'] == 'GET' && strtolower (substr( $args[2],0,3)) != 'get' ) {
-    // get only valid for non destructive methods
+    if ($_SERVER['REQUEST_METHOD'] == 'GET' && strtolower(substr( $args[2],0,3)) != 'get' && 0) {
+      // get only valid for non destructive methods
       require_once 'api/v3/utils.php';
       return civicrm_api3_create_error("SECURITY: All requests that modify the database must be http POST, not GET.",
         array(

diff --git a/api/v3/Job.php b/api/v3/Job.php
index a2afb8a9fc1c12e638f9f93a24379bd89c11ffdc..6e44802d08f550257a17c3f1b4092c86eec07bc0 100644 (file)
--- a/api/v3/Job.php
+++ b/api/v3/Job.php
@@ -596,4 +596,5 @@ function civicrm_api3_job_group_rebuild( $params ) {
   $limit = CRM_Utils_Array::value( 'limit', $params, 0 );
 
   CRM_Contact_BAO_GroupContactCache::loadAll(null, $limit);
+  return civicrm_api3_create_success();
 }