Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32

Conflicts:
	CRM/Utils/Type.php

diff --cc CRM/Contact/BAO/Query.php
Simple merge

diff --cc CRM/Core/BAO/CustomValueTable.php
Simple merge

diff --cc CRM/Utils/Type.php
index 5192000e2e67e0b9abc2d3f29dbb8a0483e56ceb,db7896862394338827aa62e11420737062ef1d83..ece56c100a291710c1794456c0e98e0bf0212095
--- 1/CRM/Utils/Type.php
--- 2/CRM/Utils/Type.php
+++ b/CRM/Utils/Type.php
@@@ -158,33 -160,15 +158,38 @@@ class CRM_Utils_Type 
          break;
  
        case 'Positive':
-         // the below 2 are for custom fields of this type
-         // CRM-8925
+       // CRM-8925 the 3 below are for custom fields of this type
        case 'Country':
        case 'StateProvince':
 +        // Checked for multi valued state/country value
 +        if (is_array($data)) {
 +          $returnData = TRUE;
 +          foreach ($data as $data) {
 +            if (CRM_Utils_Rule::positiveInteger($data) || CRM_Core_DAO::escapeString($data)) {
 +              $returnData = TRUE;
 +            }
 +            else {
 +              $returnData = FALSE;
 +            }
 +          }
 +          if ($returnData) {
 +            return $data;
 +          }
 +        }
 +        elseif (!is_numeric($data) &&  CRM_Core_DAO::escapeString($data)) {
 +          return $data;
 +        }
 +        elseif (CRM_Utils_Rule::positiveInteger($data)) {
 +          return $data;
 +        }
 +        break;
 +
+       case 'File':
+         if (CRM_Utils_Rule::positiveInteger($data)) {
+           return $data;
+         }
+         break;
+ 
        case 'Link':
          if (CRM_Utils_Rule::url($data = trim($data))) {
            return $data;