CRM-13554

----------------------------------------
* CRM-13554: Improve string validation in the query engine
  http://issues.civicrm.org/jira/browse/CRM-13554

CRM/Contact/Form/Search/Custom/ActivitySearch.php

@@ -215,7 +215,7 @@ class CRM_Contact_Form_Search_Custom_ActivitySearch implements CRM_Contact_Form_
 
     if ($rowcount > 0 && $offset >= 0) {
       $offset = CRM_Utils_Type::escape($offset, 'Int');
-      $rowCount = CRM_Utils_Type::escape($rowCount, 'Int');
+      $rowcount = CRM_Utils_Type::escape($rowcount, 'Int');
       $sql .= " LIMIT $offset, $rowcount ";
     }
     return $sql;

CRM/Contact/Form/Search/Custom/Base.php

@@ -134,7 +134,7 @@ class CRM_Contact_Form_Search_Custom_Base {
 
     if ($rowcount > 0 && $offset >= 0) {
       $offset = CRM_Utils_Type::escape($offset, 'Int');
-      $rowCount = CRM_Utils_Type::escape($rowCount, 'Int');
+      $rowcount = CRM_Utils_Type::escape($rowcount, 'Int');
 
       $sql .= " LIMIT $offset, $rowcount ";
     }

CRM/Contact/Form/Search/Custom/ContributionAggregate.php

@@ -148,7 +148,7 @@ $having
 
     if ($rowcount > 0 && $offset >= 0) {
       $offset = CRM_Utils_Type::escape($offset, 'Int');
-      $rowCount = CRM_Utils_Type::escape($rowCount, 'Int');
+      $rowcount = CRM_Utils_Type::escape($rowcount, 'Int');
       $sql .= " LIMIT $offset, $rowcount ";
     }
     return $sql;

CRM/Contact/Form/Search/Custom/EventAggregate.php

@@ -160,7 +160,7 @@ class CRM_Contact_Form_Search_Custom_EventAggregate extends CRM_Contact_Form_Sea
 
     if ($rowcount > 0 && $offset >= 0) {
       $offset = CRM_Utils_Type::escape($offset, 'Int');
-      $rowCount = CRM_Utils_Type::escape($rowCount, 'Int');
+      $rowcount = CRM_Utils_Type::escape($rowcount, 'Int');
       $sql .= " LIMIT $offset, $rowcount ";
     }
 

CRM/Mailing/BAO/Mailing.php

@@ -468,7 +468,7 @@ AND    $mg.mailing_id = {$mailing_id}
     $limitString = NULL;
     if ($limit && $offset !== NULL) {
       $offset = CRM_Utils_Type::escape($offset, 'Int');
-      $rowCount = CRM_Utils_Type::escape($rowCount, 'Int');
+      $limit = CRM_Utils_Type::escape($limit, 'Int');
 
       $limitString = "LIMIT $offset, $limit";
     }

CRM/Mailing/BAO/Recipients.php

@@ -57,7 +57,7 @@ WHERE  mailing_id = %1
     $limitString = NULL;
     if ($limit && $offset !== NULL) {
       $offset = CRM_Utils_Type::escape($offset, 'Int');
-      $rowCount = CRM_Utils_Type::escape($rowCount, 'Int');
+      $limit = CRM_Utils_Type::escape($limit, 'Int');
 
       $limitString = "LIMIT $offset, $limit";
     }

CRM/Report/Form.php

@@ -2490,7 +2490,7 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
       $offset = CRM_Utils_Type::escape($offset, 'Int');
       $rowCount = CRM_Utils_Type::escape($rowCount, 'Int');
 
-      $this->_limit = " LIMIT $offset, " . $rowCount;
+      $this->_limit = " LIMIT $offset, $rowCount";
       return array($offset, $rowCount);
     }
   }