X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FType.php;h=ece56c100a291710c1794456c0e98e0bf0212095;hb=624142d453ccf51d6bd5f8fc57e44a9b34c5f2b7;hp=db7896862394338827aa62e11420737062ef1d83;hpb=e7dcccf0000d27608e167383106f7e447d1c09dd;p=civicrm-core.git

diff --git a/CRM/Utils/Type.php b/CRM/Utils/Type.php
index db78968623..ece56c100a 100644
--- a/CRM/Utils/Type.php
+++ b/CRM/Utils/Type.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id: $
  *
  */
@@ -70,9 +70,7 @@ class CRM_Utils_Type {
    *
    * @param  $type       integer datatype
    *
-   * @return $string     String datatype respective to integer datatype
-   *
-   * @access public
+   * @return string $string     String datatype respective to integer datatype@access public
    * @static
    */
   static function typeToString($type) {
@@ -163,6 +161,29 @@ class CRM_Utils_Type {
       // 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;