projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 15b6afff186194c93455de0653ef0f742fdf6ff3..ece56c100a291710c1794456c0e98e0bf0212095 100644
(file)
--- a/
CRM/Utils/Type.php
+++ b/
CRM/Utils/Type.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id: $
*
*/
* $Id: $
*
*/
@@
-70,9
+70,7
@@
class CRM_Utils_Type {
*
* @param $type integer datatype
*
*
* @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) {
* @static
*/
static function typeToString($type) {
@@
-160,8
+158,7
@@
class CRM_Utils_Type {
break;
case 'Positive':
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
case 'Country':
case 'StateProvince':
// Checked for multi valued state/country value
@@
-187,6
+184,12
@@
class CRM_Utils_Type {
}
break;
}
break;
+ case 'File':
+ if (CRM_Utils_Rule::positiveInteger($data)) {
+ return $data;
+ }
+ break;
+
case 'Link':
if (CRM_Utils_Rule::url($data = trim($data))) {
return $data;
case 'Link':
if (CRM_Utils_Rule::url($data = trim($data))) {
return $data;