projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5
[civicrm-core.git]
/
CRM
/
Custom
/
Form
/
Preview.php
diff --git
a/CRM/Custom/Form/Preview.php
b/CRM/Custom/Form/Preview.php
index 28d2aa568e203c34319c1079ab9b3a4ba575dae0..673b2c9ea1caf6e4119b256f886a8513baf4579f 100644
(file)
--- a/
CRM/Custom/Form/Preview.php
+++ b/
CRM/Custom/Form/Preview.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
3
|
+ | 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$
*
*/
@@
-71,7
+71,7
@@
class CRM_Custom_Form_Preview extends CRM_Core_Form {
$fieldDAO = new CRM_Core_DAO_CustomField();
CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_CustomField', $params, $defaults);
$fieldDAO = new CRM_Core_DAO_CustomField();
CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_CustomField', $params, $defaults);
- if (
CRM_Utils_Array::value('is_view', $defaults
)) {
+ if (
!empty($defaults['is_view']
)) {
CRM_Core_Error::statusBounce(ts('This field is view only so it will not display on edit form.'));
}
elseif (CRM_Utils_Array::value('is_active', $defaults) == 0) {
CRM_Core_Error::statusBounce(ts('This field is view only so it will not display on edit form.'));
}
elseif (CRM_Utils_Array::value('is_active', $defaults) == 0) {