Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-19-00-06-22

[civicrm-core.git] / CRM / Utils / Type.php

diff --git a/CRM/Utils/Type.php b/CRM/Utils/Type.php
index d226544199b9590739d22698838e7e93c7613151..ece56c100a291710c1794456c0e98e0bf0212095 100644 (file)
--- a/CRM/Utils/Type.php
+++ b/CRM/Utils/Type.php
@@ -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) {
@@ -160,8 +158,7 @@ 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
@@ -187,6 +184,12 @@ class CRM_Utils_Type {
         }
         break;
 
+      case 'File':
+        if (CRM_Utils_Rule::positiveInteger($data)) {
+          return $data;
+        }
+        break;
+
       case 'Link':
         if (CRM_Utils_Rule::url($data = trim($data))) {
           return $data;