diff --git a/civicrm.php b/civicrm.php
index 2d5e7e7cd8db6b72902a23229ccbef984688c815..6309ce4ebea186a6d8dc9e27930063a0c6900837 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,11 +2,10 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.1.2
+Version: 5.2.0
Author: CiviCRM LLC
Author URI: https://civicrm.org/
Plugin URI: https://wiki.civicrm.org/confluence/display/CRMDOC/Installing+CiviCRM+for+WordPress
-GitLab Plugin URI: https://develop.tadpole.cc/plugins/civicrm
License: AGPL3
Text Domain: civicrm
Domain Path: /languages
diff --git a/civicrm/CRM/ACL/API.php b/civicrm/CRM/ACL/API.php
index 1271722fdf02f343b0ffcfa8e6eb2799243e3cc1..b3eacfc3f0f0f408e31feb22472a9425bf00cbe6 100644
--- a/civicrm/CRM/ACL/API.php
+++ b/civicrm/CRM/ACL/API.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/BAO/ACL.php b/civicrm/CRM/ACL/BAO/ACL.php
index fc6fd265d7350975d412bdc7fcd125e1aa572844..cd9c25dfeee764dfad9dae2447bcbf84cb6ac632 100644
--- a/civicrm/CRM/ACL/BAO/ACL.php
+++ b/civicrm/CRM/ACL/BAO/ACL.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/BAO/Cache.php b/civicrm/CRM/ACL/BAO/Cache.php
index 33e9ae33f63c6584c6792f3b9a8281728aed712b..66f712b2da09d1ff34d8476d82fd80272d01c416 100644
--- a/civicrm/CRM/ACL/BAO/Cache.php
+++ b/civicrm/CRM/ACL/BAO/Cache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/BAO/EntityRole.php b/civicrm/CRM/ACL/BAO/EntityRole.php
index 22eb7bf3de330285e5d2d7195f8908d5eaa263f9..757edce1cf10123c1b43a3dbe2ecbf56432f5c3a 100644
--- a/civicrm/CRM/ACL/BAO/EntityRole.php
+++ b/civicrm/CRM/ACL/BAO/EntityRole.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/Form/ACL.php b/civicrm/CRM/ACL/Form/ACL.php
index 30009f898d1d6c8c54e89bd20e36293396dc4707..9419ea41b6361afbb4d7877087430ea36831aa02 100644
--- a/civicrm/CRM/ACL/Form/ACL.php
+++ b/civicrm/CRM/ACL/Form/ACL.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/Form/ACLBasic.php b/civicrm/CRM/ACL/Form/ACLBasic.php
index 14a1e2a53fb2e8bef2ce26e12e4a547807598572..91e7cf6219168d66e9f4c48c5877b14bba9a00a7 100644
--- a/civicrm/CRM/ACL/Form/ACLBasic.php
+++ b/civicrm/CRM/ACL/Form/ACLBasic.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/Form/EntityRole.php b/civicrm/CRM/ACL/Form/EntityRole.php
index bed9ed4ed48fe1d0bb508f0877881de94f72650c..1fcca49337d614d7227601310a14ee22d776e570 100644
--- a/civicrm/CRM/ACL/Form/EntityRole.php
+++ b/civicrm/CRM/ACL/Form/EntityRole.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/Form/WordPress/Permissions.php b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
index b952957d85cca9740de0e84807efa0e0f8c2bdc9..8310106827ac2c3d360bd5bfe00edcea55439ec8 100644
--- a/civicrm/CRM/ACL/Form/WordPress/Permissions.php
+++ b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/Page/ACL.php b/civicrm/CRM/ACL/Page/ACL.php
index f333f1d6c8caa4cfaaec12b5d4700d97c5ca4dbd..23806ed566ee962ed7a2fe8816995b0c7a812865 100644
--- a/civicrm/CRM/ACL/Page/ACL.php
+++ b/civicrm/CRM/ACL/Page/ACL.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/Page/ACLBasic.php b/civicrm/CRM/ACL/Page/ACLBasic.php
index bc4e995d611372736c344ad1c9b70c61a5a99c4e..d5a7b03b173b1f52f5a6511f4edf2893db110072 100644
--- a/civicrm/CRM/ACL/Page/ACLBasic.php
+++ b/civicrm/CRM/ACL/Page/ACLBasic.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/ACL/Page/EntityRole.php b/civicrm/CRM/ACL/Page/EntityRole.php
index 2f66d4c74371762478e1e308e5bdf36b0beecd1a..a6d69605f59d710a4c38915c28adb2ed9fc5ec33 100644
--- a/civicrm/CRM/ACL/Page/EntityRole.php
+++ b/civicrm/CRM/ACL/Page/EntityRole.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/ActionMapping.php b/civicrm/CRM/Activity/ActionMapping.php
index f0bb5d7d07b7b4a3d8011e6d628face4f5dd2a97..ef42d2b6c0454ea1b3f287457b7ea01c01a4067e 100644
--- a/civicrm/CRM/Activity/ActionMapping.php
+++ b/civicrm/CRM/Activity/ActionMapping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/BAO/Activity.php b/civicrm/CRM/Activity/BAO/Activity.php
index e3ff859b889d346287a5103f0a34adbb13c67e88..f3e04b03556df7be52cd602f6ad00bb525ce466f 100644
--- a/civicrm/CRM/Activity/BAO/Activity.php
+++ b/civicrm/CRM/Activity/BAO/Activity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -1638,75 +1638,85 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
}
/**
- * Send SMS.
+ * Send SMS. Returns: bool $sent, int $activityId, int $success (number of sent SMS)
*
* @param array $contactDetails
* @param array $activityParams
- * @param array $smsParams
- * @param $contactIds
- * @param int $userID
+ * @param array $smsProviderParams
+ * @param array $contactIds
+ * @param int $sourceContactId This is the source contact Id
*
- * @return array
+ * @return array(bool $sent, int $activityId, int $success)
* @throws CRM_Core_Exception
*/
public static function sendSMS(
- &$contactDetails,
+ &$contactDetails = NULL,
&$activityParams,
- &$smsParams = array(),
- &$contactIds,
- $userID = NULL
+ &$smsProviderParams = array(),
+ &$contactIds = NULL,
+ $sourceContactId = NULL
) {
- if ($userID == NULL) {
- $userID = CRM_Core_Session::getLoggedInContactID();
- }
if (!CRM_Core_Permission::check('send SMS')) {
throw new CRM_Core_Exception("You do not have the 'send SMS' permission");
}
- $text = &$activityParams['sms_text_message'];
- // CRM-4575
- // token replacement of addressee/email/postal greetings
- // get the tokens added in subject and message
- $messageToken = CRM_Utils_Token::getTokens($text);
+ if (!isset($contactDetails) && !isset($contactIds)) {
+ Throw new CRM_Core_Exception('You must specify either $contactDetails or $contactIds');
+ }
+ // Populate $contactDetails and $contactIds if only one is set
+ if (is_array($contactIds) && !empty($contactIds) && empty($contactDetails)) {
+ foreach ($contactIds as $id) {
+ try {
+ $contactDetails[] = civicrm_api3('Contact', 'getsingle', array('contact_id' => $id));
+ }
+ catch (Exception $e) {
+ // Contact Id doesn't exist
+ }
+ }
+ }
+ elseif (is_array($contactDetails) && !empty($contactDetails) && empty($contactIds)) {
+ foreach ($contactDetails as $contact) {
+ $contactIds[] = $contact['contact_id'];
+ }
+ }
- // Create the meta level record first ( sms activity )
- $activityTypeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity',
- 'activity_type_id',
- 'SMS'
- );
+ // Get logged in User Id
+ if (empty($sourceContactId)) {
+ $sourceContactId = CRM_Core_Session::getLoggedInContactID();
+ }
- $details = $text;
+ $text = &$activityParams['sms_text_message'];
- $activitySubject = $activityParams['activity_subject'];
+ // Create the meta level record first ( sms activity )
$activityParams = array(
- 'source_contact_id' => $userID,
- 'activity_type_id' => $activityTypeID,
+ 'source_contact_id' => $sourceContactId,
+ 'activity_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'SMS'),
'activity_date_time' => date('YmdHis'),
- 'subject' => $activitySubject,
- 'details' => $details,
+ 'subject' => $activityParams['activity_subject'],
+ 'details' => $text,
'status_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'status_id', 'Completed'),
);
-
$activity = self::create($activityParams);
$activityID = $activity->id;
+ // Process Tokens
+ // token replacement of addressee/email/postal greetings
+ // get the tokens added in subject and message
+ $messageToken = CRM_Utils_Token::getTokens($text);
$returnProperties = array();
-
if (isset($messageToken['contact'])) {
foreach ($messageToken['contact'] as $key => $value) {
$returnProperties[$value] = 1;
}
}
-
- // call token hook
+ // Call tokens hook
$tokens = array();
CRM_Utils_Hook::tokens($tokens);
$categories = array_keys($tokens);
-
// get token details for contacts, call only if tokens are used
- $details = array();
+ $tokenDetails = array();
if (!empty($returnProperties) || !empty($tokens)) {
- list($details) = CRM_Utils_Token::getTokenDetails($contactIds,
+ list($tokenDetails) = CRM_Utils_Token::getTokenDetails($contactIds,
$returnProperties,
NULL, NULL, FALSE,
$messageToken,
@@ -1715,35 +1725,34 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
}
$success = 0;
- $escapeSmarty = FALSE;
$errMsgs = array();
- foreach ($contactDetails as $values) {
- $contactId = $values['contact_id'];
+ foreach ($contactDetails as $contact) {
+ $contactId = $contact['contact_id'];
- if (!empty($details) && is_array($details["{$contactId}"])) {
+ // Replace tokens
+ if (!empty($tokenDetails) && is_array($tokenDetails["{$contactId}"])) {
// unset phone from details since it always returns primary number
- unset($details["{$contactId}"]['phone']);
- unset($details["{$contactId}"]['phone_type_id']);
- $values = array_merge($values, $details["{$contactId}"]);
+ unset($tokenDetails["{$contactId}"]['phone']);
+ unset($tokenDetails["{$contactId}"]['phone_type_id']);
+ $contact = array_merge($contact, $tokenDetails["{$contactId}"]);
}
-
- $tokenText = CRM_Utils_Token::replaceContactTokens($text, $values, FALSE, $messageToken, FALSE, $escapeSmarty);
- $tokenText = CRM_Utils_Token::replaceHookTokens($tokenText, $values, $categories, FALSE, $escapeSmarty);
+ $tokenText = CRM_Utils_Token::replaceContactTokens($text, $contact, FALSE, $messageToken, FALSE, FALSE);
+ $tokenText = CRM_Utils_Token::replaceHookTokens($tokenText, $contact, $categories, FALSE, FALSE);
// Only send if the phone is of type mobile
- if ($values['phone_type_id'] == CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_Phone', 'phone_type_id', 'Mobile')) {
- $smsParams['To'] = $values['phone'];
+ if ($contact['phone_type_id'] == CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_Phone', 'phone_type_id', 'Mobile')) {
+ $smsProviderParams['To'] = $contact['phone'];
}
else {
- $smsParams['To'] = '';
+ $smsProviderParams['To'] = '';
}
$sendResult = self::sendSMSMessage(
$contactId,
$tokenText,
- $smsParams,
+ $smsProviderParams,
$activityID,
- $userID
+ $sourceContactId
);
if (PEAR::isError($sendResult)) {
@@ -1776,11 +1785,11 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
* @param int $toID
* The contact id of the recipient.
* @param $tokenText
- * @param array $smsParams
+ * @param array $smsProviderParams
* The params used for sending sms.
* @param int $activityID
* The activity ID that tracks the message.
- * @param int $userID
+ * @param int $sourceContactID
*
* @return bool|PEAR_Error
* true on success or PEAR_Error object
@@ -1788,31 +1797,33 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
public static function sendSMSMessage(
$toID,
&$tokenText,
- $smsParams = array(),
+ $smsProviderParams = array(),
$activityID,
- $userID = NULL
+ $sourceContactID = NULL
) {
- $toDoNotSms = "";
- $toPhoneNumber = "";
+ $doNotSms = TRUE;
+ $toPhoneNumber = NULL;
- if ($smsParams['To']) {
- $toPhoneNumber = trim($smsParams['To']);
+ if ($smsProviderParams['To']) {
+ // If phone number is specified use it
+ $toPhoneNumber = trim($smsProviderParams['To']);
}
elseif ($toID) {
+ // No phone number specified, so find a suitable one for the contact
$filters = array('is_deceased' => 0, 'is_deleted' => 0, 'do_not_sms' => 0);
$toPhoneNumbers = CRM_Core_BAO_Phone::allPhones($toID, FALSE, 'Mobile', $filters);
- // To get primary mobile phonenumber,if not get the first mobile phonenumber
+ // To get primary mobile phonenumber, if not get the first mobile phonenumber
if (!empty($toPhoneNumbers)) {
- $toPhoneNumerDetails = reset($toPhoneNumbers);
- $toPhoneNumber = CRM_Utils_Array::value('phone', $toPhoneNumerDetails);
+ $toPhoneNumberDetails = reset($toPhoneNumbers);
+ $toPhoneNumber = CRM_Utils_Array::value('phone', $toPhoneNumberDetails);
// Contact allows to send sms
- $toDoNotSms = 0;
+ $doNotSms = FALSE;
}
}
// make sure both phone are valid
// and that the recipient wants to receive sms
- if (empty($toPhoneNumber) or $toDoNotSms) {
+ if (empty($toPhoneNumber) or $doNotSms) {
return PEAR::raiseError(
'Recipient phone number is invalid or recipient does not want to receive SMS',
NULL,
@@ -1820,20 +1831,18 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
);
}
- $recipient = $smsParams['To'];
- $smsParams['contact_id'] = $toID;
- $smsParams['parent_activity_id'] = $activityID;
+ $recipient = $smsProviderParams['To'];
+ $smsProviderParams['contact_id'] = $toID;
+ $smsProviderParams['parent_activity_id'] = $activityID;
- $providerObj = CRM_SMS_Provider::singleton(array('provider_id' => $smsParams['provider_id']));
- $sendResult = $providerObj->send($recipient, $smsParams, $tokenText, NULL, $userID);
+ $providerObj = CRM_SMS_Provider::singleton(array('provider_id' => $smsProviderParams['provider_id']));
+ $sendResult = $providerObj->send($recipient, $smsProviderParams, $tokenText, NULL, $sourceContactID);
if (PEAR::isError($sendResult)) {
return $sendResult;
}
- $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
- $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
-
- // add activity target record for every sms that is send
+ // add activity target record for every sms that is sent
+ $targetID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Targets');
$activityTargetParams = array(
'activity_id' => $activityID,
'contact_id' => $toID,
diff --git a/civicrm/CRM/Activity/BAO/ActivityAssignment.php b/civicrm/CRM/Activity/BAO/ActivityAssignment.php
index 1ec56d0c3b9116cf46401c0bc70027008a0567bd..324089dbe8751fe92ebb61868f5f4d1f5a713910 100644
--- a/civicrm/CRM/Activity/BAO/ActivityAssignment.php
+++ b/civicrm/CRM/Activity/BAO/ActivityAssignment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/BAO/ActivityContact.php b/civicrm/CRM/Activity/BAO/ActivityContact.php
index 7486cf553ec10ab73d6732c0488bf95575fcf975..205e68910b48c3fb996608fda71eb9c845904f43 100644
--- a/civicrm/CRM/Activity/BAO/ActivityContact.php
+++ b/civicrm/CRM/Activity/BAO/ActivityContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/BAO/ActivityTarget.php b/civicrm/CRM/Activity/BAO/ActivityTarget.php
index 26aaab0c8b80678ddc15b4870b319ecaa2892a8d..a670d0ac414ed0186265ca7c1391472ff30039ae 100644
--- a/civicrm/CRM/Activity/BAO/ActivityTarget.php
+++ b/civicrm/CRM/Activity/BAO/ActivityTarget.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/BAO/ICalendar.php b/civicrm/CRM/Activity/BAO/ICalendar.php
index 805c350a51cdcd703430daee38a91003ecbfeddb..9f7ba9bbb493d230a9ee99e61cd21ec4cae40b26 100644
--- a/civicrm/CRM/Activity/BAO/ICalendar.php
+++ b/civicrm/CRM/Activity/BAO/ICalendar.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/BAO/Query.php b/civicrm/CRM/Activity/BAO/Query.php
index d460e262b8ed108ba944fce25fdf0a97caa99990..79e36aec007b8a643d42dc56ca20215eb63e5075 100644
--- a/civicrm/CRM/Activity/BAO/Query.php
+++ b/civicrm/CRM/Activity/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Controller/Search.php b/civicrm/CRM/Activity/Controller/Search.php
index 6efc8fddd39d4f60553eb9ce4b60adcbe498156e..ff8c340881ae0b0fd023efca09bf6ddcd7eccf49 100644
--- a/civicrm/CRM/Activity/Controller/Search.php
+++ b/civicrm/CRM/Activity/Controller/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Activity.php b/civicrm/CRM/Activity/Form/Activity.php
index 5b8fe0b6760645425e8f35f3ad7af1d472968f2e..a82cbade69b0b0303205b98b4f1b6760ce2a5f82 100644
--- a/civicrm/CRM/Activity/Form/Activity.php
+++ b/civicrm/CRM/Activity/Form/Activity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/ActivityFilter.php b/civicrm/CRM/Activity/Form/ActivityFilter.php
index 3a73c3b6764c8a6420451575018f1a49700f0868..791df3ff0bb6142a25bad7503e5bd265fdc9c89a 100644
--- a/civicrm/CRM/Activity/Form/ActivityFilter.php
+++ b/civicrm/CRM/Activity/Form/ActivityFilter.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/ActivityLinks.php b/civicrm/CRM/Activity/Form/ActivityLinks.php
index 6f3a9a818e8664e72ea94177c7b8962cbfff5929..665d55df0c7aaaa0ebbdaf9c4a63b079322f25be 100644
--- a/civicrm/CRM/Activity/Form/ActivityLinks.php
+++ b/civicrm/CRM/Activity/Form/ActivityLinks.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/ActivityView.php b/civicrm/CRM/Activity/Form/ActivityView.php
index a1dac67084e621887378f624f9553444dd132c77..1adf70a582a035f2bc5824b704a9ad601ef33839 100644
--- a/civicrm/CRM/Activity/Form/ActivityView.php
+++ b/civicrm/CRM/Activity/Form/ActivityView.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Search.php b/civicrm/CRM/Activity/Form/Search.php
index f7327f6052e664f2afd06dae2ac9d2010224d5c7..9e3ffd596040a6d4ba9f048c85dfbaf574b4323e 100644
--- a/civicrm/CRM/Activity/Form/Search.php
+++ b/civicrm/CRM/Activity/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task.php b/civicrm/CRM/Activity/Form/Task.php
index 5e8e62f6c0ad44e38e9223170ad54ad08a11d47d..254579876b015c1af5a4e974d2391cea0d8c6c4d 100644
--- a/civicrm/CRM/Activity/Form/Task.php
+++ b/civicrm/CRM/Activity/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/AddToTag.php b/civicrm/CRM/Activity/Form/Task/AddToTag.php
index 58025d1b21ba60d60ac2f3d68417784ef58976f9..63b737d4772e669b708953ec78e5d23431c03941 100644
--- a/civicrm/CRM/Activity/Form/Task/AddToTag.php
+++ b/civicrm/CRM/Activity/Form/Task/AddToTag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/Batch.php b/civicrm/CRM/Activity/Form/Task/Batch.php
index e76f0e3ebd63b3ea5ea23de02ffc9e7230f79130..dfb0ae0034519f82f7384db87079d41d30e6d062 100644
--- a/civicrm/CRM/Activity/Form/Task/Batch.php
+++ b/civicrm/CRM/Activity/Form/Task/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -242,6 +242,9 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task {
$activityId = civicrm_api3('activity', 'create', $value);
// @todo this would be done by the api call above if the parames were passed through.
+ // @todo extract submit functions &
+ // extend CRM_Event_Form_Task_BatchTest::testSubmit with a data provider to test
+ // handling of custom data, specifically checkbox fields.
if (!empty($value['custom']) &&
is_array($value['custom'])
) {
diff --git a/civicrm/CRM/Activity/Form/Task/Delete.php b/civicrm/CRM/Activity/Form/Task/Delete.php
index ab88458eb3ea2544680ece68c5a06f1cb5830f15..f79214d5403f248de7bbf27324d55756607bd8fd 100644
--- a/civicrm/CRM/Activity/Form/Task/Delete.php
+++ b/civicrm/CRM/Activity/Form/Task/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/Email.php b/civicrm/CRM/Activity/Form/Task/Email.php
index 7e820851559d1ff37fce823c0d4a2e1d20a4fdf4..9ad8351f736badfa5094057bb7e02614eb2d29df 100644
--- a/civicrm/CRM/Activity/Form/Task/Email.php
+++ b/civicrm/CRM/Activity/Form/Task/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/FileOnCase.php b/civicrm/CRM/Activity/Form/Task/FileOnCase.php
index b900e83e4d10c9d98e0ac2feb5d2ca4f811f0548..9fc6d71d74522fc1ea49411ed8505f7b16985e0e 100644
--- a/civicrm/CRM/Activity/Form/Task/FileOnCase.php
+++ b/civicrm/CRM/Activity/Form/Task/FileOnCase.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/PickOption.php b/civicrm/CRM/Activity/Form/Task/PickOption.php
index 4d65b9264a5fbb8e542d1fab3cc2635d701d927d..982ce6212d2b3d7bfddbc73ee73af8931a0d5c4d 100644
--- a/civicrm/CRM/Activity/Form/Task/PickOption.php
+++ b/civicrm/CRM/Activity/Form/Task/PickOption.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/PickProfile.php b/civicrm/CRM/Activity/Form/Task/PickProfile.php
index 4cdaec36225a64f8b117f10fb247550907746aae..b41617d6395f7f00c1def6be5df49c106bb0c772 100644
--- a/civicrm/CRM/Activity/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Activity/Form/Task/PickProfile.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/Print.php b/civicrm/CRM/Activity/Form/Task/Print.php
index bf763931b74601843eb332f1ef7646e63c65fddb..83c75010c9886508d602d0d1b124ced4f34d7413 100644
--- a/civicrm/CRM/Activity/Form/Task/Print.php
+++ b/civicrm/CRM/Activity/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/RemoveFromTag.php b/civicrm/CRM/Activity/Form/Task/RemoveFromTag.php
index 088ae89f61aeaab6e36817fc75149fccf4c7a8fe..9119fb9433d32bb3877b1e1306c8587bdb21b090 100644
--- a/civicrm/CRM/Activity/Form/Task/RemoveFromTag.php
+++ b/civicrm/CRM/Activity/Form/Task/RemoveFromTag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/SMS.php b/civicrm/CRM/Activity/Form/Task/SMS.php
index 78e2a783053abd15fbaa094a816d059cad49c736..66ac85cc1a8dbd3f26d8f2adb33c34f99f8ada40 100644
--- a/civicrm/CRM/Activity/Form/Task/SMS.php
+++ b/civicrm/CRM/Activity/Form/Task/SMS.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php
index dc2193f7c5801405443ef4bff6437da995966e47..6d5abe7f77c9bb68787222f8391d4447d19364ee 100644
--- a/civicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Import/Controller.php b/civicrm/CRM/Activity/Import/Controller.php
index 589827d79e2820a24d1ad91ad2b691f9ee2e179b..87ee20d5014ea961439122e2be1d7eb8e6d7979f 100644
--- a/civicrm/CRM/Activity/Import/Controller.php
+++ b/civicrm/CRM/Activity/Import/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Import/Field.php b/civicrm/CRM/Activity/Import/Field.php
index c867b4a080827ac2e30cad7420859ef1dc51cf36..3d8dc4ba7520777ffd6a87b3143bbeeba67d859a 100644
--- a/civicrm/CRM/Activity/Import/Field.php
+++ b/civicrm/CRM/Activity/Import/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Import/Form/DataSource.php b/civicrm/CRM/Activity/Import/Form/DataSource.php
index b89f477c971e866f59ebc68220d4ccc64aa636e7..2b21546cfedc9a84c6a93797f9adf10a2137df0e 100644
--- a/civicrm/CRM/Activity/Import/Form/DataSource.php
+++ b/civicrm/CRM/Activity/Import/Form/DataSource.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Import/Form/MapField.php b/civicrm/CRM/Activity/Import/Form/MapField.php
index 4a6917d35be9de81bdf01dd0182e313039e93643..5331ddc5f64b37078e60ccc4b2f705d9c7e8f531 100644
--- a/civicrm/CRM/Activity/Import/Form/MapField.php
+++ b/civicrm/CRM/Activity/Import/Form/MapField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Import/Form/Preview.php b/civicrm/CRM/Activity/Import/Form/Preview.php
index 05a499fc42700fea925f8eebdf9f2863e2737184..d4bd983823f1ff08f0bc51229be6d4a03bc7bd95 100644
--- a/civicrm/CRM/Activity/Import/Form/Preview.php
+++ b/civicrm/CRM/Activity/Import/Form/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Import/Form/Summary.php b/civicrm/CRM/Activity/Import/Form/Summary.php
index ffb993220eb540fc3f0a6b37f9a2ff5c90558f0f..5aee781ef052fa4df239def7ba7ff02618bc9e2e 100644
--- a/civicrm/CRM/Activity/Import/Form/Summary.php
+++ b/civicrm/CRM/Activity/Import/Form/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Import/Parser.php b/civicrm/CRM/Activity/Import/Parser.php
index 3920b17caa99c956c94115566e2b4bd4fc421e87..f04f49fbb4e316f6d7075b9ab94f670d51c5ad33 100644
--- a/civicrm/CRM/Activity/Import/Parser.php
+++ b/civicrm/CRM/Activity/Import/Parser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Import/Parser/Activity.php b/civicrm/CRM/Activity/Import/Parser/Activity.php
index abfa3b5b45bd4afce776275c417b3671f5e9abe3..bebd5a001dd5048575d643a89a7fbc4cb0a81d36 100644
--- a/civicrm/CRM/Activity/Import/Parser/Activity.php
+++ b/civicrm/CRM/Activity/Import/Parser/Activity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Page/AJAX.php b/civicrm/CRM/Activity/Page/AJAX.php
index b5df7881b92029ccbfbd5e32531cc37970180637..63d342f291178d4ab0ace57142157fb3b262bf44 100644
--- a/civicrm/CRM/Activity/Page/AJAX.php
+++ b/civicrm/CRM/Activity/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Page/Tab.php b/civicrm/CRM/Activity/Page/Tab.php
index 97791e8ed289c554728c325e8804a96f0700e533..658a350b190cd130866ace6122c7336ad20def1b 100644
--- a/civicrm/CRM/Activity/Page/Tab.php
+++ b/civicrm/CRM/Activity/Page/Tab.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Page/UserDashboard.php b/civicrm/CRM/Activity/Page/UserDashboard.php
index 256ba4027826606bf3c2743e804ed529e03e1bcc..365e8dd0b63de10b07588c2380f69040d5c836ca 100644
--- a/civicrm/CRM/Activity/Page/UserDashboard.php
+++ b/civicrm/CRM/Activity/Page/UserDashboard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Selector/Activity.php b/civicrm/CRM/Activity/Selector/Activity.php
index 385aa8dcc04d30e583929a231251bbf1705f846b..e7f2541bed8ed804a295ea8741bee5785f97c3ca 100644
--- a/civicrm/CRM/Activity/Selector/Activity.php
+++ b/civicrm/CRM/Activity/Selector/Activity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Selector/Search.php b/civicrm/CRM/Activity/Selector/Search.php
index 4d4fe541d1080af86296b3418e2badeb1547f895..7e5a2a02c7c805c62f3e342f3acf799dae93a960 100644
--- a/civicrm/CRM/Activity/Selector/Search.php
+++ b/civicrm/CRM/Activity/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/StateMachine/Search.php b/civicrm/CRM/Activity/StateMachine/Search.php
index 9eb4827765f15c02c3f58cd29edfc0cf6660dc01..58e81ac21579f5cfca8cecd7979f897cfc8a7ed5 100644
--- a/civicrm/CRM/Activity/StateMachine/Search.php
+++ b/civicrm/CRM/Activity/StateMachine/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Task.php b/civicrm/CRM/Activity/Task.php
index 8e1a594e624c8e63fea24156872669c0bc7f4b18..010f26559d92692637351463fe7d8c49c08b4338 100644
--- a/civicrm/CRM/Activity/Task.php
+++ b/civicrm/CRM/Activity/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Activity/Tokens.php b/civicrm/CRM/Activity/Tokens.php
index 9f4af94b54c90b863d9e167a5728f87b924f99dc..793057f5d03e544c64437df95ce9d4b0dcd141c7 100644
--- a/civicrm/CRM/Activity/Tokens.php
+++ b/civicrm/CRM/Activity/Tokens.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form.php b/civicrm/CRM/Admin/Form.php
index cf781cc44ba884c42f314ac88e16fd5c902decef..5fa9ba5b06dde4ea5b12c4e32a47d79a10cfa279 100644
--- a/civicrm/CRM/Admin/Form.php
+++ b/civicrm/CRM/Admin/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/CMSUser.php b/civicrm/CRM/Admin/Form/CMSUser.php
index f8dfbf07a833009991d1f92352c115d2874c3b79..dac43f5b2f601412e4c3f5ac612ca6e8c021e0c2 100644
--- a/civicrm/CRM/Admin/Form/CMSUser.php
+++ b/civicrm/CRM/Admin/Form/CMSUser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/ContactType.php b/civicrm/CRM/Admin/Form/ContactType.php
index 9f63a17575f843f922184bc96c907fa0acca1315..b75b298d97b05b88b467bb4662ade5aa12ebb853 100644
--- a/civicrm/CRM/Admin/Form/ContactType.php
+++ b/civicrm/CRM/Admin/Form/ContactType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Extensions.php b/civicrm/CRM/Admin/Form/Extensions.php
index cced34a566a8170f97094ce1a88dfeb219e1682a..cd4edfc5056f474d66b484e5a475219fda51ff3d 100644
--- a/civicrm/CRM/Admin/Form/Extensions.php
+++ b/civicrm/CRM/Admin/Form/Extensions.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Job.php b/civicrm/CRM/Admin/Form/Job.php
index 2169f29e0289f578e486729c19f50e2b3b41cfa0..74776dd0d41e5bbb8a2d226cd117418aae7b9032 100644
--- a/civicrm/CRM/Admin/Form/Job.php
+++ b/civicrm/CRM/Admin/Form/Job.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/LabelFormats.php b/civicrm/CRM/Admin/Form/LabelFormats.php
index 67cc7aa908696b48b05bec5b2a2608319c8e903d..0fe3c93a2a99e1d245287f29bbf6e447e2928002 100644
--- a/civicrm/CRM/Admin/Form/LabelFormats.php
+++ b/civicrm/CRM/Admin/Form/LabelFormats.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Admin/Form/LocationType.php b/civicrm/CRM/Admin/Form/LocationType.php
index 835b3f5575fcf0a760ca09c6495a608fa4802200..7979db2dabd229a3dbc099393cc19191a930fdc4 100644
--- a/civicrm/CRM/Admin/Form/LocationType.php
+++ b/civicrm/CRM/Admin/Form/LocationType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/MailSettings.php b/civicrm/CRM/Admin/Form/MailSettings.php
index fd90c12890366fccde049f62fafccc9a76476e55..305e7ce6fafaee3492914ddf1e692fe17b20e653 100644
--- a/civicrm/CRM/Admin/Form/MailSettings.php
+++ b/civicrm/CRM/Admin/Form/MailSettings.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Mapping.php b/civicrm/CRM/Admin/Form/Mapping.php
index 2555f20e6550411077df306642b1f0d3d1474ed9..bffc60447765ef8dd7e6c1d210fce25b96933801 100644
--- a/civicrm/CRM/Admin/Form/Mapping.php
+++ b/civicrm/CRM/Admin/Form/Mapping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/MessageTemplates.php b/civicrm/CRM/Admin/Form/MessageTemplates.php
index 6a0b2c86aa68aa089fab6a842defeacf08a2de8f..b980e17e721bc8a364d0eee7a8c0644f01be0e9b 100644
--- a/civicrm/CRM/Admin/Form/MessageTemplates.php
+++ b/civicrm/CRM/Admin/Form/MessageTemplates.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Navigation.php b/civicrm/CRM/Admin/Form/Navigation.php
index 54ad6dcc58162f62c40b5336b42dbdb8e3ddd951..dcf689c4b1471685a9f0613939f2a580414d41de 100644
--- a/civicrm/CRM/Admin/Form/Navigation.php
+++ b/civicrm/CRM/Admin/Form/Navigation.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/OptionGroup.php b/civicrm/CRM/Admin/Form/OptionGroup.php
index f0b37f25a078728834ce85a88ac268167c0c1653..059a5bf878604fab3bc2c7cac65c7e145490efae 100644
--- a/civicrm/CRM/Admin/Form/OptionGroup.php
+++ b/civicrm/CRM/Admin/Form/OptionGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Options.php b/civicrm/CRM/Admin/Form/Options.php
index 07ea080b35d71a5a4dd8914919f9d3fe016b3bcb..ab26fb3919a7af90e530ac9d0666463cbaf2ab68 100644
--- a/civicrm/CRM/Admin/Form/Options.php
+++ b/civicrm/CRM/Admin/Form/Options.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/ParticipantStatusType.php b/civicrm/CRM/Admin/Form/ParticipantStatusType.php
index b7b73668ec930dabf2c08759400c758bebe71f17..1e1edf75e4d8dad4dfda5562bce3e6fe3ecb8f55 100644
--- a/civicrm/CRM/Admin/Form/ParticipantStatusType.php
+++ b/civicrm/CRM/Admin/Form/ParticipantStatusType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/PaymentProcessor.php b/civicrm/CRM/Admin/Form/PaymentProcessor.php
index 32706c6109516be168abc7c9111ad03075299ac4..16be41ca046d016230cdab5cfa597d6df7c12729 100644
--- a/civicrm/CRM/Admin/Form/PaymentProcessor.php
+++ b/civicrm/CRM/Admin/Form/PaymentProcessor.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/PaymentProcessorType.php b/civicrm/CRM/Admin/Form/PaymentProcessorType.php
index d6c512f8649a12d954966de5a90d46e8956c4bfd..f81617056744c6bfb0844b292607f808437a40d6 100644
--- a/civicrm/CRM/Admin/Form/PaymentProcessorType.php
+++ b/civicrm/CRM/Admin/Form/PaymentProcessorType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/PdfFormats.php b/civicrm/CRM/Admin/Form/PdfFormats.php
index 175d713c186642e7122412f9ee7f6d85dc9321fa..b546df708c33e0c4962ce85be6cb53cb64ee1d32 100644
--- a/civicrm/CRM/Admin/Form/PdfFormats.php
+++ b/civicrm/CRM/Admin/Form/PdfFormats.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Admin/Form/Persistent.php b/civicrm/CRM/Admin/Form/Persistent.php
index 0687708013491eb0afd6f97fcce0c60b92411d36..07abc68bacbd3fe74990ba4dc949fad8bf03b4b8 100644
--- a/civicrm/CRM/Admin/Form/Persistent.php
+++ b/civicrm/CRM/Admin/Form/Persistent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Preferences.php b/civicrm/CRM/Admin/Form/Preferences.php
index 149325d9b5dee987dd2d1a005504e0b80314034a..c379954b73e2500cd3038cd91dd92f2ae73212ca 100644
--- a/civicrm/CRM/Admin/Form/Preferences.php
+++ b/civicrm/CRM/Admin/Form/Preferences.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Preferences/Address.php b/civicrm/CRM/Admin/Form/Preferences/Address.php
index 244aa62cc8e24b6d9f4e4891169efa8aa84cadb0..a778f395380c00ddd2068e8211175732c926cb5d 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Address.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Address.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Preferences/Campaign.php b/civicrm/CRM/Admin/Form/Preferences/Campaign.php
index 4fb64342240febe35914306e444cc7c0b847a6f5..196a24a75ee6337db167c3a6af83a0bd5fe0c7d3 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Campaign.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Campaign.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Preferences/Contribute.php b/civicrm/CRM/Admin/Form/Preferences/Contribute.php
index db7f076f15e92e67a5e55862fcde8f12f904e4b3..f650ec51de4b96a855e580c1b2d4c114872b9f9c 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Contribute.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Contribute.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Preferences/Display.php b/civicrm/CRM/Admin/Form/Preferences/Display.php
index 5783c70c9751d54e2081d2646a77e371c6f05fbf..16e0c193ffedf87e721d361d507524e6d9649ee8 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Display.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Display.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Preferences/Event.php b/civicrm/CRM/Admin/Form/Preferences/Event.php
index 1e3607f83aaed8611e900d443ef82294aef5fa23..67009eacf95ad690dd4ef1f2f19de32f0a229856 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Event.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Preferences/Mailing.php b/civicrm/CRM/Admin/Form/Preferences/Mailing.php
index 166fa1afba1b69786c478b45a0b6f43c284750d3..e26a56a57fe160f9dbe8d1b576fbbf706ab017ae 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Mailing.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Mailing.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Preferences/Member.php b/civicrm/CRM/Admin/Form/Preferences/Member.php
index a8efcbe3cb553ff727d753d3df3c17ef7487484d..8ae9eabcf1046b4d929340bcc046333e8d09b112 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Member.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Member.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Preferences/Multisite.php b/civicrm/CRM/Admin/Form/Preferences/Multisite.php
index 35acc53d3e3b1f83cc2c9affb167c58199ec4ad5..1a8460357e0b9abacfe70d8716fe44f8c03ec9be 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Multisite.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Multisite.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/PreferencesDate.php b/civicrm/CRM/Admin/Form/PreferencesDate.php
index e400a2b33a74f67a648afedeff4d58af93514fff..b26ec56aea6d3bedd0659209d85d1198c0b098b2 100644
--- a/civicrm/CRM/Admin/Form/PreferencesDate.php
+++ b/civicrm/CRM/Admin/Form/PreferencesDate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/RelationshipType.php b/civicrm/CRM/Admin/Form/RelationshipType.php
index 9f939d2bbb531cca0fd745447c00679bfa3ec9a9..55d3616a6964c0e5fa18c38b57ff442da5b32ae8 100644
--- a/civicrm/CRM/Admin/Form/RelationshipType.php
+++ b/civicrm/CRM/Admin/Form/RelationshipType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -137,14 +137,12 @@ class CRM_Admin_Form_RelationshipType extends CRM_Admin_Form {
CRM_Core_Session::setStatus(ts('Selected Relationship type has been deleted.'), ts('Record Deleted'), 'success');
}
else {
- $ids = array();
-
// store the submitted values in an array
$params = $this->exportValues();
$params['is_active'] = CRM_Utils_Array::value('is_active', $params, FALSE);
if ($this->_action & CRM_Core_Action::UPDATE) {
- $ids['relationshipType'] = $this->_id;
+ $params['id'] = $this->_id;
}
$cTypeA = CRM_Utils_System::explode('__',
@@ -162,7 +160,15 @@ class CRM_Admin_Form_RelationshipType extends CRM_Admin_Form {
$params['contact_sub_type_a'] = $cTypeA[1] ? $cTypeA[1] : 'NULL';
$params['contact_sub_type_b'] = $cTypeB[1] ? $cTypeB[1] : 'NULL';
- $result = CRM_Contact_BAO_RelationshipType::add($params, $ids);
+ // if label B to A is blank, insert the value label A to B for it
+ if (!strlen(trim(CRM_Utils_Array::value('name_b_a', $params)))) {
+ $params['name_b_a'] = CRM_Utils_Array::value('name_a_b', $params);
+ }
+ if (!strlen(trim(CRM_Utils_Array::value('label_b_a', $params)))) {
+ $params['label_b_a'] = CRM_Utils_Array::value('label_a_b', $params);
+ }
+
+ $result = CRM_Contact_BAO_RelationshipType::add($params);
$this->ajaxResponse['relationshipType'] = $result->toArray();
diff --git a/civicrm/CRM/Admin/Form/ScheduleReminders.php b/civicrm/CRM/Admin/Form/ScheduleReminders.php
index beec68bb85bea85de1dc57af7f282e4bc82b7586..612bcebff99ba3cc8370b4e72d1427b20acb435e 100644
--- a/civicrm/CRM/Admin/Form/ScheduleReminders.php
+++ b/civicrm/CRM/Admin/Form/ScheduleReminders.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -334,7 +334,9 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
$errors['absolute_date'] = ts('Absolute date cannot be earlier than the current time.');
}
}
-
+ if (!CRM_Utils_Rule::email($fields['from_email'])) {
+ $errors['from_email'] = ts('Please enter a valid email address.');
+ }
$recipientKind = array(
'participant_role' => array(
'name' => 'participant role',
@@ -349,6 +351,13 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
$errors[$recipientKind[$fields['recipient']]['target_id']] = ts('If "Also include" or "Limit to" are selected, you must specify at least one %1', array(1 => $recipientKind[$fields['recipient']]['name']));
}
+ //CRM-21523
+ if (!empty($fields['is_repeat']) &&
+ (empty($fields['repetition_frequency_interval']) || ($fields['end_frequency_interval'] == NULL))
+ ) {
+ $errors['is_repeat'] = ts('If you are enabling repetition you must indicate the frequency and ending term.');
+ }
+
$actionSchedule = $self->parseActionSchedule($fields);
if ($actionSchedule->mapping_id) {
$mapping = CRM_Core_BAO_ActionSchedule::getMapping($actionSchedule->mapping_id);
diff --git a/civicrm/CRM/Admin/Form/Setting.php b/civicrm/CRM/Admin/Form/Setting.php
index f7ed1b624651a5f2baa5b4c7d5fc03bc975da219..e19ff5128651bf947469ff469ecc61044e0d8f02 100644
--- a/civicrm/CRM/Admin/Form/Setting.php
+++ b/civicrm/CRM/Admin/Form/Setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Case.php b/civicrm/CRM/Admin/Form/Setting/Case.php
index 14d82de76aa376d6dc378775fb027b0c60ad4c3b..6d8ec8d855b877afd538f7cb126c123d32f2b2ca 100644
--- a/civicrm/CRM/Admin/Form/Setting/Case.php
+++ b/civicrm/CRM/Admin/Form/Setting/Case.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Component.php b/civicrm/CRM/Admin/Form/Setting/Component.php
index 1498ef0c2ad43ef743b7d1ce674209a9ce432e66..42181b0c49005cede322d6fd8420010a882a1dc9 100644
--- a/civicrm/CRM/Admin/Form/Setting/Component.php
+++ b/civicrm/CRM/Admin/Form/Setting/Component.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Date.php b/civicrm/CRM/Admin/Form/Setting/Date.php
index 186a7954f407f8b6f4b9754eea6dff67a49b31d5..9a5ccfa6ddc49daf22c1d682f65c5de30ed31069 100644
--- a/civicrm/CRM/Admin/Form/Setting/Date.php
+++ b/civicrm/CRM/Admin/Form/Setting/Date.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Debugging.php b/civicrm/CRM/Admin/Form/Setting/Debugging.php
index 6ab965f4f58b890e88d38c2b2a965158d4ec4a8b..15567af9b9698f3660f4f334eedd63208198fc50 100644
--- a/civicrm/CRM/Admin/Form/Setting/Debugging.php
+++ b/civicrm/CRM/Admin/Form/Setting/Debugging.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Localization.php b/civicrm/CRM/Admin/Form/Setting/Localization.php
index 68b911097c30f80786948144b1a4320534db0e4a..fcd0981f7b9bfbf468718ae2db1eaf413b5fb304 100644
--- a/civicrm/CRM/Admin/Form/Setting/Localization.php
+++ b/civicrm/CRM/Admin/Form/Setting/Localization.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Mail.php b/civicrm/CRM/Admin/Form/Setting/Mail.php
index b16347b472c6aed61637aa8bf51e5a48ba5b06d0..88907a8f386cb78c63baf49ee1e12cbee8aedebd 100644
--- a/civicrm/CRM/Admin/Form/Setting/Mail.php
+++ b/civicrm/CRM/Admin/Form/Setting/Mail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Mapping.php b/civicrm/CRM/Admin/Form/Setting/Mapping.php
index e4d36781ad0ed6d5b81cdced158805435fa1c4ca..2efd68125c0f03dec1f4b457bcf0cd206b5d0ef6 100644
--- a/civicrm/CRM/Admin/Form/Setting/Mapping.php
+++ b/civicrm/CRM/Admin/Form/Setting/Mapping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php b/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
index a62e88c2b2d4cf8b3f62734e74a39e36a92914d6..b09068e82ccdf931611909f883fda3b6109eb9ea 100644
--- a/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
+++ b/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Path.php b/civicrm/CRM/Admin/Form/Setting/Path.php
index 253b2142246582f864f0bc58b0c69ba123ba1534..8f5ed454c8d60b3cd2bc32d01d0a052a99dba7fe 100644
--- a/civicrm/CRM/Admin/Form/Setting/Path.php
+++ b/civicrm/CRM/Admin/Form/Setting/Path.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Search.php b/civicrm/CRM/Admin/Form/Setting/Search.php
index d086773dc4fb9656a235582c3d1a514085e4c5f7..0c79505c8d9d1fe3b3c2c62b3251c88560e57ec0 100644
--- a/civicrm/CRM/Admin/Form/Setting/Search.php
+++ b/civicrm/CRM/Admin/Form/Setting/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Smtp.php b/civicrm/CRM/Admin/Form/Setting/Smtp.php
index 2dbc9c53eb891ddcd5510b867fda9356ce3bfa05..500eb282ffa187350d03fa7f7368b98395b402bc 100644
--- a/civicrm/CRM/Admin/Form/Setting/Smtp.php
+++ b/civicrm/CRM/Admin/Form/Setting/Smtp.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -115,10 +115,9 @@ class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting {
$to = '"' . $toDisplayName . '"' . "<$toEmail>";
$from = '"' . $domainEmailName . '" <' . $domainEmailAddress . '>';
- $testMailStatusMsg = ts('Sending test email. FROM: %1 TO: %2.<br />', array(
- 1 => $domainEmailAddress,
- 2 => $toEmail,
- ));
+ $testMailStatusMsg = ts('Sending test email') . ':<br />'
+ . ts('From: %1', array(1 => $domainEmailAddress)) . '<br />'
+ . ts('To: %1', array(1 => $toEmail)) . '<br />';
$params = array();
if ($formValues['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_SMTP) {
@@ -170,7 +169,10 @@ class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting {
$errorScope = CRM_Core_TemporaryErrorScope::ignoreException();
$result = $mailer->send($toEmail, $headers, $message);
unset($errorScope);
- if (defined('CIVICRM_MAIL_LOG')) {
+ if (defined('CIVICRM_MAIL_LOG') && defined('CIVICRM_MAIL_LOG_AND_SEND')) {
+ $testMailStatusMsg .= '<br />' . ts('You have defined CIVICRM_MAIL_LOG_AND_SEND - mail will be logged.') . '<br /><br />';
+ }
+ if (defined('CIVICRM_MAIL_LOG') && !defined('CIVICRM_MAIL_LOG_AND_SEND')) {
CRM_Core_Session::setStatus($testMailStatusMsg . ts('You have defined CIVICRM_MAIL_LOG - no mail will be sent. Your %1 settings have not been tested.', array(1 => strtoupper($mailerName))), ts("Mail not sent"), "warning");
}
elseif (!is_a($result, 'PEAR_Error')) {
diff --git a/civicrm/CRM/Admin/Form/Setting/UF.php b/civicrm/CRM/Admin/Form/Setting/UF.php
index 69c824e07f096af0d0935d61822a82e23e8a7621..030ebea0abf50d557c5e484972fab7c456bcaba8 100644
--- a/civicrm/CRM/Admin/Form/Setting/UF.php
+++ b/civicrm/CRM/Admin/Form/Setting/UF.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php b/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php
index 3026a3007496e688128c7712c6312dbb1e043985..68711ff42aa69d2413052c28239f27c7e18c4508 100644
--- a/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php
+++ b/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/Setting/Url.php b/civicrm/CRM/Admin/Form/Setting/Url.php
index 7246ccc1c5ddfd7e29e6ee910fe367895b8574c1..fee07142290154c6c6ed78969a4711e2f677aded 100644
--- a/civicrm/CRM/Admin/Form/Setting/Url.php
+++ b/civicrm/CRM/Admin/Form/Setting/Url.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Form/WordReplacements.php b/civicrm/CRM/Admin/Form/WordReplacements.php
index 664d4b9df09ed896fca76d8a807891de097584ca..29338517e476e7aed519c62336b124b31681940b 100644
--- a/civicrm/CRM/Admin/Form/WordReplacements.php
+++ b/civicrm/CRM/Admin/Form/WordReplacements.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/AJAX.php b/civicrm/CRM/Admin/Page/AJAX.php
index 3303dcc2de6155597dc4d64a6fb6e6c9ddb40930..2cfe371650e427a7310088b81b4882a6627ec3b5 100644
--- a/civicrm/CRM/Admin/Page/AJAX.php
+++ b/civicrm/CRM/Admin/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/APIExplorer.php b/civicrm/CRM/Admin/Page/APIExplorer.php
index 10360483d8ecf2a44a3464c488d2d3febe9c2ebf..678cef4a8f4803c0e9ddf41d56667cfa5206d405 100644
--- a/civicrm/CRM/Admin/Page/APIExplorer.php
+++ b/civicrm/CRM/Admin/Page/APIExplorer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/Access.php b/civicrm/CRM/Admin/Page/Access.php
index db0ffc860a912589e634bd2c4f68a73933c3c257..43d790b010913f424ad1c19b8fe19e7e19711f5d 100644
--- a/civicrm/CRM/Admin/Page/Access.php
+++ b/civicrm/CRM/Admin/Page/Access.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/Admin.php b/civicrm/CRM/Admin/Page/Admin.php
index fbafa003cc7a6c8fdd8b258d575c091d1d91906f..ac19ae54c07c916fa09664321dcfccdde514783a 100644
--- a/civicrm/CRM/Admin/Page/Admin.php
+++ b/civicrm/CRM/Admin/Page/Admin.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/CKEditorConfig.php b/civicrm/CRM/Admin/Page/CKEditorConfig.php
index 51321a1713a72e31eb92a04c3de325527b7bb9f8..a99ae20aeebbf62bfa687e74dee7d4ae40fcae11 100644
--- a/civicrm/CRM/Admin/Page/CKEditorConfig.php
+++ b/civicrm/CRM/Admin/Page/CKEditorConfig.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/ConfigTaskList.php b/civicrm/CRM/Admin/Page/ConfigTaskList.php
index b9df4b91e224c2373d160d6165ef8456af0e8b37..a9f9abaa786247e3ccea8ea053c26972816ea0c9 100644
--- a/civicrm/CRM/Admin/Page/ConfigTaskList.php
+++ b/civicrm/CRM/Admin/Page/ConfigTaskList.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/ContactType.php b/civicrm/CRM/Admin/Page/ContactType.php
index 596c26fe7e0f2ed1e756c4ca4ce0af2114144cab..ceb953074ca50c569ae76dc30526ec49ebdb8de1 100644
--- a/civicrm/CRM/Admin/Page/ContactType.php
+++ b/civicrm/CRM/Admin/Page/ContactType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/EventTemplate.php b/civicrm/CRM/Admin/Page/EventTemplate.php
index 8edade59f02b3b41b7eda4476302aa0598473c99..07f04fe6f2ce165c84e1f2c47ca8253a7e000081 100644
--- a/civicrm/CRM/Admin/Page/EventTemplate.php
+++ b/civicrm/CRM/Admin/Page/EventTemplate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/Extensions.php b/civicrm/CRM/Admin/Page/Extensions.php
index 126ca59baaeaf645574f211e405ce6c963780332..a2d5e9cbad5389f0dd55cee3f4dacc2090025d2f 100644
--- a/civicrm/CRM/Admin/Page/Extensions.php
+++ b/civicrm/CRM/Admin/Page/Extensions.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/Job.php b/civicrm/CRM/Admin/Page/Job.php
index 25e6c0a2fb0fba6d0d6da60e94ea843374ccf14e..92237cccda27b7af37f83c1bcd602866742a7cef 100644
--- a/civicrm/CRM/Admin/Page/Job.php
+++ b/civicrm/CRM/Admin/Page/Job.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/JobLog.php b/civicrm/CRM/Admin/Page/JobLog.php
index 177cdbee0b03628035375038558be50a74202a82..a23346a1fe7bfb252f25807e125c7d37952dcfae 100644
--- a/civicrm/CRM/Admin/Page/JobLog.php
+++ b/civicrm/CRM/Admin/Page/JobLog.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/LabelFormats.php b/civicrm/CRM/Admin/Page/LabelFormats.php
index 5c99d8ee6d8297a12974e177e8a0cf61dadb1660..fce9cc28f4f9c17d6f42c1ec452a8562bfbefdd2 100644
--- a/civicrm/CRM/Admin/Page/LabelFormats.php
+++ b/civicrm/CRM/Admin/Page/LabelFormats.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Admin/Page/LocationType.php b/civicrm/CRM/Admin/Page/LocationType.php
index 23e7d71e44eab584f6bd4d58ba7e3e56e807087c..2ea031d2b63ff90769991da7ba6db17c2c5d1528 100644
--- a/civicrm/CRM/Admin/Page/LocationType.php
+++ b/civicrm/CRM/Admin/Page/LocationType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/MailSettings.php b/civicrm/CRM/Admin/Page/MailSettings.php
index 3054686adb9dafd7d527d342f0e64bd8831851af..45ff2b21d99e1db43f1e0c5351ee28285066515e 100644
--- a/civicrm/CRM/Admin/Page/MailSettings.php
+++ b/civicrm/CRM/Admin/Page/MailSettings.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/Mapping.php b/civicrm/CRM/Admin/Page/Mapping.php
index 2a0e57a27263df20c3158476141c81d120b2bfdb..cf65b2ae2698ddce86f2dd6206ac48281575e75a 100644
--- a/civicrm/CRM/Admin/Page/Mapping.php
+++ b/civicrm/CRM/Admin/Page/Mapping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/MessageTemplates.php b/civicrm/CRM/Admin/Page/MessageTemplates.php
index f4c1907f6bbbd127bf5a3afa25986acfb4999cba..8eefe4846bf2d1996b2255569a756c243d17cec0 100644
--- a/civicrm/CRM/Admin/Page/MessageTemplates.php
+++ b/civicrm/CRM/Admin/Page/MessageTemplates.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/Navigation.php b/civicrm/CRM/Admin/Page/Navigation.php
index 865f01ae1ed303eda8a5f63d57d8ea7e242ec66e..899a9a28100e7f2c221ede5e11d7081f3b85c192 100644
--- a/civicrm/CRM/Admin/Page/Navigation.php
+++ b/civicrm/CRM/Admin/Page/Navigation.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/Options.php b/civicrm/CRM/Admin/Page/Options.php
index dbfe1b9005a97de700c1b5793b963ff2531a95d1..5aae68d18815443d14824b17b600a13963e5cb67 100644
--- a/civicrm/CRM/Admin/Page/Options.php
+++ b/civicrm/CRM/Admin/Page/Options.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/ParticipantStatusType.php b/civicrm/CRM/Admin/Page/ParticipantStatusType.php
index 6b9c9d326e57e01dcfc4e1f09b5c07993ae064b1..453961b40a05d237a4c540ea51b6f32e690a8e0a 100644
--- a/civicrm/CRM/Admin/Page/ParticipantStatusType.php
+++ b/civicrm/CRM/Admin/Page/ParticipantStatusType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/PaymentProcessor.php b/civicrm/CRM/Admin/Page/PaymentProcessor.php
index 76ddb1619ae370d4285fd4d6a02c84c4aed23b83..ee4c9c53a23e4b678e2e5eb5559544a1d2d3689f 100644
--- a/civicrm/CRM/Admin/Page/PaymentProcessor.php
+++ b/civicrm/CRM/Admin/Page/PaymentProcessor.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/PaymentProcessorType.php b/civicrm/CRM/Admin/Page/PaymentProcessorType.php
index 6b6ed0232f67eed672325ce2f00e3835acb181c0..ea409c5f22bc4c8432a9c09c971a4d5984d9fb81 100644
--- a/civicrm/CRM/Admin/Page/PaymentProcessorType.php
+++ b/civicrm/CRM/Admin/Page/PaymentProcessorType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/PdfFormats.php b/civicrm/CRM/Admin/Page/PdfFormats.php
index dcebf0b193de8673381d2769e84f4d84d6006369..3c5a5db23d4219562755a423ca5967411ecd8905 100644
--- a/civicrm/CRM/Admin/Page/PdfFormats.php
+++ b/civicrm/CRM/Admin/Page/PdfFormats.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Admin/Page/Persistent.php b/civicrm/CRM/Admin/Page/Persistent.php
index 8032f4beabb98984e4eea2b50d6079cecc638c1f..e19b517cd1ad9c932c6ee6b3c38bcb28e61a1eff 100644
--- a/civicrm/CRM/Admin/Page/Persistent.php
+++ b/civicrm/CRM/Admin/Page/Persistent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/PreferencesDate.php b/civicrm/CRM/Admin/Page/PreferencesDate.php
index 5dd5e5909ffb00297d4a555f2a7835d4fea539fc..920b046f23cfb08a41d2bcfb23b901ca227496c7 100644
--- a/civicrm/CRM/Admin/Page/PreferencesDate.php
+++ b/civicrm/CRM/Admin/Page/PreferencesDate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/RelationshipType.php b/civicrm/CRM/Admin/Page/RelationshipType.php
index 14962e972870576086e8962f5463b7cb5172950d..873dbdb068b343704acf02dd47834309be5d6340 100644
--- a/civicrm/CRM/Admin/Page/RelationshipType.php
+++ b/civicrm/CRM/Admin/Page/RelationshipType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/ScheduleReminders.php b/civicrm/CRM/Admin/Page/ScheduleReminders.php
index 64921da5b08a7d6a8b1f84bab570c78edde395f7..275fcfe83cf1bf9c5207fd0a8a4b42be8021c872 100644
--- a/civicrm/CRM/Admin/Page/ScheduleReminders.php
+++ b/civicrm/CRM/Admin/Page/ScheduleReminders.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Admin/Page/Setting.php b/civicrm/CRM/Admin/Page/Setting.php
index 296c3566a3556c68309d0c5d8a17863d0640a5c8..731f4a900dcf3e938346a8c3aab06cd0798a5f80 100644
--- a/civicrm/CRM/Admin/Page/Setting.php
+++ b/civicrm/CRM/Admin/Page/Setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Badge/BAO/Badge.php b/civicrm/CRM/Badge/BAO/Badge.php
index e7925b5c476d16bc1a09620f8c2f9fd98c42a432..f8ad052bb40af5f1ef43a2ea474d0faf2879e306 100644
--- a/civicrm/CRM/Badge/BAO/Badge.php
+++ b/civicrm/CRM/Badge/BAO/Badge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Badge/BAO/Layout.php b/civicrm/CRM/Badge/BAO/Layout.php
index 762f479eba5941733e56b4326cd81ad47259693e..1c5ce8021952440623d7fd47ccb0642fc3257e38 100644
--- a/civicrm/CRM/Badge/BAO/Layout.php
+++ b/civicrm/CRM/Badge/BAO/Layout.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -92,7 +92,7 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel {
$params['is_default'] = CRM_Utils_Array::value('is_default', $params, FALSE);
$params['is_reserved'] = CRM_Utils_Array::value('is_reserved', $params, FALSE);
- $params['label_type_id'] = CRM_Core_OptionGroup::getValue('label_type', 'Event Badge', 'name');
+ $params['label_type_id'] = CRM_Core_PseudoConstant::getKey('CRM_Core_DAO_PrintLabel', 'label_type_id', 'Event Badge');
// check if new layout is create, if so set the created_id (if not set)
if (empty($params['id'])) {
@@ -162,7 +162,8 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel {
$layoutParams = array('id' => $params['badge_id']);
CRM_Badge_BAO_Layout::retrieve($layoutParams, $layoutInfo);
- $formatProperties = CRM_Core_OptionGroup::getValue('name_badge', $layoutInfo['label_format_name'], 'name');
+ $formatProperties = CRM_Core_PseudoConstant::getKey('CRM_Core_DAO_PrintLabel', 'label_format_name', $layoutInfo['label_format_name']);
+
$layoutInfo['format'] = json_decode($formatProperties, TRUE);
$layoutInfo['data'] = CRM_Badge_BAO_Layout::getDecodedData($layoutInfo['data']);
return $layoutInfo;
diff --git a/civicrm/CRM/Badge/Form/Layout.php b/civicrm/CRM/Badge/Form/Layout.php
index fe51abb1c3e173ac4812a20f03e6401307e56736..fbab91e3c0e5eb9829a022f4b1eb73d26af28d61 100644
--- a/civicrm/CRM/Badge/Form/Layout.php
+++ b/civicrm/CRM/Badge/Form/Layout.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Badge/Page/AJAX.php b/civicrm/CRM/Badge/Page/AJAX.php
index 608e3f0bc51bdb0f2c8772a152b99cc9173165c1..22e20df2eea4add53c2c8b6be327bed21644d500 100644
--- a/civicrm/CRM/Badge/Page/AJAX.php
+++ b/civicrm/CRM/Badge/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Badge/Page/Layout.php b/civicrm/CRM/Badge/Page/Layout.php
index da191e151a1389f6e8f064c033d4aac3fca09e8b..dd18bac0eb4c3d03403538f17afa0762d8b822d6 100644
--- a/civicrm/CRM/Badge/Page/Layout.php
+++ b/civicrm/CRM/Badge/Page/Layout.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Batch/BAO/Batch.php b/civicrm/CRM/Batch/BAO/Batch.php
index f7ec3dce4f9f21e4e830a14e518bd6af43f262bb..ceae07312299e8fd686be54309fe480c168c49a8 100644
--- a/civicrm/CRM/Batch/BAO/Batch.php
+++ b/civicrm/CRM/Batch/BAO/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Batch/BAO/EntityBatch.php b/civicrm/CRM/Batch/BAO/EntityBatch.php
index d13e6e899db647767f02a66797ce8cbe19ba8ea8..528ba65117abc689c2ab27a35c04ab9e84b9547a 100644
--- a/civicrm/CRM/Batch/BAO/EntityBatch.php
+++ b/civicrm/CRM/Batch/BAO/EntityBatch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Batch/Form/Batch.php b/civicrm/CRM/Batch/Form/Batch.php
index bdad95626d87019a4e379cc3a5a365d999262f87..6f1ff34439c6877ffc0e2c1889cce8d9a9503bb9 100644
--- a/civicrm/CRM/Batch/Form/Batch.php
+++ b/civicrm/CRM/Batch/Form/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Batch/Form/Entry.php b/civicrm/CRM/Batch/Form/Entry.php
index 5173aac2f5934ca73f2e4375dbfa4511b95d207a..0e1a00cd314c47fc2b77c403747635904f41cd79 100644
--- a/civicrm/CRM/Batch/Form/Entry.php
+++ b/civicrm/CRM/Batch/Form/Entry.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Batch/Form/Search.php b/civicrm/CRM/Batch/Form/Search.php
index 1ff788772fd1818ef63983ae2dc539cda28def47..b9c326283876922ebc7aca5ec26135d52093980f 100644
--- a/civicrm/CRM/Batch/Form/Search.php
+++ b/civicrm/CRM/Batch/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Batch/Page/AJAX.php b/civicrm/CRM/Batch/Page/AJAX.php
index a02427ba5dab8536ff158e4859b526777a08653f..b06cd7545014b86677ab75ee47e199a6a23eecc4 100644
--- a/civicrm/CRM/Batch/Page/AJAX.php
+++ b/civicrm/CRM/Batch/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Batch/Page/Batch.php b/civicrm/CRM/Batch/Page/Batch.php
index 23fd26717217c3964a09d7e9a52c5b62d1090a28..bfea527f58f5aa36a9b0a9b9676429bea98de7e7 100644
--- a/civicrm/CRM/Batch/Page/Batch.php
+++ b/civicrm/CRM/Batch/Page/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Bridge/OG/CiviCRM.php b/civicrm/CRM/Bridge/OG/CiviCRM.php
index bc8220a4b83f2b21ea16de4c8958ed37ef2a3046..c6a3dcf0987ab07f5359fbd2ef9a8d0fd8baaf92 100644
--- a/civicrm/CRM/Bridge/OG/CiviCRM.php
+++ b/civicrm/CRM/Bridge/OG/CiviCRM.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Bridge/OG/Drupal.php b/civicrm/CRM/Bridge/OG/Drupal.php
index 042a6fcb99f79432a182675bcc074810eac35950..f4bc5b6ad57addbf7a3330de1b68b09283f73a91 100644
--- a/civicrm/CRM/Bridge/OG/Drupal.php
+++ b/civicrm/CRM/Bridge/OG/Drupal.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Bridge/OG/Utils.php b/civicrm/CRM/Bridge/OG/Utils.php
index 871931033b78634521838a51f68ec2c00b685d99..764e99aa72ac00ab29b2aadf88c43bc551403513 100644
--- a/civicrm/CRM/Bridge/OG/Utils.php
+++ b/civicrm/CRM/Bridge/OG/Utils.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/BAO/Campaign.php b/civicrm/CRM/Campaign/BAO/Campaign.php
index 48896de1d7ffc38d0bb95e398da6b6bbb7f633d9..8345d7fac404bcc4256c24c8989928de0f68706c 100644
--- a/civicrm/CRM/Campaign/BAO/Campaign.php
+++ b/civicrm/CRM/Campaign/BAO/Campaign.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/BAO/Petition.php b/civicrm/CRM/Campaign/BAO/Petition.php
index 9e19ca136c04b93fe554b00482e419f6435750c9..43246cc66f65eb038a5e28262c0d1472e5aedf77 100644
--- a/civicrm/CRM/Campaign/BAO/Petition.php
+++ b/civicrm/CRM/Campaign/BAO/Petition.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -94,7 +94,7 @@ INNER JOIN civicrm_option_group grp ON ( activity_type.option_group_id = grp.id
//we only have activity type as a
//difference between survey and petition.
- $petitionTypeID = CRM_Core_OptionGroup::getValue('activity_type', 'petition', 'name');
+ $petitionTypeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Petition');
if ($petitionTypeID) {
$where[] = "( petition.activity_type_id = %1 )";
$queryParams[1] = array($petitionTypeID, 'Positive');
@@ -160,7 +160,7 @@ SELECT petition.id as id,
public static function getPetitionCount() {
$whereClause = 'WHERE ( 1 )';
$queryParams = array();
- $petitionTypeID = CRM_Core_OptionGroup::getValue('activity_type', 'petition', 'name');
+ $petitionTypeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Petition');
if ($petitionTypeID) {
$whereClause = "WHERE ( petition.activity_type_id = %1 )";
$queryParams[1] = array($petitionTypeID, 'Positive');
diff --git a/civicrm/CRM/Campaign/BAO/Query.php b/civicrm/CRM/Campaign/BAO/Query.php
index c22316de298cafec03f1e1a3fcdee6a51f2d1e65..d584980ebaeaa606fc076ea2046b9e7c6571a288 100644
--- a/civicrm/CRM/Campaign/BAO/Query.php
+++ b/civicrm/CRM/Campaign/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/BAO/Survey.php b/civicrm/CRM/Campaign/BAO/Survey.php
index 626ed8f0fd07072e0657b38e774799f5a5ac809b..df9b49022b8318bf037a85598343c53b97485343 100644
--- a/civicrm/CRM/Campaign/BAO/Survey.php
+++ b/civicrm/CRM/Campaign/BAO/Survey.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -167,7 +167,7 @@ INNER JOIN civicrm_option_group grp ON ( activity_type.option_group_id = grp.id
//we only have activity type as a
//difference between survey and petition.
- $petitionTypeID = CRM_Core_OptionGroup::getValue('activity_type', 'petition', 'name');
+ $petitionTypeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Petition');
if ($petitionTypeID) {
$where[] = "( survey.activity_type_id != %1 )";
$queryParams[1] = array($petitionTypeID, 'Positive');
diff --git a/civicrm/CRM/Campaign/Controller/Search.php b/civicrm/CRM/Campaign/Controller/Search.php
index e0adbceb04cae296b09b526de3dd4eac6f9718f0..adca7e8182d1769a0708bffa153028ae8050dea0 100644
--- a/civicrm/CRM/Campaign/Controller/Search.php
+++ b/civicrm/CRM/Campaign/Controller/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Campaign.php b/civicrm/CRM/Campaign/Form/Campaign.php
index 9feb418b7fd08d695b4f3294983f3e7be2605fd7..916d2dcbbe0ae5fafa0fdb382e0b0940465c2a1d 100644
--- a/civicrm/CRM/Campaign/Form/Campaign.php
+++ b/civicrm/CRM/Campaign/Form/Campaign.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Gotv.php b/civicrm/CRM/Campaign/Form/Gotv.php
index 21585020533dce79691092c2175a36c105120958..cb0c7396cde1448366d2704027e13cbbb92c6e11 100644
--- a/civicrm/CRM/Campaign/Form/Gotv.php
+++ b/civicrm/CRM/Campaign/Form/Gotv.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Petition.php b/civicrm/CRM/Campaign/Form/Petition.php
index 7185ac8c5ef5dcc11c74292c4ed9d940155b3382..9ebc4725a070a06328c6b7557b521b4e2a3e42c0 100644
--- a/civicrm/CRM/Campaign/Form/Petition.php
+++ b/civicrm/CRM/Campaign/Form/Petition.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Petition/Signature.php b/civicrm/CRM/Campaign/Form/Petition/Signature.php
index 31823573e4b56817059a47d782eb1f1d82dd2f71..64e3626b1a393acb8af9908953523e4b94197550 100644
--- a/civicrm/CRM/Campaign/Form/Petition/Signature.php
+++ b/civicrm/CRM/Campaign/Form/Petition/Signature.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Search.php b/civicrm/CRM/Campaign/Form/Search.php
index a8f5d7ff9393f8c70e6224c526462ef4d231b803..8c31f28e2e51a23e6d9bea73a99a043038bc915e 100644
--- a/civicrm/CRM/Campaign/Form/Search.php
+++ b/civicrm/CRM/Campaign/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Search/Campaign.php b/civicrm/CRM/Campaign/Form/Search/Campaign.php
index bab970a3ddd6ebb764c13d62daebb37ce5cec3bf..ecd37a6cdbb18984b19f1626dd551a33f1893d54 100644
--- a/civicrm/CRM/Campaign/Form/Search/Campaign.php
+++ b/civicrm/CRM/Campaign/Form/Search/Campaign.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Search/Petition.php b/civicrm/CRM/Campaign/Form/Search/Petition.php
index 1c6e01ea0016e1c87a745aba5d8b1a3a2a2cc78f..05b0d98bfe106d9e54f652894d4c43cd6c00fc88 100644
--- a/civicrm/CRM/Campaign/Form/Search/Petition.php
+++ b/civicrm/CRM/Campaign/Form/Search/Petition.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Search/Survey.php b/civicrm/CRM/Campaign/Form/Search/Survey.php
index cca82c0fd8e17131c8884643c8af604423102fff..973c571e042e9d55b483dcff287cdf5cf88c142b 100644
--- a/civicrm/CRM/Campaign/Form/Search/Survey.php
+++ b/civicrm/CRM/Campaign/Form/Search/Survey.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Survey.php b/civicrm/CRM/Campaign/Form/Survey.php
index 2a465cb6c1a239c77a136047073538bcd78e55b6..dacb5c6e6edd2a535ca90a7474f3719d604f93eb 100644
--- a/civicrm/CRM/Campaign/Form/Survey.php
+++ b/civicrm/CRM/Campaign/Form/Survey.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Survey/Delete.php b/civicrm/CRM/Campaign/Form/Survey/Delete.php
index d283ba722ff496f8b5eeb5710bc9b8c3b917a770..94187cee41cfc501afa2a6b632aed39cc61f7665 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Delete.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Survey/Main.php b/civicrm/CRM/Campaign/Form/Survey/Main.php
index 8a2f88f13c85c5fe5c610d1ec96c830733cc2957..57974875e1d9f1e7591c6fba36c93d9bf7523fa8 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Main.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Main.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Survey/Questions.php b/civicrm/CRM/Campaign/Form/Survey/Questions.php
index 858237343f7f7cc1e9a53cb6dca6e7a0f93e7093..cc1918fa9f03069b9d8a09bf4ed3aeda7b7bb93b 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Questions.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Questions.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Survey/Results.php b/civicrm/CRM/Campaign/Form/Survey/Results.php
index d8c070c6eef75756736acbf277f9ea1f33eab56e..f041d2b5b31b461407cd308cde0d684798531163 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Results.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Results.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -434,7 +434,7 @@ class CRM_Campaign_Form_Survey_Results extends CRM_Campaign_Form_Survey {
'street_unit',
'survey_response',
);
- if (CRM_Core_OptionGroup::getValue('activity_type', 'WalkList') ==
+ if (CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'WalkList') ==
$this->_values['activity_type_id']
) {
$this->_params['order_bys'] = array(
@@ -456,14 +456,14 @@ class CRM_Campaign_Form_Survey_Results extends CRM_Campaign_Form_Survey {
),
);
}
- elseif (CRM_Core_OptionGroup::getValue('activity_type', 'PhoneBank') ==
+ elseif (CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'PhoneBank') ==
$this->_values['activity_type_id']
) {
array_push($displayFields, 'phone');
}
- elseif ((CRM_Core_OptionGroup::getValue('activity_type', 'Survey') ==
+ elseif ((CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Survey') ==
$this->_values['activity_type_id']) ||
- (CRM_Core_OptionGroup::getValue('activity_type', 'Canvass') ==
+ (CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Canvass') ==
$this->_values['activity_type_id'])
) {
array_push($displayFields, 'phone', 'city', 'state_province_id', 'postal_code', 'email');
diff --git a/civicrm/CRM/Campaign/Form/Survey/TabHeader.php b/civicrm/CRM/Campaign/Form/Survey/TabHeader.php
index 6b4aea1d7d2fb6a6b81b6d2cfb8d8e4784221585..bdf1d218cf1edf4c913ce11be71d4719b1225007 100644
--- a/civicrm/CRM/Campaign/Form/Survey/TabHeader.php
+++ b/civicrm/CRM/Campaign/Form/Survey/TabHeader.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/SurveyType.php b/civicrm/CRM/Campaign/Form/SurveyType.php
index afae24df237292ddb7d42dbcd9250ac67b7e0033..cad02eabe6b0922f5d24a083400d354e905422a1 100644
--- a/civicrm/CRM/Campaign/Form/SurveyType.php
+++ b/civicrm/CRM/Campaign/Form/SurveyType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Task.php b/civicrm/CRM/Campaign/Form/Task.php
index 3a27eb0b3361751d7dc19f8aa627f256787735dd..5d7bbd6a9bd93057d36dab54e230267a37a4a46c 100644
--- a/civicrm/CRM/Campaign/Form/Task.php
+++ b/civicrm/CRM/Campaign/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Task/Interview.php b/civicrm/CRM/Campaign/Form/Task/Interview.php
index 046da10cdd1d9faa0b99047c9e1be1feb33aee53..c368b0773fb8cff0d99e7c2dd795268fecf8161c 100644
--- a/civicrm/CRM/Campaign/Form/Task/Interview.php
+++ b/civicrm/CRM/Campaign/Form/Task/Interview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Task/Print.php b/civicrm/CRM/Campaign/Form/Task/Print.php
index e6fe1c6e4864e5f783a6e0965f3e23fc018f60c7..c6b8d391356fccdef08b249cd754618277254440 100644
--- a/civicrm/CRM/Campaign/Form/Task/Print.php
+++ b/civicrm/CRM/Campaign/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Task/Release.php b/civicrm/CRM/Campaign/Form/Task/Release.php
index d6ec8a139e76450dbce5d9d36cead3bb7cc87fa4..051a8c0dde158844cc3b5a92caf7a0571be2a1fd 100644
--- a/civicrm/CRM/Campaign/Form/Task/Release.php
+++ b/civicrm/CRM/Campaign/Form/Task/Release.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Task/Reserve.php b/civicrm/CRM/Campaign/Form/Task/Reserve.php
index 6c7ebbe7be7b30894b9b4b17bdc999ada9737c7e..4d591dfe4a02fefe9b063dc9465469749f5a83c6 100644
--- a/civicrm/CRM/Campaign/Form/Task/Reserve.php
+++ b/civicrm/CRM/Campaign/Form/Task/Reserve.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Form/Task/Result.php b/civicrm/CRM/Campaign/Form/Task/Result.php
index 29a9a7e0afcb489ef02ffa39fe6377221a648ca1..76341640c4ef6a0ee3cc604a7c0a22cf831855a4 100644
--- a/civicrm/CRM/Campaign/Form/Task/Result.php
+++ b/civicrm/CRM/Campaign/Form/Task/Result.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Info.php b/civicrm/CRM/Campaign/Info.php
index d8d6f9159959e9b634a8477007fe9fea4ca05e50..85f5761664348973570efe99af0582757a7fcc3f 100644
--- a/civicrm/CRM/Campaign/Info.php
+++ b/civicrm/CRM/Campaign/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Page/AJAX.php b/civicrm/CRM/Campaign/Page/AJAX.php
index f1534cbefe58b5f63f5926b220d17a04beaf0f96..2de7235039378e5b620eb54ead04e804f729e5ab 100644
--- a/civicrm/CRM/Campaign/Page/AJAX.php
+++ b/civicrm/CRM/Campaign/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Page/DashBoard.php b/civicrm/CRM/Campaign/Page/DashBoard.php
index 0f179b6adccfb2c0e2c02f1130a55e832f5e35bc..e99dd4a47bf7762441631112f23062ee3a70e4e4 100644
--- a/civicrm/CRM/Campaign/Page/DashBoard.php
+++ b/civicrm/CRM/Campaign/Page/DashBoard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Page/Petition.php b/civicrm/CRM/Campaign/Page/Petition.php
index 41e115b455e73e97d949939ba78b0c1dbad4b602..41d3b4251c0f5e8d9a43c0ed3215d31c89d992b7 100644
--- a/civicrm/CRM/Campaign/Page/Petition.php
+++ b/civicrm/CRM/Campaign/Page/Petition.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Page/Petition/Confirm.php b/civicrm/CRM/Campaign/Page/Petition/Confirm.php
index 2fca570d41b2a34208c4df2ba0d7b42fd7d6cb8e..ea4c278570e39b85b462784d94aca6669945bcaf 100644
--- a/civicrm/CRM/Campaign/Page/Petition/Confirm.php
+++ b/civicrm/CRM/Campaign/Page/Petition/Confirm.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Page/Petition/ThankYou.php b/civicrm/CRM/Campaign/Page/Petition/ThankYou.php
index 8a8eea467246474a361b52cd08c78a25f4eecda4..71862e5b06db839791d97b7898958ac289468d06 100644
--- a/civicrm/CRM/Campaign/Page/Petition/ThankYou.php
+++ b/civicrm/CRM/Campaign/Page/Petition/ThankYou.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Page/SurveyType.php b/civicrm/CRM/Campaign/Page/SurveyType.php
index 0a15c6140f34f1d9414a2d4154eeb5a322729d71..d66d425c033ccc5828570de9535723d4d751e002 100644
--- a/civicrm/CRM/Campaign/Page/SurveyType.php
+++ b/civicrm/CRM/Campaign/Page/SurveyType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Page/Vote.php b/civicrm/CRM/Campaign/Page/Vote.php
index 449129372af71b6c1161299a2649a46c75516c07..0bbec6fcab12ccd82eb2465da486b40e8a360e38 100644
--- a/civicrm/CRM/Campaign/Page/Vote.php
+++ b/civicrm/CRM/Campaign/Page/Vote.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/PseudoConstant.php b/civicrm/CRM/Campaign/PseudoConstant.php
index fa7f4013480181ec882e2acdfa6a20d521ebe135..4b3adb74666c0fd44fecbaa62f671ca1c0ec6003 100644
--- a/civicrm/CRM/Campaign/PseudoConstant.php
+++ b/civicrm/CRM/Campaign/PseudoConstant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Selector/Search.php b/civicrm/CRM/Campaign/Selector/Search.php
index 0127fec731856512db49d995395ca60fe5fff346..6f7d3fccab94728bb7ef983e2af516e82d35a514 100644
--- a/civicrm/CRM/Campaign/Selector/Search.php
+++ b/civicrm/CRM/Campaign/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/StateMachine/Search.php b/civicrm/CRM/Campaign/StateMachine/Search.php
index 8f036637d29dd3042f813f9610a719051d6e5b8d..abc092b2d3e3879d648625629997a5ace129f948 100644
--- a/civicrm/CRM/Campaign/StateMachine/Search.php
+++ b/civicrm/CRM/Campaign/StateMachine/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Campaign/Task.php b/civicrm/CRM/Campaign/Task.php
index 13906d60302ba5e8d7021cfbf0fd93858ed232c9..b5f298d12a5a270bbe80d949ce78bd9a5d709c4e 100644
--- a/civicrm/CRM/Campaign/Task.php
+++ b/civicrm/CRM/Campaign/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/BAO/Case.php b/civicrm/CRM/Case/BAO/Case.php
index 91bebdf1235b16c38dd6200ab124754e5476c449..9602becaa7f54659b512d8a42ec1ef8571fd8e52 100644
--- a/civicrm/CRM/Case/BAO/Case.php
+++ b/civicrm/CRM/Case/BAO/Case.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -1127,10 +1127,10 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
}
if (!empty($dao->priority)) {
- if ($dao->priority == CRM_Core_OptionGroup::getValue('priority', 'Urgent', 'name')) {
+ if ($dao->priority == CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'priority_id', 'Urgent')) {
$caseActivity['DT_RowClass'] .= " priority-urgent ";
}
- elseif ($dao->priority == CRM_Core_OptionGroup::getValue('priority', 'Low', 'name')) {
+ elseif ($dao->priority == CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'priority_id', 'Low')) {
$caseActivity['DT_RowClass'] .= " priority-low ";
}
}
diff --git a/civicrm/CRM/Case/BAO/CaseContact.php b/civicrm/CRM/Case/BAO/CaseContact.php
index ab8d134ab88678cd04c256005f041bd44de401c7..df577aa4ab0832316b9864d6f31f820136427402 100644
--- a/civicrm/CRM/Case/BAO/CaseContact.php
+++ b/civicrm/CRM/Case/BAO/CaseContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/BAO/CaseType.php b/civicrm/CRM/Case/BAO/CaseType.php
index ee220afd200c94937026dae802d362eee6af3e2b..42cc1baedde825e5ec2075a6dc75f2b749780d04 100644
--- a/civicrm/CRM/Case/BAO/CaseType.php
+++ b/civicrm/CRM/Case/BAO/CaseType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/BAO/Query.php b/civicrm/CRM/Case/BAO/Query.php
index d9a45cc297ac3dcfc888668d8fc6ea085fc3010d..0a2bb282750fbcb65db5e190ac1b122d7f808361 100644
--- a/civicrm/CRM/Case/BAO/Query.php
+++ b/civicrm/CRM/Case/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Controller/Search.php b/civicrm/CRM/Case/Controller/Search.php
index 7481f1d53130114bc00d94fcae0919a6b672674b..1c7c4dfcb1ba14a129aefa664b1068a3d006a54b 100644
--- a/civicrm/CRM/Case/Controller/Search.php
+++ b/civicrm/CRM/Case/Controller/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Activity.php b/civicrm/CRM/Case/Form/Activity.php
index 852fed9e19cf0722feb43065774949a566b1d3cd..d39768a0aaa79658310b1be4f798f0e5b69a7933 100644
--- a/civicrm/CRM/Case/Form/Activity.php
+++ b/civicrm/CRM/Case/Form/Activity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php b/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php
index 14494ed04aee5d6b40545b31d79427c07ed6bc7d..3a798291bc2b9a286894317ea73586d826562a8b 100644
--- a/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php
+++ b/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -155,7 +155,7 @@ class CRM_Case_Form_Activity_ChangeCaseStartDate {
$params['status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_status_id', 'Completed');
$activity->status_id = $params['status_id'];
- $params['priority_id'] = CRM_Core_OptionGroup::getValue('priority', 'Normal', 'name');
+ $params['priority_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'priority_id', 'Normal');
$activity->priority_id = $params['priority_id'];
// 1. save activity subject with new start date
diff --git a/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php b/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
index bb0d603f5012d4b7f736e0ace226828642f9e6f4..c00901c9abc5dfe99d455b121d7d0b0a69ec4d0c 100644
--- a/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
+++ b/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -205,7 +205,7 @@ class CRM_Case_Form_Activity_ChangeCaseStatus {
}
$params['status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_status_id', 'Completed');
$activity->status_id = $params['status_id'];
- $params['priority_id'] = CRM_Core_OptionGroup::getValue('priority', 'Normal', 'name');
+ $params['priority_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'priority_id', 'Normal');
$activity->priority_id = $params['priority_id'];
foreach ($form->_oldCaseStatus as $statuskey => $statusval) {
diff --git a/civicrm/CRM/Case/Form/Activity/ChangeCaseType.php b/civicrm/CRM/Case/Form/Activity/ChangeCaseType.php
index ba3f46725d00a6c208c9ecb279912d56c74a6a03..ff2d192d5332f4a0378b83af77646cb5b018d664 100644
--- a/civicrm/CRM/Case/Form/Activity/ChangeCaseType.php
+++ b/civicrm/CRM/Case/Form/Activity/ChangeCaseType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -160,7 +160,7 @@ class CRM_Case_Form_Activity_ChangeCaseType {
$params['status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_status_id', 'Completed');
$activity->status_id = $params['status_id'];
- $params['priority_id'] = CRM_Core_OptionGroup::getValue('priority', 'Normal', 'name');
+ $params['priority_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'priority_id', 'Normal');
$activity->priority_id = $params['priority_id'];
if ($activity->subject == 'null') {
diff --git a/civicrm/CRM/Case/Form/Activity/LinkCases.php b/civicrm/CRM/Case/Form/Activity/LinkCases.php
index 967b6536eab93099f3a45d0f704f17e138985659..8967710d700cfd3fe456478d48387f5436aee70c 100644
--- a/civicrm/CRM/Case/Form/Activity/LinkCases.php
+++ b/civicrm/CRM/Case/Form/Activity/LinkCases.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Activity/OpenCase.php b/civicrm/CRM/Case/Form/Activity/OpenCase.php
index afd7ac218975d315e8928a3d09bd2c59bb55d71e..fe1cecef3e7eb3fb7f995b10e03b9f99ad93b7f5 100644
--- a/civicrm/CRM/Case/Form/Activity/OpenCase.php
+++ b/civicrm/CRM/Case/Form/Activity/OpenCase.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/ActivityToCase.php b/civicrm/CRM/Case/Form/ActivityToCase.php
index 87967baa63594ea048e8052539f2b8e7f92b317d..d69c1240710f243db487432dfece19f7adf5f113 100644
--- a/civicrm/CRM/Case/Form/ActivityToCase.php
+++ b/civicrm/CRM/Case/Form/ActivityToCase.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/ActivityView.php b/civicrm/CRM/Case/Form/ActivityView.php
index 9459d9c21cb95f3e5565c8b9af45fea6120853dd..e18b086d1909c3f95d3308e64ae819e365601045 100644
--- a/civicrm/CRM/Case/Form/ActivityView.php
+++ b/civicrm/CRM/Case/Form/ActivityView.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Case.php b/civicrm/CRM/Case/Form/Case.php
index 8b993f697e178b74ed5d85ee1e5ab453aa3ee5ba..5f59008df463f5ee90802b168b04d661c1384a68 100644
--- a/civicrm/CRM/Case/Form/Case.php
+++ b/civicrm/CRM/Case/Form/Case.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -204,9 +204,9 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
$this->assign('multiClient', $isMultiClient);
if ($this->_action & CRM_Core_Action::DELETE || $this->_action & CRM_Core_Action::RENEW) {
- $title = 'Delete';
+ $title = ts('Delete');
if ($this->_action & CRM_Core_Action::RENEW) {
- $title = 'Restore';
+ $title = ts('Restore');
}
$this->addButtons(array(
array(
diff --git a/civicrm/CRM/Case/Form/CaseView.php b/civicrm/CRM/Case/Form/CaseView.php
index d05d41cd4c63fea229cd36cbc766e9138d6a4fb1..3b5ae3167d7fd77eefa566cfaafdd97009f8554f 100644
--- a/civicrm/CRM/Case/Form/CaseView.php
+++ b/civicrm/CRM/Case/Form/CaseView.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/CustomData.php b/civicrm/CRM/Case/Form/CustomData.php
index 564a4e3889d6db1490ab727053795587a1c6fd1b..77aeb4195b2923b8af329ae104fd5461b2371050 100644
--- a/civicrm/CRM/Case/Form/CustomData.php
+++ b/civicrm/CRM/Case/Form/CustomData.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/EditClient.php b/civicrm/CRM/Case/Form/EditClient.php
index 1275e2f6864714304d51ff19284b6992f018ad5f..d0173e04b0bfbc99619d6c58d0825e9053bb82fb 100644
--- a/civicrm/CRM/Case/Form/EditClient.php
+++ b/civicrm/CRM/Case/Form/EditClient.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Report.php b/civicrm/CRM/Case/Form/Report.php
index 805b6f53692703c25310833438e46f867463c5aa..ef06a31fa9e2fe390667240cde57a7c8f943bba2 100644
--- a/civicrm/CRM/Case/Form/Report.php
+++ b/civicrm/CRM/Case/Form/Report.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Search.php b/civicrm/CRM/Case/Form/Search.php
index 3d728857476b62f56c5f1c38812ca88b5c82d555..3ca0ed0169100b1d0c409c22af538873d476aa4c 100644
--- a/civicrm/CRM/Case/Form/Search.php
+++ b/civicrm/CRM/Case/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -177,7 +177,7 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search {
$tasks = CRM_Case_Task::permissionedTaskTitles(CRM_Core_Permission::getPermission());
if (!empty($this->_formValues['case_deleted'])) {
- unset($tasks[CRM_Case_Task::DELETE]);
+ unset($tasks[CRM_Case_Task::TASK_DELETE]);
}
else {
unset($tasks[CRM_Case_Task::RESTORE_CASES]);
diff --git a/civicrm/CRM/Case/Form/Task.php b/civicrm/CRM/Case/Form/Task.php
index ddd733e9105e7c6b52cb6be6d3c9c11fb92c8988..b9d05e68758cb3a7419117fcbc53d5b20386617e 100644
--- a/civicrm/CRM/Case/Form/Task.php
+++ b/civicrm/CRM/Case/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Task/Batch.php b/civicrm/CRM/Case/Form/Task/Batch.php
index b2f0419c1a7597e7ed00d2f0fddbdcc2037dd984..30af5d38888ec0d5559d48d3e082f8f662174405 100644
--- a/civicrm/CRM/Case/Form/Task/Batch.php
+++ b/civicrm/CRM/Case/Form/Task/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -98,6 +98,9 @@ class CRM_Case_Form_Task_Batch extends CRM_Core_Form_Task_Batch {
);
}
//check for custom data
+ // @todo extract submit functions &
+ // extend CRM_Event_Form_Task_BatchTest::testSubmit with a data provider to test
+ // handling of custom data, specifically checkbox fields.
$value['custom'] = CRM_Core_BAO_CustomField::postProcess($params['field'][$key],
$key,
'Case',
diff --git a/civicrm/CRM/Case/Form/Task/Delete.php b/civicrm/CRM/Case/Form/Task/Delete.php
index bbd1e52b497f9f4564ee44cf410aa78c4d86dd5d..df6a109fadfb8a9da2cf2493199e336d95948004 100644
--- a/civicrm/CRM/Case/Form/Task/Delete.php
+++ b/civicrm/CRM/Case/Form/Task/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Task/PDF.php b/civicrm/CRM/Case/Form/Task/PDF.php
index 458a709a10ee0c2715bdd7fe8586c0f24fc10a4c..71aa8ff65616829f41b4bebae8373640d17d89c6 100644
--- a/civicrm/CRM/Case/Form/Task/PDF.php
+++ b/civicrm/CRM/Case/Form/Task/PDF.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -50,10 +50,10 @@ class CRM_Case_Form_Task_PDF extends CRM_Case_Form_Task {
* Build all the data structures needed to build the form.
*/
public function preProcess() {
+ CRM_Contact_Form_Task_PDFLetterCommon::preProcess($this);
$this->skipOnHold = $this->skipDeceased = FALSE;
parent::preProcess();
$this->setContactIDs();
- CRM_Contact_Form_Task_PDFLetterCommon::preProcess($this);
}
/**
diff --git a/civicrm/CRM/Case/Form/Task/PickProfile.php b/civicrm/CRM/Case/Form/Task/PickProfile.php
index 2b9888406ceaeef26e448fb8c46fc3108cd70176..a0f95a3ace67125cb144c1eb2de8bb9988c579c6 100644
--- a/civicrm/CRM/Case/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Case/Form/Task/PickProfile.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Task/Print.php b/civicrm/CRM/Case/Form/Task/Print.php
index 3ee84537e6afc2b0c7d40a86d15ffae587502406..0467597badbce96df7a0db241321590cd96035fa 100644
--- a/civicrm/CRM/Case/Form/Task/Print.php
+++ b/civicrm/CRM/Case/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Task/Restore.php b/civicrm/CRM/Case/Form/Task/Restore.php
index db18f093ba5aa6f69a6679f4909c60176b5e6b11..1e7509156a149cdc3f1d46ce9cd5926519fb89a2 100644
--- a/civicrm/CRM/Case/Form/Task/Restore.php
+++ b/civicrm/CRM/Case/Form/Task/Restore.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Task/Result.php b/civicrm/CRM/Case/Form/Task/Result.php
index 252862ed192ab6ffdc96a88325a27c4360fe78bd..0a1b09781c28d13b765662e85ec6cda1878475d3 100644
--- a/civicrm/CRM/Case/Form/Task/Result.php
+++ b/civicrm/CRM/Case/Form/Task/Result.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Case/Form/Task/SearchTaskHookSample.php
index 443eb9d5ba3d79cb9bfc4781128e0bca1ac9b2bc..0cb7f7ac6782f406721842b18285f402abf49090 100644
--- a/civicrm/CRM/Case/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Case/Form/Task/SearchTaskHookSample.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Info.php b/civicrm/CRM/Case/Info.php
index b69f9ffac0e08665bd91fc5f2f1e05f2f440efcf..259a53091137185618dbfc842c8621d463913b95 100644
--- a/civicrm/CRM/Case/Info.php
+++ b/civicrm/CRM/Case/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Page/AJAX.php b/civicrm/CRM/Case/Page/AJAX.php
index 67668647b5f682b13add218958ab8ee517f2710f..bc09f142f0a41f3dca0522b710a7df30985586bb 100644
--- a/civicrm/CRM/Case/Page/AJAX.php
+++ b/civicrm/CRM/Case/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -191,8 +191,8 @@ class CRM_Case_Page_AJAX {
'type' => 'String',
);
$optionalParameters = array(
- 'case_type_id' => 'String',
- 'status_id' => 'String',
+ 'case_type_id' => 'CommaSeparatedIntegers',
+ 'status_id' => 'CommaSeparatedIntegers',
'all' => 'Positive',
);
$params = CRM_Core_Page_AJAX::defaultSortAndPagerParams();
diff --git a/civicrm/CRM/Case/Page/CaseDetails.php b/civicrm/CRM/Case/Page/CaseDetails.php
index 036324c4e745ea154ebc29a4907ecaba057d885d..bc8ef05969822309cb0bfefaaffdd77a2d8bb4bd 100644
--- a/civicrm/CRM/Case/Page/CaseDetails.php
+++ b/civicrm/CRM/Case/Page/CaseDetails.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Page/DashBoard.php b/civicrm/CRM/Case/Page/DashBoard.php
index 65ad071648cc46ab5363998927f38cf681b51a76..b7e8ba2f8b295d11c402c95f538e73b3df1813db 100644
--- a/civicrm/CRM/Case/Page/DashBoard.php
+++ b/civicrm/CRM/Case/Page/DashBoard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Page/Tab.php b/civicrm/CRM/Case/Page/Tab.php
index 39bd1148b229536c67c1f4d9a746c351eb71b371..52d84e8c768d0357df5005b62361a7e10348f074 100644
--- a/civicrm/CRM/Case/Page/Tab.php
+++ b/civicrm/CRM/Case/Page/Tab.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/PseudoConstant.php b/civicrm/CRM/Case/PseudoConstant.php
index d429fca867944afd9b81bb217d7e37152b17654d..0947aaabda5f34e89a45c42dcb7f1796583f0dc9 100644
--- a/civicrm/CRM/Case/PseudoConstant.php
+++ b/civicrm/CRM/Case/PseudoConstant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Selector/Search.php b/civicrm/CRM/Case/Selector/Search.php
index 8c175ef8f7114d74b10b594fb1f96f7d249c905c..ca81e1c1402594ea50033a966a809a38e580f958 100644
--- a/civicrm/CRM/Case/Selector/Search.php
+++ b/civicrm/CRM/Case/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/StateMachine/Search.php b/civicrm/CRM/Case/StateMachine/Search.php
index 85028cfa31d4519b4e20fc0d52f63e892d642566..c1fa215a6264f1baa8b416f1582038ad5098320e 100644
--- a/civicrm/CRM/Case/StateMachine/Search.php
+++ b/civicrm/CRM/Case/StateMachine/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/Task.php b/civicrm/CRM/Case/Task.php
index 1d317542f32281e8be2d13a37a1abe5c8598ea33..956ff16662ed15480baba932c8aebb4badb1d1dd 100644
--- a/civicrm/CRM/Case/Task.php
+++ b/civicrm/CRM/Case/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/XMLProcessor.php b/civicrm/CRM/Case/XMLProcessor.php
index 20eacf8254439039d2d8b20ad20f616f7c1b443b..9659165e438ea0f58bc8ffeb9f58eaba3f7294a3 100644
--- a/civicrm/CRM/Case/XMLProcessor.php
+++ b/civicrm/CRM/Case/XMLProcessor.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/XMLProcessor/Process.php b/civicrm/CRM/Case/XMLProcessor/Process.php
index 15d56f0a64188a20b23a3a8848a64f5e19f4e34e..f125355ec9367e5095d043fabb6206c193f1139c 100644
--- a/civicrm/CRM/Case/XMLProcessor/Process.php
+++ b/civicrm/CRM/Case/XMLProcessor/Process.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/XMLProcessor/Report.php b/civicrm/CRM/Case/XMLProcessor/Report.php
index 70e449f53d6193fffc3b50de3f0c3466abcfcb4d..85e216c2e74d910d83e24ea10d24e7669f0e6f29 100644
--- a/civicrm/CRM/Case/XMLProcessor/Report.php
+++ b/civicrm/CRM/Case/XMLProcessor/Report.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/XMLProcessor/Settings.php b/civicrm/CRM/Case/XMLProcessor/Settings.php
index a49c41de46d4a9fce4af08365b1e0e4d9211e4c6..4d3ff033cbd87a45b177e88cb13fb40637d07813 100644
--- a/civicrm/CRM/Case/XMLProcessor/Settings.php
+++ b/civicrm/CRM/Case/XMLProcessor/Settings.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Case/XMLRepository.php b/civicrm/CRM/Case/XMLRepository.php
index 3f427faa54a7c765ce144173270c26d30f62b00e..ad088e8223e329a84c20bddb0e640cc788628b0c 100644
--- a/civicrm/CRM/Case/XMLRepository.php
+++ b/civicrm/CRM/Case/XMLRepository.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/ActionMapping.php b/civicrm/CRM/Contact/ActionMapping.php
index 49389dc8f6ff04afd55b7912c5bf7c564bd167fe..75ac0d489651148157592057c958043d5784cb0b 100644
--- a/civicrm/CRM/Contact/ActionMapping.php
+++ b/civicrm/CRM/Contact/ActionMapping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/Contact.php b/civicrm/CRM/Contact/BAO/Contact.php
index 51e8f498b2d1c71600cc745684e93a7694d609fa..9c95a6894a485cad6824feebbd799787ac009abd 100644
--- a/civicrm/CRM/Contact/BAO/Contact.php
+++ b/civicrm/CRM/Contact/BAO/Contact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -652,6 +652,27 @@ WHERE civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer');
return NULL;
}
+ /**
+ * Get the relevant location entity for the array key.
+ *
+ * Based on the field name we determine which location entity
+ * we are dealing with. Apart from a few specific ones they
+ * are mostly 'address' (the default).
+ *
+ * @param string $fieldName
+ *
+ * @return string
+ */
+ protected static function getLocationEntityForKey($fieldName) {
+ if (in_array($fieldName, ['email', 'phone', 'im', 'openid'])) {
+ return $fieldName;
+ }
+ if ($fieldName === 'phone_ext') {
+ return 'phone';
+ }
+ return 'address';
+ }
+
/**
* Create last viewed link to recently updated contact.
*
@@ -2181,7 +2202,7 @@ ORDER BY civicrm_email.is_primary DESC";
$loc = CRM_Utils_Array::key($index, $locationType);
- $blockName = in_array($fieldName, $blocks) ? $fieldName : 'address';
+ $blockName = self::getLocationEntityForKey($fieldName);
$data[$blockName][$loc]['location_type_id'] = $locTypeId;
@@ -2219,9 +2240,6 @@ ORDER BY civicrm_email.is_primary DESC";
unset($data['phone'][$loc]['is_primary']);
}
}
- elseif ($fieldName == 'phone_ext') {
- $data['phone'][$loc]['phone_ext'] = $value;
- }
elseif ($fieldName == 'email') {
$data['email'][$loc]['email'] = $value;
if (empty($contactID)) {
@@ -2278,7 +2296,7 @@ ORDER BY civicrm_email.is_primary DESC";
$data['address'][$loc][substr($fieldName, 8)] = $value;
}
else {
- $data['address'][$loc][$fieldName] = $value;
+ $data[$blockName][$loc][$fieldName] = $value;
}
}
}
diff --git a/civicrm/CRM/Contact/BAO/Contact/Location.php b/civicrm/CRM/Contact/BAO/Contact/Location.php
index dd3b6e5d99f35f8c1258b32192a883988b1349b7..a25cad27f89c7b9c69fa8ac7c375a139652b4580 100644
--- a/civicrm/CRM/Contact/BAO/Contact/Location.php
+++ b/civicrm/CRM/Contact/BAO/Contact/Location.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/Contact/Permission.php b/civicrm/CRM/Contact/BAO/Contact/Permission.php
index 3333dfb1d5d5859f806bfee7a884ce2efaa5db21..09b8925ede78a3255e54b503a77629f68f06f8f1 100644
--- a/civicrm/CRM/Contact/BAO/Contact/Permission.php
+++ b/civicrm/CRM/Contact/BAO/Contact/Permission.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/Contact/Utils.php b/civicrm/CRM/Contact/BAO/Contact/Utils.php
index a650d7608798d773b7803a022a9cae0aad96a3b5..f3b391362afdd66216f7449110c66723b74003c1 100644
--- a/civicrm/CRM/Contact/BAO/Contact/Utils.php
+++ b/civicrm/CRM/Contact/BAO/Contact/Utils.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/ContactType.php b/civicrm/CRM/Contact/BAO/ContactType.php
index ff82069ebd9d09a73cc6c90bb9dca94a7a572987..a299e9e59115790e58d3211a55e89f39fa009794 100644
--- a/civicrm/CRM/Contact/BAO/ContactType.php
+++ b/civicrm/CRM/Contact/BAO/ContactType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/DashboardContact.php b/civicrm/CRM/Contact/BAO/DashboardContact.php
index a742f3d6905b0e32a579e8fbd77dd98af765b732..8fc3f230f007dc62db95d3763a6de8ec6e1ed6e6 100644
--- a/civicrm/CRM/Contact/BAO/DashboardContact.php
+++ b/civicrm/CRM/Contact/BAO/DashboardContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/Group.php b/civicrm/CRM/Contact/BAO/Group.php
index c7582d99feae7cfe2678afbbe7047c326786e231..2c0206878a672877ca098a5a2b089c9d6c2f97ce 100644
--- a/civicrm/CRM/Contact/BAO/Group.php
+++ b/civicrm/CRM/Contact/BAO/Group.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/GroupContact.php b/civicrm/CRM/Contact/BAO/GroupContact.php
index f867c0cd05f574d577c851a6f1d14f4802c6aec3..3ac3b2b0eb1986ed3af59eff947021ce5a1b7813 100644
--- a/civicrm/CRM/Contact/BAO/GroupContact.php
+++ b/civicrm/CRM/Contact/BAO/GroupContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/GroupContactCache.php b/civicrm/CRM/Contact/BAO/GroupContactCache.php
index 9e8d6e5fe24ca92dda0a409e823ed1b578676e78..89e42a1e009fdf2dfc529ef2f52cb9aa78ee60bf 100644
--- a/civicrm/CRM/Contact/BAO/GroupContactCache.php
+++ b/civicrm/CRM/Contact/BAO/GroupContactCache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/GroupNesting.php b/civicrm/CRM/Contact/BAO/GroupNesting.php
index f51e164af60f096aaa585f0dd34e188d68a9971b..615b9a0e97dba182d12410ff724b8fb8f65da72c 100644
--- a/civicrm/CRM/Contact/BAO/GroupNesting.php
+++ b/civicrm/CRM/Contact/BAO/GroupNesting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright U.S. PIRG Education Fund (c) 2007 |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Contact/BAO/GroupNestingCache.php b/civicrm/CRM/Contact/BAO/GroupNestingCache.php
index 4c7d284d881311cc371245614f4577f32174a264..03d4eceee6e258030093cd58f009a763733928a0 100644
--- a/civicrm/CRM/Contact/BAO/GroupNestingCache.php
+++ b/civicrm/CRM/Contact/BAO/GroupNestingCache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/GroupOrganization.php b/civicrm/CRM/Contact/BAO/GroupOrganization.php
index d708497c94b170931a948af1d5f43852d8cae66a..2c0b92f5398afa176c0e384b88ec074c1c34fad3 100644
--- a/civicrm/CRM/Contact/BAO/GroupOrganization.php
+++ b/civicrm/CRM/Contact/BAO/GroupOrganization.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/Household.php b/civicrm/CRM/Contact/BAO/Household.php
index 7c0a29841c406ec386ebc1cd123bde44a3320771..c042ce11c26c224789cbd49414389cbb0bc4af26 100644
--- a/civicrm/CRM/Contact/BAO/Household.php
+++ b/civicrm/CRM/Contact/BAO/Household.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/Individual.php b/civicrm/CRM/Contact/BAO/Individual.php
index ed7d784c84bdd7fa88183ce755bda81a0d4d834b..f82112f323f28d929208f7a53bae427b9b1a8f14 100644
--- a/civicrm/CRM/Contact/BAO/Individual.php
+++ b/civicrm/CRM/Contact/BAO/Individual.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/ProximityQuery.php b/civicrm/CRM/Contact/BAO/ProximityQuery.php
index 73e12f9530d907fd4844495e2b6f737c9dbd1bf4..c3c235734cb2d35c22f834bd8944187a6eec6f5b 100644
--- a/civicrm/CRM/Contact/BAO/ProximityQuery.php
+++ b/civicrm/CRM/Contact/BAO/ProximityQuery.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/Query.php b/civicrm/CRM/Contact/BAO/Query.php
index fc51c8e4c72782e5cde397165b2ee1849e261c5c..81a191cfa362a059a6bc0b5b8879a8f43cb2a5f7 100644
--- a/civicrm/CRM/Contact/BAO/Query.php
+++ b/civicrm/CRM/Contact/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -4734,14 +4734,14 @@ civicrm_relationship.is_permission_a_b = 0
* on full_group_by mode, then append the those missing columns to GROUP BY clause
* keyword to select fields not present in groupBy
*
- * @param string $groupBy - GROUP BY clause where missing ORDER BY columns will be appended
+ * @param string $groupBy - GROUP BY clause where missing ORDER BY columns will be appended if not present
* @param array $orderBys - ORDER BY sub-clauses
*
*/
public static function getGroupByFromOrderBy(&$groupBy, $orderBys) {
if (!CRM_Utils_SQL::disableFullGroupByMode()) {
foreach ($orderBys as $orderBy) {
- $orderBy = str_replace(array(' DESC', ' ASC', '`'), '', $orderBy); // remove sort syntax from ORDER BY clauses if present
+ $orderBy = str_ireplace(array(' DESC', ' ASC', '`'), '', $orderBy); // remove sort syntax from ORDER BY clauses if present
// if ORDER BY column is not present in GROUP BY then append it to end
if (preg_match('/(MAX|MIN)\(/i', trim($orderBy)) !== 1 && !strstr($groupBy, $orderBy)) {
$groupBy .= ", {$orderBy}";
@@ -4841,13 +4841,6 @@ civicrm_relationship.is_permission_a_b = 0
$additionalFromClause = NULL, $skipOrderAndLimit = FALSE
) {
- // In this case we are expecting the search query to return all the first single letter characters of contacts ONLY,
- // but when FGB (FULL_GROUP_BY_MODE) is enabled MySQL expect the columns present in GROUP BY must be present in SELECT clause
- // and that results into error and needless to have other columns. In order to resolve this disable FGB to fulfill both the cases
- if ($sortByChar) {
- CRM_Core_DAO::disableFullGroupByMode();
- }
-
if ($includeContactIds) {
$this->_includeContactIds = TRUE;
$this->_whereClause = $this->whereClause();
@@ -4895,6 +4888,16 @@ civicrm_relationship.is_permission_a_b = 0
$limit = " LIMIT $offset, $rowCount ";
}
}
+ // Two cases where we are disabling FGB (FULL_GROUP_BY_MODE):
+ // 1. Expecting the search query to return all the first single letter characters of contacts ONLY, but when FGB is enabled
+ // MySQL expect the columns present in GROUP BY, must be present in SELECT clause and that results into error, needless to have other columns.
+ // 2. When GROUP BY columns are present then disable FGB otherwise it demands to add ORDER BY columns in GROUP BY and eventually in SELECT
+ // clause. This will impact the search query output.
+ $disableFullGroupByMode = ($sortByChar || !empty($groupByCols));
+
+ if ($disableFullGroupByMode) {
+ CRM_Core_DAO::disableFullGroupByMode();
+ }
// CRM-15231
$this->_sort = $sort;
@@ -4905,16 +4908,7 @@ civicrm_relationship.is_permission_a_b = 0
list($select, $from, $where, $having) = $this->query($count, $sortByChar, $groupContacts, $onlyDeleted);
if (!empty($groupByCols)) {
- // It doesn't matter to include columns in SELECT clause, which are present in GROUP BY when we just want the contact IDs
- if (!$groupContacts && !$sortByChar) {
- $select = self::appendAnyValueToSelect($this->_select, $groupByCols, 'GROUP_CONCAT');
- }
$groupBy = " GROUP BY " . implode(', ', $groupByCols);
- if (!empty($order)) {
- // retrieve order by columns from ORDER BY clause
- $orderBys = explode(",", str_replace('ORDER BY ', '', $order));
- self::getGroupByFromOrderBy($groupBy, $orderBys);
- }
}
if ($additionalWhereClause) {
@@ -4948,7 +4942,7 @@ civicrm_relationship.is_permission_a_b = 0
$dao = CRM_Core_DAO::executeQuery($query);
- if ($sortByChar) {
+ if ($disableFullGroupByMode) {
CRM_Core_DAO::reenableFullGroupByMode();
}
diff --git a/civicrm/CRM/Contact/BAO/Query/Hook.php b/civicrm/CRM/Contact/BAO/Query/Hook.php
index 2642d59e85d882360ff265bac922078d66d6b16b..4cfa1dc9b48f567efb98abab8c002dabcd9c23ce 100644
--- a/civicrm/CRM/Contact/BAO/Query/Hook.php
+++ b/civicrm/CRM/Contact/BAO/Query/Hook.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/Query/Interface.php b/civicrm/CRM/Contact/BAO/Query/Interface.php
index ffd1206d3e434c12c8d46b37158bf987116bb094..7770768f91187c8e661a3897379ce8b23c449148 100644
--- a/civicrm/CRM/Contact/BAO/Query/Interface.php
+++ b/civicrm/CRM/Contact/BAO/Query/Interface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/Relationship.php b/civicrm/CRM/Contact/BAO/Relationship.php
index 29a2f7adebb231d7bd857344ee96b3d7de59f0f3..000987cea66f0bf8515c337d1e6cd41ac0003e59 100644
--- a/civicrm/CRM/Contact/BAO/Relationship.php
+++ b/civicrm/CRM/Contact/BAO/Relationship.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -539,7 +539,7 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship {
$relationship->id = $relationshipId;
if ($relationship->find(TRUE)) {
$contact = new CRM_Contact_DAO_Contact();
- $contact->id = ($relationship->contact_id_a === $contactId) ? $relationship->contact_id_b : $relationship->contact_id_a;
+ $contact->id = ($relationship->contact_id_a == $contactId) ? $relationship->contact_id_b : $relationship->contact_id_a;
if ($contact->find(TRUE)) {
$otherContactType = $contact->contact_type;
@@ -2149,4 +2149,73 @@ AND cc.sort_name LIKE '%$name%'";
return $relationshipsDT;
}
+ /**
+ * @inheritdoc
+ */
+ public static function buildOptions($fieldName, $context = NULL, $props = array()) {
+ if ($fieldName === 'relationship_type_id') {
+ return self::buildRelationshipTypeOptions($props);
+ }
+
+ return parent::buildOptions($fieldName, $context, $props);
+ }
+
+ /**
+ * Builds a list of options available for relationship types
+ *
+ * @param array $params
+ * - contact_type: Limits by contact type on the "A" side
+ * - relationship_id: Used to find the value for contact type for "B" side.
+ * If contact_a matches provided contact_id then type of contact_b will
+ * be used. Otherwise uses type of contact_a. Must be used with contact_id
+ * - contact_id: Limits by contact types of this contact on the "A" side
+ * - is_form: Returns array with keys indexed for use in a quickform
+ * - relationship_direction: For relationship types with duplicate names
+ * on both sides, defines which option should be returned, a_b or b_a
+ *
+ * @return array
+ */
+ public static function buildRelationshipTypeOptions($params = array()) {
+ $contactId = CRM_Utils_Array::value('contact_id', $params);
+ $direction = CRM_Utils_Array::value('relationship_direction', $params, 'a_b');
+ $relationshipId = CRM_Utils_Array::value('relationship_id', $params);
+ $contactType = CRM_Utils_Array::value('contact_type', $params);
+ $isForm = CRM_Utils_Array::value('is_form', $params);
+ $showAll = FALSE;
+
+ // getContactRelationshipType will return an empty set if these are not set
+ if (!$contactId && !$relationshipId && !$contactType) {
+ $showAll = TRUE;
+ }
+
+ $labels = self::getContactRelationshipType(
+ $contactId,
+ $direction,
+ $relationshipId,
+ $contactType,
+ $showAll,
+ 'label'
+ );
+
+ if ($isForm) {
+ return $labels;
+ }
+
+ $names = self::getContactRelationshipType(
+ $contactId,
+ $direction,
+ $relationshipId,
+ $contactType,
+ $showAll,
+ 'name'
+ );
+
+ // ensure $names contains only entries in $labels
+ $names = array_intersect_key($names, $labels);
+
+ $nameToLabels = array_combine($names, $labels);
+
+ return $nameToLabels;
+ }
+
}
diff --git a/civicrm/CRM/Contact/BAO/RelationshipType.php b/civicrm/CRM/Contact/BAO/RelationshipType.php
index 656e27f62efee53a02631ed0296126efd93a5416..55e32582ff55d1cabff8f0c9803338754c3a1e12 100644
--- a/civicrm/CRM/Contact/BAO/RelationshipType.php
+++ b/civicrm/CRM/Contact/BAO/RelationshipType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -79,26 +79,20 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType
* Add the relationship type in the db.
*
* @param array $params
- * (reference ) an assoc array of name/value pairs.
- * @param array $ids
- * The array that holds all the db ids.
*
* @return CRM_Contact_DAO_RelationshipType
*/
- public static function add(&$params, $ids = []) {
- $params['id'] = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('relationshipType', $ids));
- //to change name, CRM-3336
- if (empty($params['label_a_b']) && !empty($params['name_a_b'])) {
- $params['label_a_b'] = $params['name_a_b'];
- }
-
- if (empty($params['label_b_a']) && !empty($params['name_b_a'])) {
- $params['label_b_a'] = $params['name_b_a'];
- }
+ public static function add($params) {
+ if (empty($params['id'])) {
+ // Set name to label if not set
+ if (empty($params['label_a_b']) && !empty($params['name_a_b'])) {
+ $params['label_a_b'] = $params['name_a_b'];
+ }
+ if (empty($params['label_b_a']) && !empty($params['name_b_a'])) {
+ $params['label_b_a'] = $params['name_b_a'];
+ }
- // set label to name if it's not set - but *only* for
- // ADD action. CRM-3336 as part from (CRM-3522)
- if (!$params['id']) {
+ // set label to name if it's not set
if (empty($params['name_a_b']) && !empty($params['label_a_b'])) {
$params['name_a_b'] = $params['label_a_b'];
}
@@ -110,22 +104,18 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType
// action is taken depending upon the mode
$relationshipType = new CRM_Contact_DAO_RelationshipType();
- $relationshipType->copyValues($params);
+ $hook = empty($params['id']) ? 'create' : 'edit';
+ CRM_Utils_Hook::pre($hook, 'RelationshipType', CRM_Utils_Array::value('id', $params), $params);
- // if label B to A is blank, insert the value label A to B for it
- if (!strlen(trim($strName = CRM_Utils_Array::value('name_b_a', $params)))) {
- $relationshipType->name_b_a = CRM_Utils_Array::value('name_a_b', $params);
- }
- if (!strlen(trim($strName = CRM_Utils_Array::value('label_b_a', $params)))) {
- $relationshipType->label_b_a = CRM_Utils_Array::value('label_a_b', $params);
- }
+ $relationshipType->copyValues($params);
+ $relationshipType->save();
- $result = $relationshipType->save();
+ CRM_Utils_Hook::post($hook, 'RelationshipType', $relationshipType->id, $relationshipType);
CRM_Core_PseudoConstant::relationshipType('label', TRUE);
CRM_Core_PseudoConstant::relationshipType('name', TRUE);
CRM_Case_XMLProcessor::flushStaticCaches();
- return $result;
+ return $relationshipType;
}
/**
diff --git a/civicrm/CRM/Contact/BAO/SavedSearch.php b/civicrm/CRM/Contact/BAO/SavedSearch.php
index af2b0a87cf418a7b52bb2b1ee0f222834af9ff53..da2b6fd9467166838a76efdbb44618a16fb0df8b 100644
--- a/civicrm/CRM/Contact/BAO/SavedSearch.php
+++ b/civicrm/CRM/Contact/BAO/SavedSearch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/SearchCustom.php b/civicrm/CRM/Contact/BAO/SearchCustom.php
index 0cc38ed46cb591bb1192580359c8bf9b0420a48c..d9fa0c5ef644c9e745febc41d0f5c9d4514561ab 100644
--- a/civicrm/CRM/Contact/BAO/SearchCustom.php
+++ b/civicrm/CRM/Contact/BAO/SearchCustom.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/BAO/SubscriptionHistory.php b/civicrm/CRM/Contact/BAO/SubscriptionHistory.php
index c99b2d7429bc39fd627c240d7751159c344dcd9d..184afa5dcaf963f1e326a8f7b2d86321150cf4fd 100644
--- a/civicrm/CRM/Contact/BAO/SubscriptionHistory.php
+++ b/civicrm/CRM/Contact/BAO/SubscriptionHistory.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Controller/Search.php b/civicrm/CRM/Contact/Controller/Search.php
index daa7dde585b601bb12dfafb060b7cb6d3583b6d4..f7598f33dfff3925a84ffe14da57b59c5dea0874 100644
--- a/civicrm/CRM/Contact/Controller/Search.php
+++ b/civicrm/CRM/Contact/Controller/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Contact.php b/civicrm/CRM/Contact/Form/Contact.php
index 375d18a66522bbde61652b8869c2b0f5afa7e4b3..9f5db2222f253ccf61ea6048909b5aec1e125715 100644
--- a/civicrm/CRM/Contact/Form/Contact.php
+++ b/civicrm/CRM/Contact/Form/Contact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/CustomData.php b/civicrm/CRM/Contact/Form/CustomData.php
index 4698051528025f835d36cf836c1ef41bbe19667c..0132480bc90a39b06f445d8aad30b401d0943c04 100644
--- a/civicrm/CRM/Contact/Form/CustomData.php
+++ b/civicrm/CRM/Contact/Form/CustomData.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/DedupeFind.php b/civicrm/CRM/Contact/Form/DedupeFind.php
index f261fccc7522f0ed8d3e38d8410092084754d67e..1308bccf64cfa6f918b2911e7622111246ec5001 100644
--- a/civicrm/CRM/Contact/Form/DedupeFind.php
+++ b/civicrm/CRM/Contact/Form/DedupeFind.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/DedupeRules.php b/civicrm/CRM/Contact/Form/DedupeRules.php
index 0770a1e0c28421051f7c65b7e440d9a9eb658cc2..4d9c457c642e73c225868eb121738a47e43cdee5 100644
--- a/civicrm/CRM/Contact/Form/DedupeRules.php
+++ b/civicrm/CRM/Contact/Form/DedupeRules.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Domain.php b/civicrm/CRM/Contact/Form/Domain.php
index 558ce38d2503c39198edc71fe615105d4a969892..774d17bc8c42a25e66d0abfeded42b8b64940a0e 100644
--- a/civicrm/CRM/Contact/Form/Domain.php
+++ b/civicrm/CRM/Contact/Form/Domain.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Address.php b/civicrm/CRM/Contact/Form/Edit/Address.php
index 366d02ba44ac3b88eee12a8d0541ee51b6a3e2c8..027fbe253ff016f7e5d145faa5201b2b5b8a66d9 100644
--- a/civicrm/CRM/Contact/Form/Edit/Address.php
+++ b/civicrm/CRM/Contact/Form/Edit/Address.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -158,56 +158,7 @@ class CRM_Contact_Form_Edit_Address {
}
$form->assign('geoCode', $geoCode);
- // Process any address custom data -
- $groupTree = CRM_Core_BAO_CustomGroup::getTree('Address', NULL, $entityId);
-
- if (isset($groupTree) && is_array($groupTree)) {
- // use simplified formatted groupTree
- $groupTree = CRM_Core_BAO_CustomGroup::formatGroupTree($groupTree, 1, $form);
-
- // make sure custom fields are added /w element-name in the format - 'address[$blockId][custom-X]'
- foreach ($groupTree as $id => $group) {
- foreach ($group['fields'] as $fldId => $field) {
- $groupTree[$id]['fields'][$fldId]['element_custom_name'] = $field['element_name'];
- $groupTree[$id]['fields'][$fldId]['element_name'] = "address[$blockId][{$field['element_name']}]";
- }
- }
-
- $defaults = array();
- CRM_Core_BAO_CustomGroup::setDefaults($groupTree, $defaults);
-
- // since we change element name for address custom data, we need to format the setdefault values
- $addressDefaults = array();
- foreach ($defaults as $key => $val) {
- if (empty($val)) {
- continue;
- }
-
- // inorder to set correct defaults for checkbox custom data, we need to converted flat key to array
- // this works for all types custom data
- $keyValues = explode('[', str_replace(']', '', $key));
- $addressDefaults[$keyValues[0]][$keyValues[1]][$keyValues[2]] = $val;
- }
-
- $form->setDefaults($addressDefaults);
-
- // we setting the prefix to 'dnc_' below, so that we don't overwrite smarty's grouptree var.
- // And we can't set it to 'address_' because we want to set it in a slightly different format.
- CRM_Core_BAO_CustomGroup::buildQuickForm($form, $groupTree, FALSE, 'dnc_');
-
- // during contact editing : if no address is filled
- // required custom data must not produce 'required' form rule error
- // more handling done in formRule func
- CRM_Contact_Form_Edit_Address::storeRequiredCustomDataInfo($form, $groupTree);
-
- $tplGroupTree = CRM_Core_Smarty::singleton()->get_template_vars('address_groupTree');
- $tplGroupTree = empty($tplGroupTree) ? array() : $tplGroupTree;
-
- $form->assign('address_groupTree', $tplGroupTree + array($blockId => $groupTree));
- // unset the temp smarty var that got created
- $form->assign('dnc_groupTree', NULL);
- }
- // address custom data processing ends ..
+ self::addCustomDataToForm($form, $entityId, $blockId);
if ($sharing) {
// shared address
@@ -434,4 +385,64 @@ class CRM_Contact_Form_Edit_Address {
}
}
+ /**
+ * Add custom data to the form.
+ *
+ * @param CRM_Core_Form $form
+ * @param int $entityId
+ * @param int $blockId
+ */
+ protected static function addCustomDataToForm(&$form, $entityId, $blockId) {
+ $groupTree = CRM_Core_BAO_CustomGroup::getTree('Address', NULL, $entityId);
+
+ if (isset($groupTree) && is_array($groupTree)) {
+ // use simplified formatted groupTree
+ $groupTree = CRM_Core_BAO_CustomGroup::formatGroupTree($groupTree, 1, $form);
+
+ // make sure custom fields are added /w element-name in the format - 'address[$blockId][custom-X]'
+ foreach ($groupTree as $id => $group) {
+ foreach ($group['fields'] as $fldId => $field) {
+ $groupTree[$id]['fields'][$fldId]['element_custom_name'] = $field['element_name'];
+ $groupTree[$id]['fields'][$fldId]['element_name'] = "address[$blockId][{$field['element_name']}]";
+ }
+ }
+
+ $defaults = array();
+ CRM_Core_BAO_CustomGroup::setDefaults($groupTree, $defaults);
+
+ // since we change element name for address custom data, we need to format the setdefault values
+ $addressDefaults = array();
+ foreach ($defaults as $key => $val) {
+ if (empty($val)) {
+ continue;
+ }
+
+ // inorder to set correct defaults for checkbox custom data, we need to converted flat key to array
+ // this works for all types custom data
+ $keyValues = explode('[', str_replace(']', '', $key));
+ $addressDefaults[$keyValues[0]][$keyValues[1]][$keyValues[2]] = $val;
+ }
+
+ $form->setDefaults($addressDefaults);
+
+ // we setting the prefix to 'dnc_' below, so that we don't overwrite smarty's grouptree var.
+ // And we can't set it to 'address_' because we want to set it in a slightly different format.
+ CRM_Core_BAO_CustomGroup::buildQuickForm($form, $groupTree, FALSE, 'dnc_');
+
+ // during contact editing : if no address is filled
+ // required custom data must not produce 'required' form rule error
+ // more handling done in formRule func
+ CRM_Contact_Form_Edit_Address::storeRequiredCustomDataInfo($form, $groupTree);
+
+ $tplGroupTree = CRM_Core_Smarty::singleton()
+ ->get_template_vars('address_groupTree');
+ $tplGroupTree = empty($tplGroupTree) ? array() : $tplGroupTree;
+
+ $form->assign('address_groupTree', $tplGroupTree + array($blockId => $groupTree));
+ // unset the temp smarty var that got created
+ $form->assign('dnc_groupTree', NULL);
+ }
+ // address custom data processing ends ..
+ }
+
}
diff --git a/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php b/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php
index d62bcb8025046139805d6f62baa9c331be18def0..02b3620b5530bdb62f4af81c9e876ede1c1a93ac 100644
--- a/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php
+++ b/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/CustomData.php b/civicrm/CRM/Contact/Form/Edit/CustomData.php
index 6893168cb695fa43bc672b5a0a957823064e950d..11e8eda2d2d22d109b6fa06886bc65282a7a7900 100644
--- a/civicrm/CRM/Contact/Form/Edit/CustomData.php
+++ b/civicrm/CRM/Contact/Form/Edit/CustomData.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Demographics.php b/civicrm/CRM/Contact/Form/Edit/Demographics.php
index fe6dba816eb13953b1dbd1a617fc6fe662d90639..43d195794dc523bf4166f4872f0cf0093941ab7d 100644
--- a/civicrm/CRM/Contact/Form/Edit/Demographics.php
+++ b/civicrm/CRM/Contact/Form/Edit/Demographics.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Email.php b/civicrm/CRM/Contact/Form/Edit/Email.php
index cc15d8f7abbb7814ed9f4e81d3408c9cf7046b46..489f5e7b326726a7cbc353b30495b2804fb9742a 100644
--- a/civicrm/CRM/Contact/Form/Edit/Email.php
+++ b/civicrm/CRM/Contact/Form/Edit/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Household.php b/civicrm/CRM/Contact/Form/Edit/Household.php
index 678b40d42bd5d02ccc44c2512725eca5e45fa039..98f70a3197b9b7dc71b81093561f01232cefeb6c 100644
--- a/civicrm/CRM/Contact/Form/Edit/Household.php
+++ b/civicrm/CRM/Contact/Form/Edit/Household.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/IM.php b/civicrm/CRM/Contact/Form/Edit/IM.php
index 29fc602740af8c77a6c9d3f7f39c25a79eca6631..f5df0b46aaa96a64490ed0697b688152b136a6e2 100644
--- a/civicrm/CRM/Contact/Form/Edit/IM.php
+++ b/civicrm/CRM/Contact/Form/Edit/IM.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Individual.php b/civicrm/CRM/Contact/Form/Edit/Individual.php
index ded492da12c4a15d39c5b3f0fda02ebf837c9541..b189500f45ddd35c5fcde8a4b81b9013c22e9146 100644
--- a/civicrm/CRM/Contact/Form/Edit/Individual.php
+++ b/civicrm/CRM/Contact/Form/Edit/Individual.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Lock.php b/civicrm/CRM/Contact/Form/Edit/Lock.php
index f6a6298e73ba5af2be47e1d12133d295ac1d0f3d..3d9137599112138b9457c93938dba731c0abde19 100644
--- a/civicrm/CRM/Contact/Form/Edit/Lock.php
+++ b/civicrm/CRM/Contact/Form/Edit/Lock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Notes.php b/civicrm/CRM/Contact/Form/Edit/Notes.php
index 9fa07b06709c0724a59f216787569523d3213c73..bee6a4fc5f0bc8599cbe1b368d38cee2517d880a 100644
--- a/civicrm/CRM/Contact/Form/Edit/Notes.php
+++ b/civicrm/CRM/Contact/Form/Edit/Notes.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/OpenID.php b/civicrm/CRM/Contact/Form/Edit/OpenID.php
index c39a3638893e8357e5a88646b3a0283c826e9947..b877881f8b5ce1c2630255e08a727a2f13450fb6 100644
--- a/civicrm/CRM/Contact/Form/Edit/OpenID.php
+++ b/civicrm/CRM/Contact/Form/Edit/OpenID.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Organization.php b/civicrm/CRM/Contact/Form/Edit/Organization.php
index 058f4c8961b4a858b9629855ac4743d40824a0f6..914aac66525f33ca7dceb612dd121884c5952078 100644
--- a/civicrm/CRM/Contact/Form/Edit/Organization.php
+++ b/civicrm/CRM/Contact/Form/Edit/Organization.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Phone.php b/civicrm/CRM/Contact/Form/Edit/Phone.php
index e6bc3edbab246d665a4a375fae33d58b229d42a8..756a96fca919b1890658c3dc15af7296fb423efa 100644
--- a/civicrm/CRM/Contact/Form/Edit/Phone.php
+++ b/civicrm/CRM/Contact/Form/Edit/Phone.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/TagsAndGroups.php b/civicrm/CRM/Contact/Form/Edit/TagsAndGroups.php
index b8c666037dddb80c533e916d713a6e96a6966433..8b7d3f1c89c2a782663e5fa449667ab1fabdb6c8 100644
--- a/civicrm/CRM/Contact/Form/Edit/TagsAndGroups.php
+++ b/civicrm/CRM/Contact/Form/Edit/TagsAndGroups.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Edit/Website.php b/civicrm/CRM/Contact/Form/Edit/Website.php
index 941d00bdd62b7608983bdad05287eba95762b156..160e84248de843eafb407aa67fd086fbddea0d3c 100644
--- a/civicrm/CRM/Contact/Form/Edit/Website.php
+++ b/civicrm/CRM/Contact/Form/Edit/Website.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/GroupContact.php b/civicrm/CRM/Contact/Form/GroupContact.php
index 76753621d3d0809f0124044ac9fc67830eaf3f1d..fcbc9fc6816aa4c26c5c9a062bbc28b919a15d5d 100644
--- a/civicrm/CRM/Contact/Form/GroupContact.php
+++ b/civicrm/CRM/Contact/Form/GroupContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline.php b/civicrm/CRM/Contact/Form/Inline.php
index a9520b8f5c7280b3ba85488e41cc4df902e4fc0a..8bd78464a46a51dcd3f0cf634b4d5d1b026a016a 100644
--- a/civicrm/CRM/Contact/Form/Inline.php
+++ b/civicrm/CRM/Contact/Form/Inline.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/Address.php b/civicrm/CRM/Contact/Form/Inline/Address.php
index b8904091d0b44317fa5385893dd54f600d20bb5b..f9b9d5de9a1c9d5de3848d5f4ce7f1810233742c 100644
--- a/civicrm/CRM/Contact/Form/Inline/Address.php
+++ b/civicrm/CRM/Contact/Form/Inline/Address.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php b/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php
index 589589dbfd9c54421ea5f371575373aae1450797..551683b2228c3d753b76b457ee22ec07677cca9b 100644
--- a/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php
+++ b/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/ContactInfo.php b/civicrm/CRM/Contact/Form/Inline/ContactInfo.php
index b9cd02b8727dd2884b304654c0d7c58c2f01b2a9..ca419164622e474434d470100b1421389dcd5f3f 100644
--- a/civicrm/CRM/Contact/Form/Inline/ContactInfo.php
+++ b/civicrm/CRM/Contact/Form/Inline/ContactInfo.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/ContactName.php b/civicrm/CRM/Contact/Form/Inline/ContactName.php
index 5f60db40c3b8cd2ba086a43b7346fba22fbf7d75..f5f61eaa20f400f1602a179aedd8395879f570fb 100644
--- a/civicrm/CRM/Contact/Form/Inline/ContactName.php
+++ b/civicrm/CRM/Contact/Form/Inline/ContactName.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/CustomData.php b/civicrm/CRM/Contact/Form/Inline/CustomData.php
index 33b87f9ff27e741d4b6a02e9290be9a09ad41f81..a1e0c789bbdee9839a38c3a8ba2cb505b309f633 100644
--- a/civicrm/CRM/Contact/Form/Inline/CustomData.php
+++ b/civicrm/CRM/Contact/Form/Inline/CustomData.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/Demographics.php b/civicrm/CRM/Contact/Form/Inline/Demographics.php
index fed6dc9046322fc4341a3a885ea8b20ef667495f..69da342a1d68d65606710102a2cde085555abb76 100644
--- a/civicrm/CRM/Contact/Form/Inline/Demographics.php
+++ b/civicrm/CRM/Contact/Form/Inline/Demographics.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/Email.php b/civicrm/CRM/Contact/Form/Inline/Email.php
index 5d391910528cf015bb5f53d874dd76f01ec0f599..d0b38ac2b98f2dbeeb3652e311aab63c4355ea39 100644
--- a/civicrm/CRM/Contact/Form/Inline/Email.php
+++ b/civicrm/CRM/Contact/Form/Inline/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/IM.php b/civicrm/CRM/Contact/Form/Inline/IM.php
index 688e805c63268a723b208e828cb85883711572bd..840bae86231303911f3b3ce3905559d3187abc78 100644
--- a/civicrm/CRM/Contact/Form/Inline/IM.php
+++ b/civicrm/CRM/Contact/Form/Inline/IM.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/Lock.php b/civicrm/CRM/Contact/Form/Inline/Lock.php
index abeb99ebf2bf4a31b22fa585e1dcf77ee7ba21f5..2720062ba83cba13fa94dfed2b341cc774215d02 100644
--- a/civicrm/CRM/Contact/Form/Inline/Lock.php
+++ b/civicrm/CRM/Contact/Form/Inline/Lock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/OpenID.php b/civicrm/CRM/Contact/Form/Inline/OpenID.php
index fe886c798fb0da09e99114873f0f86a840f8dfac..7726f1aee45a17b3858ce3a8485a065254412460 100644
--- a/civicrm/CRM/Contact/Form/Inline/OpenID.php
+++ b/civicrm/CRM/Contact/Form/Inline/OpenID.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/Phone.php b/civicrm/CRM/Contact/Form/Inline/Phone.php
index d7f81ff354ea72f62b759cc38fc0261ae5503fff..bd0b54c581546fd174c6805ec0f5734b3b22ffec 100644
--- a/civicrm/CRM/Contact/Form/Inline/Phone.php
+++ b/civicrm/CRM/Contact/Form/Inline/Phone.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Inline/Website.php b/civicrm/CRM/Contact/Form/Inline/Website.php
index 333e5162281dce603dc2727632271fd30b60aad7..c4664a665193ca8454e1ba6302a0e9db0b3a25cd 100644
--- a/civicrm/CRM/Contact/Form/Inline/Website.php
+++ b/civicrm/CRM/Contact/Form/Inline/Website.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Location.php b/civicrm/CRM/Contact/Form/Location.php
index 520ed19da1b0a116f4ca7ab30850f4950c4878ab..0be5fce1fa9a003bd24a74d450c623e5db6be33f 100644
--- a/civicrm/CRM/Contact/Form/Location.php
+++ b/civicrm/CRM/Contact/Form/Location.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Merge.php b/civicrm/CRM/Contact/Form/Merge.php
index 53045ac9712f3db2bb8e3f6f82490de3beb2999e..8f7d48535f4f6a77bbda9dff2caf2ef1476bf331 100644
--- a/civicrm/CRM/Contact/Form/Merge.php
+++ b/civicrm/CRM/Contact/Form/Merge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -44,6 +44,11 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
var $_contactType = NULL;
+ /**
+ * @var array
+ */
+ public $criteria = array();
+
/**
* Query limit to be retained in the urls.
*
@@ -74,8 +79,9 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
$this->_gid = $gid = CRM_Utils_Request::retrieve('gid', 'Positive', $this, FALSE);
$this->_mergeId = CRM_Utils_Request::retrieve('mergeId', 'Positive', $this, FALSE);
$this->limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this, FALSE);
+ $this->criteria = CRM_Utils_Request::retrieve('criteria', 'Json', $this, FALSE, '{}');
- $urlParams = ['reset' => 1, 'rgid' => $this->_rgid, 'gid' => $this->_gid, 'limit' => $this->limit];
+ $urlParams = ['reset' => 1, 'rgid' => $this->_rgid, 'gid' => $this->_gid, 'limit' => $this->limit, 'criteria' => $this->criteria];
$this->bounceIfInvalid($this->_cid, $this->_oid);
@@ -100,7 +106,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
CRM_Core_Session::singleton()->pushUserContext($browseUrl);
}
- $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $gid);
+ $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $gid, json_decode($this->criteria, TRUE));
$join = CRM_Dedupe_Merger::getJoinOnDedupeTable();
$where = "de.id IS NULL";
@@ -114,16 +120,9 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
$mainUfId = CRM_Core_BAO_UFMatch::getUFId($this->_cid);
$mainUser = NULL;
if ($mainUfId) {
- // d6 compatible
- if ($config->userSystem->is_drupal == '1') {
- $mainUser = user_load($mainUfId);
- }
- elseif ($config->userFramework == 'Joomla') {
- $mainUser = JFactory::getUser($mainUfId);
- }
-
+ $mainUser = $config->userSystem->getUser($this->_cid);
$this->assign('mainUfId', $mainUfId);
- $this->assign('mainUfName', $mainUser ? $mainUser->name : NULL);
+ $this->assign('mainUfName', $mainUser ? $mainUser['name'] : NULL);
}
$flipParams = array_merge($urlParams, ['action' => 'update', 'cid' => $this->_oid, 'oid' => $this->_cid]);
if (!$flip) {
@@ -158,16 +157,9 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
$otherUser = NULL;
if ($otherUfId) {
- // d6 compatible
- if ($config->userSystem->is_drupal == '1') {
- $otherUser = user_load($otherUfId);
- }
- elseif ($config->userFramework == 'Joomla') {
- $otherUser = JFactory::getUser($otherUfId);
- }
-
+ $otherUser = $config->userSystem->getUser($this->_oid);
$this->assign('otherUfId', $otherUfId);
- $this->assign('otherUfName', $otherUser ? $otherUser->name : NULL);
+ $this->assign('otherUfName', $otherUser ? $otherUser['name'] : NULL);
}
$cmsUser = ($mainUfId && $otherUfId) ? TRUE : FALSE;
@@ -300,7 +292,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
$message = '<ul><li>' . ts('%1 has been updated.', array(1 => $name)) . '</li><li>' . ts('Contact ID %1 has been deleted.', array(1 => $this->_oid)) . '</li></ul>';
CRM_Core_Session::setStatus($message, ts('Contacts Merged'), 'success');
- $urlParams = ['reset' => 1, 'cid' => $this->_cid, 'rgid' => $this->_rgid, 'gid' => $this->_gid, 'limit' => $this->limit];
+ $urlParams = ['reset' => 1, 'cid' => $this->_cid, 'rgid' => $this->_rgid, 'gid' => $this->_gid, 'limit' => $this->limit, 'criteria' => $this->criteria];
$contactViewUrl = CRM_Utils_System::url('civicrm/contact/view', ['reset' => 1, 'cid' => $this->_cid]);
if (!empty($formValues['_qf_Merge_submit'])) {
@@ -314,7 +306,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
}
if ($this->next && $this->_mergeId) {
- $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $this->_gid);
+ $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $this->_gid, json_decode($this->criteria, TRUE));
$join = CRM_Dedupe_Merger::getJoinOnDedupeTable();
$where = "de.id IS NULL";
diff --git a/civicrm/CRM/Contact/Form/RelatedContact.php b/civicrm/CRM/Contact/Form/RelatedContact.php
index 6a513e5b49cef639c542d6827a6dc04c515322e8..2b634ca09891ad443f6755820e64437173162e60 100644
--- a/civicrm/CRM/Contact/Form/RelatedContact.php
+++ b/civicrm/CRM/Contact/Form/RelatedContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Relationship.php b/civicrm/CRM/Contact/Form/Relationship.php
index 3ef442ab9ea3986594d66b7137431e531d3a0563..897856150fb19c187c79604dc0f23183d6a4a530 100644
--- a/civicrm/CRM/Contact/Form/Relationship.php
+++ b/civicrm/CRM/Contact/Form/Relationship.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -299,8 +299,7 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
// Select list
$relationshipList = CRM_Contact_BAO_Relationship::getContactRelationshipType($this->_contactId, $this->_rtype, $this->_relationshipId);
- // Metadata needed on clientside
- $this->assign('relationshipData', self::getRelationshipTypeMetadata($relationshipList));
+ $this->assign('contactTypes', CRM_Contact_BAO_ContactType::contactTypeInfo(TRUE));
foreach ($this->_allRelationshipNames as $id => $vals) {
if ($vals['name_a_b'] === 'Employee of') {
@@ -309,7 +308,22 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
}
}
- $this->addField('relationship_type_id', array('options' => array('' => ts('- select -')) + $relationshipList, 'class' => 'huge', 'placeholder' => '- select -'), TRUE);
+ $this->addField(
+ 'relationship_type_id',
+ array(
+ 'options' => array('' => ts('- select -')) + $relationshipList,
+ 'class' => 'huge',
+ 'placeholder' => '- select -',
+ 'option_url' => 'civicrm/admin/reltype',
+ 'option_context' => array(
+ 'contact_id' => $this->_contactId,
+ 'relationship_direction' => $this->_rtype,
+ 'relationship_id' => $this->_relationshipId,
+ 'is_form' => TRUE,
+ ),
+ ),
+ TRUE
+ );
$label = $this->_action & CRM_Core_Action::ADD ? ts('Contact(s)') : ts('Contact');
$contactField = $this->addField('related_contact_id', array('label' => $label, 'name' => 'contact_id_b', 'multiple' => TRUE, 'create' => TRUE), TRUE);
diff --git a/civicrm/CRM/Contact/Form/Search.php b/civicrm/CRM/Contact/Form/Search.php
index 8316b852605d71a407054eae60b5e0f0f923d191..e689bc8f2cc1c3c4564efd3106ff99ca5d5e9e67 100644
--- a/civicrm/CRM/Contact/Form/Search.php
+++ b/civicrm/CRM/Contact/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Advanced.php b/civicrm/CRM/Contact/Form/Search/Advanced.php
index 122963c22a0cd7037c2076550a158876b1496ac3..5c7c53ed20dc1dcafda277321d5e5a4a587d741a 100644
--- a/civicrm/CRM/Contact/Form/Search/Advanced.php
+++ b/civicrm/CRM/Contact/Form/Search/Advanced.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Basic.php b/civicrm/CRM/Contact/Form/Search/Basic.php
index a5b26a36a64cc09627cf7cbab162fabecefc4bd5..7a2d6ace2e4130010219226be90f60d1594fd98d 100644
--- a/civicrm/CRM/Contact/Form/Search/Basic.php
+++ b/civicrm/CRM/Contact/Form/Search/Basic.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Builder.php b/civicrm/CRM/Contact/Form/Search/Builder.php
index 153768095b9c0931c9c8f087ab8f8153f04d12aa..2a5dd79351b47a673a22bb98d082df6fcaf8f324 100644
--- a/civicrm/CRM/Contact/Form/Search/Builder.php
+++ b/civicrm/CRM/Contact/Form/Search/Builder.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -91,18 +91,22 @@ class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search {
*/
public function buildQuickForm() {
$fields = self::fields();
- // Get fields of type date
- // FIXME: This is a hack until our fields contain this meta-data
- $dateFields = array();
- $stringFields = array();
$searchByLabelFields = array();
+ // This array contain list of available fields and their corresponding data type,
+ // later assigned as json string, to be used to filter list of mysql operators
+ $fieldNameTypes = [];
+ $dataType = [
+ CRM_Utils_Type::T_STRING => 'String',
+ CRM_Utils_Type::T_TEXT => 'String',
+ CRM_Utils_Type::T_LONGTEXT => 'String',
+ CRM_Utils_Type::T_BOOLEAN => 'Boolean',
+ CRM_Utils_Type::T_DATE => 'Date',
+ CRM_Utils_Type::T_TIMESTAMP => 'Date',
+ ];
foreach ($fields as $name => $field) {
- if (strpos($name, '_date') || CRM_Utils_Array::value('data_type', $field) == 'Date') {
- $dateFields[] = $name;
- }
- // it's necessary to know which of the fields are from string data type
- if (isset($field['type']) && $field['type'] === CRM_Utils_Type::T_STRING) {
- $stringFields[] = $name;
+ // Assign date type to respective field name, which will be later used to modify operator list
+ if (isset($field['type']) && array_key_exists($field['type'], $dataType)) {
+ $fieldNameTypes[$name] = $dataType[$field['type']];
}
// it's necessary to know which of the fields are searchable by label
if (isset($field['searchByLabel']) && $field['searchByLabel']) {
@@ -116,12 +120,10 @@ class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search {
'searchBuilder' => array(
// Index of newly added/expanded block (1-based index)
'newBlock' => $this->get('newBlock'),
- 'dateFields' => $dateFields,
'fieldOptions' => self::fieldOptions(),
- 'stringFields' => $stringFields,
'searchByLabelFields' => $searchByLabelFields,
+ 'fieldTypes' => $fieldNameTypes,
'generalOperators' => array('' => ts('-operator-')) + CRM_Core_SelectValues::getSearchBuilderOperators(),
- 'stringOperators' => array('' => ts('-operator-')) + CRM_Core_SelectValues::getSearchBuilderOperators(CRM_Utils_Type::T_STRING),
),
));
//get the saved search mapping id
diff --git a/civicrm/CRM/Contact/Form/Search/Criteria.php b/civicrm/CRM/Contact/Form/Search/Criteria.php
index d47739a3644e9c113f13677b1d8271526e11bcab..3c1b3e7ea9fca751a366756b879fe29c7096cea4 100644
--- a/civicrm/CRM/Contact/Form/Search/Criteria.php
+++ b/civicrm/CRM/Contact/Form/Search/Criteria.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom.php b/civicrm/CRM/Contact/Form/Search/Custom.php
index 67f752d5b21e94114054b5639b76139318b8b5dc..d6de166cdd94795dbca1b183f7f440eeab1fc92a 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/ActivitySearch.php b/civicrm/CRM/Contact/Form/Search/Custom/ActivitySearch.php
index dc1aefedf7569f9697c61ad037655cdfffa4e2d1..b2dc8e169419a5cd0d5102362fa2e319a210b558 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/ActivitySearch.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/ActivitySearch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Base.php b/civicrm/CRM/Contact/Form/Search/Custom/Base.php
index bf9d95eb392da87245a1e9aedd41f1307689799c..c1604a0dfe1bc8ac5c403b476a43c5ca37094d88 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Base.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Base.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Basic.php b/civicrm/CRM/Contact/Form/Search/Custom/Basic.php
index 20a03cd824439ea4ac108aa2c911f76465b2c848..2a1c9621c44a424f25019526f7e42fb1e3e473ce 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Basic.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Basic.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/ContribSYBNT.php b/civicrm/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
index e5bde961e507d24a4621ea7f9c30b5071e40e7a4..bfd961b1c275bf44b9a59107929da9237fcd2c24 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/ContributionAggregate.php b/civicrm/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
index d01a26e475cc59c814a20c82abca992f66631237..778003b8fd789856cdccbf01955d3b10304a64e8 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/DateAdded.php b/civicrm/CRM/Contact/Form/Search/Custom/DateAdded.php
index 7e0e55a722cc53a99841319559d7253b514319fb..3ec22422e3db323af7da5952bb76efed92ae988d 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/DateAdded.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/DateAdded.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/EventAggregate.php b/civicrm/CRM/Contact/Form/Search/Custom/EventAggregate.php
index 8606759d66e4d338a0eec1db22a8dce17d9e2abe..eb35e4ea1e96f40bb910914816342c002a298faf 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/EventAggregate.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/EventAggregate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText.php
index 1404f4882a96d71297cf3bd10d760c3f6b896002..645c0613c0a6a5109392af3964f0c48323553c87 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/AbstractPartialQuery.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/AbstractPartialQuery.php
index 39d9d505563bc8ea287bcc58f1689a2383998f5c..6a9424777baeae82e3ed078d63cc5619a8585cc8 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/AbstractPartialQuery.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/AbstractPartialQuery.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Activity.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Activity.php
index b1cf1ab4f5175c77e12602c70c994633760862a0..eac0e51ff237c594bdd82280b03d4d2d8f49ef8c 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Activity.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Activity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Case.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Case.php
index ade7852ef76a2c2c5006c9dcca56598a7ce7784e..765b96ecd792f218dd89a0bc7916cc2e8a906498 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Case.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Case.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contact.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contact.php
index 873d67a79aebb2ebea513194c816e8d4f227d1f4..83a32654aae4dfeefc968ae1e7ca4990211b80fc 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contact.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contribution.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contribution.php
index 0f6b304c05b70c5718bc6296c9f06a057ed0b689..1a6a952c56f72180843e560936f8df9277148b8c 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contribution.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contribution.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Membership.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Membership.php
index 6aa47920643458f693f112a2e9778fc71bde930b..fc968b9c2ed971f6f6311a4c91ee1fdc7fcd9409 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Membership.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Membership.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Participant.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Participant.php
index 114a2d0466a42f615793be230324d049d58faf26..a6eda63a9d5f044041d63b27d95457d074657b41 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Participant.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Participant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Group.php b/civicrm/CRM/Contact/Form/Search/Custom/Group.php
index 3d17946f024709cb7a06a8195a3976fe9113d59b..2cb84094d348f6effd18600f3d288830ad49a910 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Group.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Group.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/MultipleValues.php b/civicrm/CRM/Contact/Form/Search/Custom/MultipleValues.php
index 0a64e357c14843427530d3da1d4e69885e906a3b..acc1bd580f8100ca3c5e0f0f667f5bd14bc45fdb 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/MultipleValues.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/MultipleValues.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/PostalMailing.php b/civicrm/CRM/Contact/Form/Search/Custom/PostalMailing.php
index 85854ba16bd86099d867d9ba893098220b6904a4..f6c916c98e9cf0c0786191a49e5505e1eeb02881 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/PostalMailing.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/PostalMailing.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/PriceSet.php b/civicrm/CRM/Contact/Form/Search/Custom/PriceSet.php
index ec95dda8d8140060f62c011540d5c1bcb65469f3..327ddc88b9e6c2754a572639cdb755b628329b3d 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/PriceSet.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/PriceSet.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Proximity.php b/civicrm/CRM/Contact/Form/Search/Custom/Proximity.php
index 5585414cf9b06dff091b5de376884d6e5d26f29d..e5d5f339f0050747cb1b11b55383617161bc7571 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Proximity.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Proximity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/RandomSegment.php b/civicrm/CRM/Contact/Form/Search/Custom/RandomSegment.php
index 511e4b19d0c5e2258767be7180731d8fe237106d..dfd1abfc6bb0edb5df10c8efd097393cefac5704 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/RandomSegment.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/RandomSegment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Sample.php b/civicrm/CRM/Contact/Form/Search/Custom/Sample.php
index 5c915b2bc73a13982b4158ac76439a9a20da33a1..96dbab5c54596e226ad252f5a74277528de26076 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Sample.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Sample.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/TagContributions.php b/civicrm/CRM/Contact/Form/Search/Custom/TagContributions.php
index 2a6b34cac462e19902242fdebb02326eaa5ca8d0..fdeeb499227fd0301905798ec4ccc942db0b5614 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/TagContributions.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/TagContributions.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/ZipCodeRange.php b/civicrm/CRM/Contact/Form/Search/Custom/ZipCodeRange.php
index e7c458c5f530a8d62e18944363bf115ff4d93402..cc1e99c25033ced6ce76fd0a9b7053aea6443152 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/ZipCodeRange.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/ZipCodeRange.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Search/Interface.php b/civicrm/CRM/Contact/Form/Search/Interface.php
index 1180240fe7a8a69cb00f3298b02a51353ed721b8..9f6e981927c595a83e67f637917aff537eefd9e7 100644
--- a/civicrm/CRM/Contact/Form/Search/Interface.php
+++ b/civicrm/CRM/Contact/Form/Search/Interface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task.php b/civicrm/CRM/Contact/Form/Task.php
index bb2543129740beea16a841027d5dd0b72ff3ead4..5136641e3b70ee2def7aa92f76e76f650f5c203e 100644
--- a/civicrm/CRM/Contact/Form/Task.php
+++ b/civicrm/CRM/Contact/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/AddToGroup.php b/civicrm/CRM/Contact/Form/Task/AddToGroup.php
index 8e27e37cb4ae841947afcf70f9bd3f01cfc83c8b..3e67362001a23bde1e7e3fc3f731f5992de219a7 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToGroup.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/AddToHousehold.php b/civicrm/CRM/Contact/Form/Task/AddToHousehold.php
index bc24165d31b03f03a95ad97316e7c6c77b04bcf1..44613cda92f5428d2c0fb0dc248440cbfaa08b6e 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToHousehold.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToHousehold.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/AddToIndividual.php b/civicrm/CRM/Contact/Form/Task/AddToIndividual.php
index b78d3bef820ab91f52141bdf5e463d4dd7f500d3..190ae25b6cd58145d3e091480d502fb9640098ca 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToIndividual.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToIndividual.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/AddToOrganization.php b/civicrm/CRM/Contact/Form/Task/AddToOrganization.php
index 62f916f5b7fe6f238b7a8cf3bcd7fa8cee0e22e2..57833a9cdfec7143f90406c7d7e23734c3e5b363 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToOrganization.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToOrganization.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/AddToParentClass.php b/civicrm/CRM/Contact/Form/Task/AddToParentClass.php
index 1d85aee81c04b7e1c692ebd4d2919dd873973ec5..040d007fccaa7b918728194f15c2db25df9a9b7c 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToParentClass.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToParentClass.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/AddToTag.php b/civicrm/CRM/Contact/Form/Task/AddToTag.php
index accd6f9a342a6452c8e89e389bc9b46e5448b275..1f2d8af173b7ccb289fabad27859c2d99aebefd7 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToTag.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToTag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/AlterPreferences.php b/civicrm/CRM/Contact/Form/Task/AlterPreferences.php
index 4355ff34686e22c4a6bf85a9ad92f887e7cf373a..4c1d62e7025ddd0e76be794908d9b3113d5db9bd 100644
--- a/civicrm/CRM/Contact/Form/Task/AlterPreferences.php
+++ b/civicrm/CRM/Contact/Form/Task/AlterPreferences.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/Batch.php b/civicrm/CRM/Contact/Form/Task/Batch.php
index 6f444383f309e86efa9ed118b9315e36d3b5e4a0..c9d4fdd821686ff96073ca6d82317c25b659374f 100644
--- a/civicrm/CRM/Contact/Form/Task/Batch.php
+++ b/civicrm/CRM/Contact/Form/Task/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -217,6 +217,9 @@ class CRM_Contact_Form_Task_Batch extends CRM_Contact_Form_Task {
public function postProcess() {
$params = $this->exportValues();
+ // @todo extract submit functions &
+ // extend CRM_Event_Form_Task_BatchTest::testSubmit with a data provider to test
+ // handling of custom data, specifically checkbox fields.
$ufGroupId = $this->get('ufGroupId');
$notify = NULL;
$inValidSubtypeCnt = 0;
diff --git a/civicrm/CRM/Contact/Form/Task/Delete.php b/civicrm/CRM/Contact/Form/Task/Delete.php
index c29cca538186fc4fee9a2e6e2a39cf143a275cae..bc50f684dac23a4317de9461764ea506c10e0c8a 100644
--- a/civicrm/CRM/Contact/Form/Task/Delete.php
+++ b/civicrm/CRM/Contact/Form/Task/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/Email.php b/civicrm/CRM/Contact/Form/Task/Email.php
index e72f07641329cfe7cc9c80a99115ea84d1fe8966..a2b83de3a0344b18d4135191ca4ec09ae93d8c21 100644
--- a/civicrm/CRM/Contact/Form/Task/Email.php
+++ b/civicrm/CRM/Contact/Form/Task/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/EmailCommon.php b/civicrm/CRM/Contact/Form/Task/EmailCommon.php
index 0083bc9cf90fb054f9b706714fe17890d8009039..73a71d7e763d0bbd247a7c5640d676e06b0b1e11 100644
--- a/civicrm/CRM/Contact/Form/Task/EmailCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/EmailCommon.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -69,8 +69,10 @@ class CRM_Contact_Form_Task_EmailCommon {
$form->_emails = array();
- $contactID = CRM_Core_Session::singleton()->getLoggedInContactID();
- $form->_contactIds = array($contactID);
+ // @TODO remove these line and to it somewhere more appropriate. Currently some classes (e.g Case
+ // are having to re-write contactIds afterwards due to this inappropriate variable setting
+ // If we don't have any contact IDs, use the logged in contact ID
+ $form->_contactIds = $form->_contactIds ?: [CRM_Core_Session::getLoggedInContactID()];
$fromEmailValues = CRM_Core_BAO_Email::getFromEmail();
diff --git a/civicrm/CRM/Contact/Form/Task/HookSample.php b/civicrm/CRM/Contact/Form/Task/HookSample.php
index b91a3cd04babfa53823bbadec5e2c202bb701708..8c67e565a0fba21a23718385817caba1c33ed5df 100644
--- a/civicrm/CRM/Contact/Form/Task/HookSample.php
+++ b/civicrm/CRM/Contact/Form/Task/HookSample.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/Label.php b/civicrm/CRM/Contact/Form/Task/Label.php
index 4b8146e3f1147ffffb5f6fdfb9b2b2e87ffaa91d..ed0943aa5b95fa40e4afa71ce5d3fc21c995ba9f 100644
--- a/civicrm/CRM/Contact/Form/Task/Label.php
+++ b/civicrm/CRM/Contact/Form/Task/Label.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/LabelCommon.php b/civicrm/CRM/Contact/Form/Task/LabelCommon.php
index 11a0e34b7001890b4f4deb5f7367bb0928bbce2a..e9c441f83eafa4759d41441cd601dc07b86fff0d 100644
--- a/civicrm/CRM/Contact/Form/Task/LabelCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/LabelCommon.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/Map.php b/civicrm/CRM/Contact/Form/Task/Map.php
index b88de102d07d275d9619ebc944cb5dcdcb5504e6..5e21b5e95cde71b62a75f7db3d2670fac10ba98e 100644
--- a/civicrm/CRM/Contact/Form/Task/Map.php
+++ b/civicrm/CRM/Contact/Form/Task/Map.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/Map/Event.php b/civicrm/CRM/Contact/Form/Task/Map/Event.php
index 609f24b261c7a3a207e383f7b3c32e27b82ff652..2d6b8146b2254091c085e5c0ea4d5a7a226fea4e 100644
--- a/civicrm/CRM/Contact/Form/Task/Map/Event.php
+++ b/civicrm/CRM/Contact/Form/Task/Map/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/Merge.php b/civicrm/CRM/Contact/Form/Task/Merge.php
index dbf11dedb2292d9ad45af529e1aed1116199c400..7f52c4a53ae5f7afce20dedde9bf50c002376711 100644
--- a/civicrm/CRM/Contact/Form/Task/Merge.php
+++ b/civicrm/CRM/Contact/Form/Task/Merge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/PDF.php b/civicrm/CRM/Contact/Form/Task/PDF.php
index e6326c2f87c3b1e89385c2ac36c836da9fef77fb..c53e951e1cd31f701369f52cb2ea8e443fa17e20 100644
--- a/civicrm/CRM/Contact/Form/Task/PDF.php
+++ b/civicrm/CRM/Contact/Form/Task/PDF.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php b/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php
index e2e9d06c39aaf777ee027ac0b9e16faae55e3588..de9251b49eba804a9018cd3a293f429533475cac 100644
--- a/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/PickProfile.php b/civicrm/CRM/Contact/Form/Task/PickProfile.php
index 62f916286b8fd9fc5f4fa82b1f3a12ef2e7e0aad..959147cf7f6c8ec573329e9ce215635b26f3071a 100644
--- a/civicrm/CRM/Contact/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Contact/Form/Task/PickProfile.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/Print.php b/civicrm/CRM/Contact/Form/Task/Print.php
index f94d4beb05d1c53a42eb37ba08bd8a49f891285f..67924b55ccb7e7ffd67e5aed928ffea175c6745e 100644
--- a/civicrm/CRM/Contact/Form/Task/Print.php
+++ b/civicrm/CRM/Contact/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -82,8 +82,9 @@ class CRM_Contact_Form_Task_Print extends CRM_Contact_Form_Task {
$selectorName = $this->controller->selectorName();
require_once str_replace('_', DIRECTORY_SEPARATOR, $selectorName) . '.php';
- $returnP = isset($returnPropeties) ? $returnPropeties : "";
+ $returnP = isset($returnProperties) ? $returnProperties : "";
$customSearchClass = $this->get('customSearchClass');
+ $this->assign('customSearchID', $this->get('customSearchID'));
$selector = new $selectorName($customSearchClass,
$fv,
$params,
diff --git a/civicrm/CRM/Contact/Form/Task/ProximityCommon.php b/civicrm/CRM/Contact/Form/Task/ProximityCommon.php
index 5da9d8c418f89ff9bf3b654debfb9c60556c5a17..118c5b9bee73b6e441b439cb429562a59fbcf9e8 100644
--- a/civicrm/CRM/Contact/Form/Task/ProximityCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/ProximityCommon.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/RemoveFromGroup.php b/civicrm/CRM/Contact/Form/Task/RemoveFromGroup.php
index 4d0f878589d7aaf41a3b2c5f2b3db6a7def1d54d..50f5a02e6f02d46eb7f2b6e244940a60c32b1bb1 100644
--- a/civicrm/CRM/Contact/Form/Task/RemoveFromGroup.php
+++ b/civicrm/CRM/Contact/Form/Task/RemoveFromGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/RemoveFromTag.php b/civicrm/CRM/Contact/Form/Task/RemoveFromTag.php
index e5bec4c873050f86806952d69abeeade00a3d647..bc30fa4a6ec7c80dc29537bacd3c73c2d4fa403c 100644
--- a/civicrm/CRM/Contact/Form/Task/RemoveFromTag.php
+++ b/civicrm/CRM/Contact/Form/Task/RemoveFromTag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/Result.php b/civicrm/CRM/Contact/Form/Task/Result.php
index 0884eb7905cfc9fb025a197b64dcc05f39c87849..4e467ecbb2d5445ff054b934aa9407d6d4f888e3 100644
--- a/civicrm/CRM/Contact/Form/Task/Result.php
+++ b/civicrm/CRM/Contact/Form/Task/Result.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/SMS.php b/civicrm/CRM/Contact/Form/Task/SMS.php
index 4224521319568fdd393a7817991402279f96f125..6e5a1734daf35747123aec8ecd378b98e5a73fa3 100644
--- a/civicrm/CRM/Contact/Form/Task/SMS.php
+++ b/civicrm/CRM/Contact/Form/Task/SMS.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/SMSCommon.php b/civicrm/CRM/Contact/Form/Task/SMSCommon.php
index 6c1db0369a6058138bac27970691539f25b0af20..aacfd47beb3f4b2e094096b6aa349d8c177c08ac 100644
--- a/civicrm/CRM/Contact/Form/Task/SMSCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/SMSCommon.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/SaveSearch.php b/civicrm/CRM/Contact/Form/Task/SaveSearch.php
index d6684974612878ee3ee4848aea0e53726281864f..39642e6fd6796a922bd4ad438ec349cb9142146e 100644
--- a/civicrm/CRM/Contact/Form/Task/SaveSearch.php
+++ b/civicrm/CRM/Contact/Form/Task/SaveSearch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/SaveSearch/Update.php b/civicrm/CRM/Contact/Form/Task/SaveSearch/Update.php
index f0778dd1ee457140d1224298904a1f910c7e5207..5b1a38c83c5903c4871ed6c6bfbe0ad7cd3d4e1f 100644
--- a/civicrm/CRM/Contact/Form/Task/SaveSearch/Update.php
+++ b/civicrm/CRM/Contact/Form/Task/SaveSearch/Update.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Form/Task/Useradd.php b/civicrm/CRM/Contact/Form/Task/Useradd.php
index c296cb0d7fe3b7c9fb5b0803e2d5bcfce3dea06c..8e8357e599a4cadfe63fe347c55fefffca920e11 100644
--- a/civicrm/CRM/Contact/Form/Task/Useradd.php
+++ b/civicrm/CRM/Contact/Form/Task/Useradd.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Controller.php b/civicrm/CRM/Contact/Import/Controller.php
index 548376dde0126c95bd91b255ffebf839c3be3c57..c0f78566094df76e483a056301ba1893f7e0e8a1 100644
--- a/civicrm/CRM/Contact/Import/Controller.php
+++ b/civicrm/CRM/Contact/Import/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Field.php b/civicrm/CRM/Contact/Import/Field.php
index bbca8fe202a18f5ea38585318cc537ac92c21346..dc3619b82ee58d2f3fc59dcbdd96ef27962c960a 100644
--- a/civicrm/CRM/Contact/Import/Field.php
+++ b/civicrm/CRM/Contact/Import/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Form/DataSource.php b/civicrm/CRM/Contact/Import/Form/DataSource.php
index eb31790ebf8f67842b2fc328f8a3b67fe9ed6a6b..3e5be3db96baf7cd030e592deccca83c94471d61 100644
--- a/civicrm/CRM/Contact/Import/Form/DataSource.php
+++ b/civicrm/CRM/Contact/Import/Form/DataSource.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Form/MapField.php b/civicrm/CRM/Contact/Import/Form/MapField.php
index cbf31f60b93b6266c8be2ed651d120a10e97fe0a..f8715d2062d64b8de38c9b571da3af2c5155a6e1 100644
--- a/civicrm/CRM/Contact/Import/Form/MapField.php
+++ b/civicrm/CRM/Contact/Import/Form/MapField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Form/Preview.php b/civicrm/CRM/Contact/Import/Form/Preview.php
index 732527b54d973edb6ba16d5a617b8f277908196c..1aa5fd59ca9244783365cdf2771f11368e59666f 100644
--- a/civicrm/CRM/Contact/Import/Form/Preview.php
+++ b/civicrm/CRM/Contact/Import/Form/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Form/Summary.php b/civicrm/CRM/Contact/Import/Form/Summary.php
index c0e3c740b9104095290eb0c8ab4934bbe1a93003..a6983c6af48b1d00b47c8b17b88c224c9891f428 100644
--- a/civicrm/CRM/Contact/Import/Form/Summary.php
+++ b/civicrm/CRM/Contact/Import/Form/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/ImportJob.php b/civicrm/CRM/Contact/Import/ImportJob.php
index 9df6f0bc332509b0bf6515a2358be543479f9f21..459848703bd0ab1631ef2c3705f68d457fc648de 100644
--- a/civicrm/CRM/Contact/Import/ImportJob.php
+++ b/civicrm/CRM/Contact/Import/ImportJob.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Importer.php b/civicrm/CRM/Contact/Import/Importer.php
index 309cffe00d92418fa95c3fb51855540cbc000cd0..24d9b6a108bb52a92f09acb2027bea8a3ff425ab 100644
--- a/civicrm/CRM/Contact/Import/Importer.php
+++ b/civicrm/CRM/Contact/Import/Importer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Page/AJAX.php b/civicrm/CRM/Contact/Import/Page/AJAX.php
index e99880acc58a33f9b95f179db6d1c21c62b123d6..493747c8c447268b7c046fe2a082c982934111cb 100644
--- a/civicrm/CRM/Contact/Import/Page/AJAX.php
+++ b/civicrm/CRM/Contact/Import/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Parser.php b/civicrm/CRM/Contact/Import/Parser.php
index c711114da0a379d14e38fc90f746387c6aed3ba7..9fe3464c8647f9312b5a2ee229ec86d7b72f5494 100644
--- a/civicrm/CRM/Contact/Import/Parser.php
+++ b/civicrm/CRM/Contact/Import/Parser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Import/Parser/Contact.php b/civicrm/CRM/Contact/Import/Parser/Contact.php
index b5043a135cae8a97c844c1943b1da88accf4ccee..a04f15928e0e7b258c88d254f97e77cfc491ccaa 100644
--- a/civicrm/CRM/Contact/Import/Parser/Contact.php
+++ b/civicrm/CRM/Contact/Import/Parser/Contact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/AJAX.php b/civicrm/CRM/Contact/Page/AJAX.php
index acd0d3d7a72019b8e70518b930d4630cca304085..208d269204ed1f13e0f9822ff1c7d03f3ab33631 100644
--- a/civicrm/CRM/Contact/Page/AJAX.php
+++ b/civicrm/CRM/Contact/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -261,9 +261,12 @@ class CRM_Contact_Page_AJAX {
}
// Save activity only for the primary (first) client
if ($i == 0 && empty($result['is_error'])) {
- CRM_Case_BAO_Case::createCaseRoleActivity($caseID, $result['id'], $relContactID);
+ CRM_Case_BAO_Case::createCaseRoleActivity($caseID, $result['id'], $relContactID, $sourceContactID);
}
}
+ if (!empty($_REQUEST['is_unit_test'])) {
+ return $ret;
+ }
CRM_Utils_JSON::output($ret);
}
@@ -646,13 +649,16 @@ LIMIT {$offset}, {$rowCount}
$gid = CRM_Utils_Request::retrieve('gid', 'Positive');
$rgid = CRM_Utils_Request::retrieve('rgid', 'Positive');
+ $null = NULL;
+ $criteria = CRM_Utils_Request::retrieve('criteria', 'Json', $null, FALSE, '{}');
$selected = isset($_REQUEST['selected']) ? CRM_Utils_Type::escape($_REQUEST['selected'], 'Integer') : 0;
if ($rowCount < 0) {
$rowCount = 0;
}
$whereClause = $orderByClause = '';
- $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid);
+ $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid, json_decode($criteria, TRUE));
+
$searchRows = array();
$searchParams = self::getSearchOptionsFromRequest();
@@ -814,6 +820,7 @@ LIMIT {$offset}, {$rowCount}
'oid' => $pairInfo['entity_id2'],
'action' => 'update',
'rgid' => $rgid,
+ 'criteria' => $criteria,
'limit' => CRM_Utils_Request::retrieve('limit', 'Integer'),
];
if ($gid) {
@@ -1014,8 +1021,9 @@ LIMIT {$offset}, {$rowCount}
$gid = CRM_Utils_Type::escape($_REQUEST['gid'], 'Integer');
$pnid = $_REQUEST['pnid'];
$isSelected = CRM_Utils_Type::escape($_REQUEST['is_selected'], 'Boolean');
+ $criteria = CRM_Utils_Request::retrieve('criteria', 'Json', $null, FALSE, '{}');
- $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid);
+ $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid, json_decode($criteria, TRUE));
$params = array(
1 => array($isSelected, 'Boolean'),
diff --git a/civicrm/CRM/Contact/Page/CustomSearch.php b/civicrm/CRM/Contact/Page/CustomSearch.php
index 6ec94a569b8e8e2871bf97cc307e96497b99da02..a26342afb21307c64de0e011216ec6fbbce64f97 100644
--- a/civicrm/CRM/Contact/Page/CustomSearch.php
+++ b/civicrm/CRM/Contact/Page/CustomSearch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/DashBoard.php b/civicrm/CRM/Contact/Page/DashBoard.php
index de3d28d1a22eaf39ab1b0dd55358e5f8ab1ddc60..20516b56ec0743dba59a1ecff340b6b74c93b72a 100644
--- a/civicrm/CRM/Contact/Page/DashBoard.php
+++ b/civicrm/CRM/Contact/Page/DashBoard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Dashlet.php b/civicrm/CRM/Contact/Page/Dashlet.php
index a020d89aa9c4e62251455c40dc3255b3ccc2dc98..a49792ac8efdd7c02252904ed3d9c8d85d05149e 100644
--- a/civicrm/CRM/Contact/Page/Dashlet.php
+++ b/civicrm/CRM/Contact/Page/Dashlet.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/DedupeException.php b/civicrm/CRM/Contact/Page/DedupeException.php
index ab8bbea41b9b9b2ead401fcc630c36a99cdcaf2c..0634db7b6776c68e13f375ef628e9c09570b8edd 100644
--- a/civicrm/CRM/Contact/Page/DedupeException.php
+++ b/civicrm/CRM/Contact/Page/DedupeException.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/DedupeFind.php b/civicrm/CRM/Contact/Page/DedupeFind.php
index 90beae0b95628be1783d00c6520628fe26dc3a18..e96da5cde6ca59ee6bf4e442827c6a4c5e818394 100644
--- a/civicrm/CRM/Contact/Page/DedupeFind.php
+++ b/civicrm/CRM/Contact/Page/DedupeFind.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -63,7 +63,8 @@ class CRM_Contact_Page_DedupeFind extends CRM_Core_Page_Basic {
$limit = CRM_Utils_Request::retrieve('limit', 'Integer', $this);
$rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this);
$cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this, FALSE, 0);
- $criteria = CRM_Utils_Request::retrieve('criteria', 'Json', $this, FALSE);
+
+ $criteria = CRM_Utils_Request::retrieve('criteria', 'Json', $this, FALSE, '{}');
$this->assign('criteria', $criteria);
$isConflictMode = ($context == 'conflicts');
diff --git a/civicrm/CRM/Contact/Page/DedupeMerge.php b/civicrm/CRM/Contact/Page/DedupeMerge.php
index d006a725bee3acf21cd23dfc4b09c9c29a55b260..68ea12a3f0fbb49d260a2d3cd41bdc575d3071f4 100644
--- a/civicrm/CRM/Contact/Page/DedupeMerge.php
+++ b/civicrm/CRM/Contact/Page/DedupeMerge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -52,13 +52,13 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page {
* Build a queue of tasks by dividing dupe pairs in batches.
*/
public static function getRunner() {
+
$rgid = CRM_Utils_Request::retrieveValue('rgid', 'Positive');
$gid = CRM_Utils_Request::retrieveValue('gid', 'Positive');
$limit = CRM_Utils_Request::retrieveValue('limit', 'Positive');
$action = CRM_Utils_Request::retrieveValue('action', 'String');
$mode = CRM_Utils_Request::retrieveValue('mode', 'String', 'safe');
-
- $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid);
+ $criteria = CRM_Utils_Request::retrieve('criteria', 'Json', $null, FALSE, '{}');
$urlQry = array(
'reset' => 1,
@@ -66,8 +66,12 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page {
'rgid' => $rgid,
'gid' => $gid,
'limit' => $limit,
+ 'criteria' => $criteria,
);
+ $criteria = json_decode($criteria, TRUE);
+ $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid, $criteria);
+
if ($mode == 'aggressive' && !CRM_Core_Permission::check('force merge duplicate contacts')) {
CRM_Core_Session::setStatus(ts('You do not have permission to force merge duplicate contact records'), ts('Permission Denied'), 'error');
CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/dedupefind', $urlQry));
@@ -101,7 +105,7 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page {
for ($i = 1; $i <= ceil($total / self::BATCHLIMIT); $i++) {
$task = new CRM_Queue_Task(
array('CRM_Contact_Page_DedupeMerge', 'callBatchMerge'),
- array($rgid, $gid, $mode, self::BATCHLIMIT, $isSelected),
+ array($rgid, $gid, $mode, self::BATCHLIMIT, $isSelected, $criteria),
"Processed " . $i * self::BATCHLIMIT . " pair of duplicates out of " . $total
);
@@ -131,11 +135,12 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page {
* 'safe' mode or 'force' mode.
* @param int $batchLimit
* @param int $isSelected
+ * @param array $criteria
*
* @return int
*/
- public static function callBatchMerge(CRM_Queue_TaskContext $ctx, $rgid, $gid, $mode = 'safe', $batchLimit, $isSelected) {
- CRM_Dedupe_Merger::batchMerge($rgid, $gid, $mode, $batchLimit, $isSelected);
+ public static function callBatchMerge(CRM_Queue_TaskContext $ctx, $rgid, $gid, $mode = 'safe', $batchLimit, $isSelected, $criteria) {
+ CRM_Dedupe_Merger::batchMerge($rgid, $gid, $mode, $batchLimit, $isSelected, $criteria);
return CRM_Queue_Task::TASK_SUCCESS;
}
diff --git a/civicrm/CRM/Contact/Page/DedupeRules.php b/civicrm/CRM/Contact/Page/DedupeRules.php
index 31043f6a695d52b6799d3123ea4b39510c5952e7..ac21c9ce79aaa5e0e0de18e240680466c35a821a 100644
--- a/civicrm/CRM/Contact/Page/DedupeRules.php
+++ b/civicrm/CRM/Contact/Page/DedupeRules.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/ImageFile.php b/civicrm/CRM/Contact/Page/ImageFile.php
index da9160ce16c065fbcab83fdce79c98fea9beec1f..411e07a1b0611cb23d8ee57e44437e90ea9cdbe2 100644
--- a/civicrm/CRM/Contact/Page/ImageFile.php
+++ b/civicrm/CRM/Contact/Page/ImageFile.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/Actions.php b/civicrm/CRM/Contact/Page/Inline/Actions.php
index 3d6c79335e7a17d622b7834d51e170f415ec8281..17b0ffa0e6aee3098b9c853cf8f651eec1c48056 100644
--- a/civicrm/CRM/Contact/Page/Inline/Actions.php
+++ b/civicrm/CRM/Contact/Page/Inline/Actions.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/Address.php b/civicrm/CRM/Contact/Page/Inline/Address.php
index 750eed9134120348ab4b78493f6a2b3219795b97..323ceaf4687ecd15dbcf8d4473830fa68cc8719f 100644
--- a/civicrm/CRM/Contact/Page/Inline/Address.php
+++ b/civicrm/CRM/Contact/Page/Inline/Address.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/CommunicationPreferences.php b/civicrm/CRM/Contact/Page/Inline/CommunicationPreferences.php
index b350399d29f6a8a9664981b022f8d6bad890f3d0..2af031f45aee647e2c298d6028bc9df7a85a962f 100644
--- a/civicrm/CRM/Contact/Page/Inline/CommunicationPreferences.php
+++ b/civicrm/CRM/Contact/Page/Inline/CommunicationPreferences.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/ContactInfo.php b/civicrm/CRM/Contact/Page/Inline/ContactInfo.php
index 0675aaee2f3dfea719c651babb1d09903576531d..519beae333fa6a6abc502d222a38866613b37983 100644
--- a/civicrm/CRM/Contact/Page/Inline/ContactInfo.php
+++ b/civicrm/CRM/Contact/Page/Inline/ContactInfo.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/ContactName.php b/civicrm/CRM/Contact/Page/Inline/ContactName.php
index d2041c2f83b64506eb374388303e2d981b39bd96..9036570af67dda0c167ab05adc82ad3f8ffb8170 100644
--- a/civicrm/CRM/Contact/Page/Inline/ContactName.php
+++ b/civicrm/CRM/Contact/Page/Inline/ContactName.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/CustomData.php b/civicrm/CRM/Contact/Page/Inline/CustomData.php
index 992df754dceb0b35d51f5fd9dde088b6612fa2ee..9e1033a45279a3e32b131f30f51d37fb60d59322 100644
--- a/civicrm/CRM/Contact/Page/Inline/CustomData.php
+++ b/civicrm/CRM/Contact/Page/Inline/CustomData.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/Demographics.php b/civicrm/CRM/Contact/Page/Inline/Demographics.php
index cbdd0803219505ffdfe57b44f51db987c4251439..c074ce3645c9fb30f9447caf3ba5eae403e787f2 100644
--- a/civicrm/CRM/Contact/Page/Inline/Demographics.php
+++ b/civicrm/CRM/Contact/Page/Inline/Demographics.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/Email.php b/civicrm/CRM/Contact/Page/Inline/Email.php
index da710a455e5f5e453085007582103429c837dea0..7904da5245eec9c7ab4d5c9540caa2f5e1e3858a 100644
--- a/civicrm/CRM/Contact/Page/Inline/Email.php
+++ b/civicrm/CRM/Contact/Page/Inline/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/IM.php b/civicrm/CRM/Contact/Page/Inline/IM.php
index be30a38654a8859c0f0b8f11e8814bff5c89446f..fdbba1b90c2e59aadda5dc15025e3e205bc55e29 100644
--- a/civicrm/CRM/Contact/Page/Inline/IM.php
+++ b/civicrm/CRM/Contact/Page/Inline/IM.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/OpenID.php b/civicrm/CRM/Contact/Page/Inline/OpenID.php
index 604ba943af2cafdf92224368fd0882839ca0dc6e..6b73d4dc6d835bef2aadfb735b3b5e9f1d706f76 100644
--- a/civicrm/CRM/Contact/Page/Inline/OpenID.php
+++ b/civicrm/CRM/Contact/Page/Inline/OpenID.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/Phone.php b/civicrm/CRM/Contact/Page/Inline/Phone.php
index 098398086e222d502be9bbb92b9e90020f462741..97697f0a62e332d56e061f4f4323d847f2502a7c 100644
--- a/civicrm/CRM/Contact/Page/Inline/Phone.php
+++ b/civicrm/CRM/Contact/Page/Inline/Phone.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Inline/Website.php b/civicrm/CRM/Contact/Page/Inline/Website.php
index 115fd4c1e78ec8a91ef43d84566a91c313e9943b..d8392cc1eab0ee26e3bea3a16cc0d99e51a4481e 100644
--- a/civicrm/CRM/Contact/Page/Inline/Website.php
+++ b/civicrm/CRM/Contact/Page/Inline/Website.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/SavedSearch.php b/civicrm/CRM/Contact/Page/SavedSearch.php
index aef27eab69461a72f706fc56494340deb5471cc4..ed8fedd4a2b16086c9c1cd04f93f006440ba088d 100644
--- a/civicrm/CRM/Contact/Page/SavedSearch.php
+++ b/civicrm/CRM/Contact/Page/SavedSearch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/Task.php b/civicrm/CRM/Contact/Page/Task.php
index ad973863982f1c9aa54594ca9372e872404255cb..b251a15bec081c30af82881ffad54f16b5dfd157 100644
--- a/civicrm/CRM/Contact/Page/Task.php
+++ b/civicrm/CRM/Contact/Page/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View.php b/civicrm/CRM/Contact/Page/View.php
index 97626fa0f71d0833d73f9e025a1c14b26c3694d4..aded97985116dd3ad3661141257d4dd9b9c47be2 100644
--- a/civicrm/CRM/Contact/Page/View.php
+++ b/civicrm/CRM/Contact/Page/View.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php b/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php
index 22509868466c257dfd69cc2eefee1139a424f7b3..27cda0e2cff01830b4de68fa61681565a66c5fe1 100644
--- a/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php
+++ b/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/CustomData.php b/civicrm/CRM/Contact/Page/View/CustomData.php
index ff5e63d001e09cf885bae3417794245a214348af..334b04a735589d24875b50ac501b626b491f42e1 100644
--- a/civicrm/CRM/Contact/Page/View/CustomData.php
+++ b/civicrm/CRM/Contact/Page/View/CustomData.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/GroupContact.php b/civicrm/CRM/Contact/Page/View/GroupContact.php
index 34d992d24c47a7fc3d5794e826142447507ab83a..98333fec8719013b25d4e8ff36dcd658a2d163c5 100644
--- a/civicrm/CRM/Contact/Page/View/GroupContact.php
+++ b/civicrm/CRM/Contact/Page/View/GroupContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/Log.php b/civicrm/CRM/Contact/Page/View/Log.php
index 0fb42a1f0bb82c61cbb17a0fae65120e424c6867..e6e71bcc28d415be26e27edba05fba85a6fcf224 100644
--- a/civicrm/CRM/Contact/Page/View/Log.php
+++ b/civicrm/CRM/Contact/Page/View/Log.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/Note.php b/civicrm/CRM/Contact/Page/View/Note.php
index 7efa147d2f7645bd9e369cf9255f61a2b8650f10..73701de885c7e2ce6cba72422a07ede53fd1adcb 100644
--- a/civicrm/CRM/Contact/Page/View/Note.php
+++ b/civicrm/CRM/Contact/Page/View/Note.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/Print.php b/civicrm/CRM/Contact/Page/View/Print.php
index 28080a70ba22201d2f4c3df4679c49c909a5d70e..65e1ad5c25d2e5fd832c2d8a264ac151cc417bbe 100644
--- a/civicrm/CRM/Contact/Page/View/Print.php
+++ b/civicrm/CRM/Contact/Page/View/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/Relationship.php b/civicrm/CRM/Contact/Page/View/Relationship.php
index 65ab9d63d4bac0067d0f3f157f7db11a97da4987..6d96633f3715d72acce4c5ad378d93d7facc7808 100644
--- a/civicrm/CRM/Contact/Page/View/Relationship.php
+++ b/civicrm/CRM/Contact/Page/View/Relationship.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/Summary.php b/civicrm/CRM/Contact/Page/View/Summary.php
index 783f27195d6371bd1771dcbca76fc692f67c7b67..d41da69d8f866a77dadcc5bd554470e1eb888d0d 100644
--- a/civicrm/CRM/Contact/Page/View/Summary.php
+++ b/civicrm/CRM/Contact/Page/View/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/Tag.php b/civicrm/CRM/Contact/Page/View/Tag.php
index 07ee2e947251a0f1b23892feb65de8ba4d9f23be..db488b136f322a174241ef204aade61911dc60c6 100644
--- a/civicrm/CRM/Contact/Page/View/Tag.php
+++ b/civicrm/CRM/Contact/Page/View/Tag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/UserDashBoard.php b/civicrm/CRM/Contact/Page/View/UserDashBoard.php
index f6b1c62dd34b4cfa6f344b73213fcd9519a1d785..585a481b459fbfbeea2ec44075bfdafc17f0b787 100644
--- a/civicrm/CRM/Contact/Page/View/UserDashBoard.php
+++ b/civicrm/CRM/Contact/Page/View/UserDashBoard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php b/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php
index 0ffb902c35dcd0f842ea692c17ec939852bcf151..a2107da9d943942629f9cd8afa33ed54cd36313b 100644
--- a/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php
+++ b/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/Useradd.php b/civicrm/CRM/Contact/Page/View/Useradd.php
index b2cdc67ffe06b4298a3c24ee1e3f32a226e7b32c..cda95f20faef345097b2fb81da33f38a68ffc8fa 100644
--- a/civicrm/CRM/Contact/Page/View/Useradd.php
+++ b/civicrm/CRM/Contact/Page/View/Useradd.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Page/View/Vcard.php b/civicrm/CRM/Contact/Page/View/Vcard.php
index eccfc76c942ff5c08d2f68f661ee3df6f6c8c14b..8c8e49d78f319ab534a7bbd4ae654710cdf1a8bf 100644
--- a/civicrm/CRM/Contact/Page/View/Vcard.php
+++ b/civicrm/CRM/Contact/Page/View/Vcard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Selector.php b/civicrm/CRM/Contact/Selector.php
index 2410f41fb838d14985a95f8787427886035ee2d2..a4145e062044d80c45fb6f21a4720d9497d23078 100644
--- a/civicrm/CRM/Contact/Selector.php
+++ b/civicrm/CRM/Contact/Selector.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Selector/Controller.php b/civicrm/CRM/Contact/Selector/Controller.php
index 09af0988eff04c1a0261e91b0e03a8f7a8b85f65..d6beef2cd78f5916b344bfeb8736751b2e2ab450 100644
--- a/civicrm/CRM/Contact/Selector/Controller.php
+++ b/civicrm/CRM/Contact/Selector/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Selector/Custom.php b/civicrm/CRM/Contact/Selector/Custom.php
index 2c95ffd9f07cf20ef5e503b7af023c645a2b0413..6c3a3923c959ca94632684f5db51ecc1001c014c 100644
--- a/civicrm/CRM/Contact/Selector/Custom.php
+++ b/civicrm/CRM/Contact/Selector/Custom.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -227,11 +227,14 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
*/
public function &getColumnHeaders($action = NULL, $output = NULL) {
$columns = $this->_search->columns();
- if ($output == CRM_Core_Selector_Controller::EXPORT) {
- return array_keys($columns);
+ $headers = array();
+ if ($output == CRM_Core_Selector_Controller::EXPORT || $output == CRM_Core_Selector_Controller::SCREEN) {
+ foreach ($columns as $name => $key) {
+ $headers[$key] = $name;
+ }
+ return $headers;
}
else {
- $headers = array();
foreach ($columns as $name => $key) {
if (!empty($name)) {
$headers[] = array(
diff --git a/civicrm/CRM/Contact/StateMachine/Search.php b/civicrm/CRM/Contact/StateMachine/Search.php
index ce90bb0d82a1bd1d9a99737387a886d4cec0582d..32c225e405229d81fb999c52c4e9e48dcd19e495 100644
--- a/civicrm/CRM/Contact/StateMachine/Search.php
+++ b/civicrm/CRM/Contact/StateMachine/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contact/Task.php b/civicrm/CRM/Contact/Task.php
index d7b32b78a6ae935806837f4a206268d374c7fa68..71cf992bdab553885112ddac440619b82f541d7f 100644
--- a/civicrm/CRM/Contact/Task.php
+++ b/civicrm/CRM/Contact/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/ActionMapping/ByPage.php b/civicrm/CRM/Contribute/ActionMapping/ByPage.php
index e56413ae0ad7da6f544cf816ff70927c9e953704..99c090c0a2618f942be3ca067654429f9d43fb23 100644
--- a/civicrm/CRM/Contribute/ActionMapping/ByPage.php
+++ b/civicrm/CRM/Contribute/ActionMapping/ByPage.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/ActionMapping/ByType.php b/civicrm/CRM/Contribute/ActionMapping/ByType.php
index 59c39829e20bb20ac20560d1b8be2212d1dd17db..e193408b71c60346a5dbc47e8e49628cf4d77627 100644
--- a/civicrm/CRM/Contribute/ActionMapping/ByType.php
+++ b/civicrm/CRM/Contribute/ActionMapping/ByType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/BAO/Contribution.php b/civicrm/CRM/Contribute/BAO/Contribution.php
index 000242ccdb3ee2e6570114cb4b266c1f0e1722de..a33168d45ab0d74fb6ce5566301e6f496fd57ddc 100644
--- a/civicrm/CRM/Contribute/BAO/Contribution.php
+++ b/civicrm/CRM/Contribute/BAO/Contribution.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -926,13 +926,18 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
if ($endDate) {
$where[] = "receive_date <= '" . CRM_Utils_Type::escape($endDate, 'Timestamp') . "'";
}
- CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes);
- if ($financialTypes) {
- $where[] = "c.financial_type_id IN (" . implode(',', array_keys($financialTypes)) . ")";
- $where[] = "i.financial_type_id IN (" . implode(',', array_keys($financialTypes)) . ")";
- }
- else {
- $where[] = "c.financial_type_id IN (0)";
+ $financialTypeACLJoin = '';
+ if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) {
+ $financialTypeACLJoin = " LEFT JOIN civicrm_line_item i ON (i.contribution_id = c.id AND i.entity_table = 'civicrm_contribution') ";
+ $financialTypes = CRM_Contribute_PseudoConstant::financialType();
+ CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes);
+ if ($financialTypes) {
+ $where[] = "c.financial_type_id IN (" . implode(',', array_keys($financialTypes)) . ")";
+ $where[] = "i.financial_type_id IN (" . implode(',', array_keys($financialTypes)) . ")";
+ }
+ else {
+ $where[] = "c.financial_type_id IN (0)";
+ }
}
$whereCond = implode(' AND ', $where);
@@ -943,7 +948,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
currency
FROM civicrm_contribution c
INNER JOIN civicrm_contact contact ON ( contact.id = c.contact_id )
-LEFT JOIN civicrm_line_item i ON ( i.contribution_id = c.id AND i.entity_table = 'civicrm_contribution' )
+ $financialTypeACLJoin
WHERE $whereCond
AND ( is_test = 0 OR is_test IS NULL )
AND contact.is_deleted = 0
diff --git a/civicrm/CRM/Contribute/BAO/Contribution/Utils.php b/civicrm/CRM/Contribute/BAO/Contribution/Utils.php
index def8d6bd906895d5fba57f2e7103b45f989ff58e..2b99789923aa5e552e4fabe7174604c8fc25159c 100644
--- a/civicrm/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/civicrm/CRM/Contribute/BAO/Contribution/Utils.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/BAO/ContributionPage.php b/civicrm/CRM/Contribute/BAO/ContributionPage.php
index cb1c47121454005a90ddcdc3e2831230d85d7771..0197f65cdcbfc50962151ca824ce34bd1d746cd1 100644
--- a/civicrm/CRM/Contribute/BAO/ContributionPage.php
+++ b/civicrm/CRM/Contribute/BAO/ContributionPage.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/BAO/ContributionRecur.php b/civicrm/CRM/Contribute/BAO/ContributionRecur.php
index 3049402ea51b6b536780dba159c4f3ce36f36948..95d99c2bef626bfda3b0f54c32e8b7618bea6b6d 100644
--- a/civicrm/CRM/Contribute/BAO/ContributionRecur.php
+++ b/civicrm/CRM/Contribute/BAO/ContributionRecur.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/BAO/ContributionSoft.php b/civicrm/CRM/Contribute/BAO/ContributionSoft.php
index acc726dfa67f9f85f517ed012b14ba5bff8239f2..e08d00ff048f4fe8cf73018177104b028ab44bd9 100644
--- a/civicrm/CRM/Contribute/BAO/ContributionSoft.php
+++ b/civicrm/CRM/Contribute/BAO/ContributionSoft.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -85,7 +85,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio
$softParams['pcp_display_in_roll'] = CRM_Utils_Array::value('pcp_display_in_roll', $pcp);
$softParams['pcp_roll_nickname'] = CRM_Utils_Array::value('pcp_roll_nickname', $pcp);
$softParams['pcp_personal_note'] = CRM_Utils_Array::value('pcp_personal_note', $pcp);
- $softParams['soft_credit_type_id'] = CRM_Core_OptionGroup::getValue('soft_credit_type', 'pcp', 'name');
+ $softParams['soft_credit_type_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_ContributionSoft', 'soft_credit_type_id', 'pcp');
$contributionSoft = self::add($softParams);
//Send notification to owner for PCP
if ($contributionSoft->pcp_id && empty($pcpId)) {
@@ -149,7 +149,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio
$honorId = NULL;
// @todo fix use of deprecated function.
- $contributionSoftParams['soft_credit_type_id'] = CRM_Core_OptionGroup::getValue('soft_credit_type', 'pcp', 'name');
+ $contributionSoftParams['soft_credit_type_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_ContributionSoft', 'soft_credit_type_id', 'pcp');
//check if there is any duplicate contact
// honoree should never be the donor
$exceptKeys = array(
diff --git a/civicrm/CRM/Contribute/BAO/ManagePremiums.php b/civicrm/CRM/Contribute/BAO/ManagePremiums.php
index f263908fef85706c55cbf43a190878bf75a2700d..7b900e4044639652a10c3980aef9213e789d613b 100644
--- a/civicrm/CRM/Contribute/BAO/ManagePremiums.php
+++ b/civicrm/CRM/Contribute/BAO/ManagePremiums.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/BAO/Premium.php b/civicrm/CRM/Contribute/BAO/Premium.php
index b8e87378f4e1f94146a80537c77cd116d93334c4..49b3bebe77c94e5f754ceeddc2b830d99405ec0e 100644
--- a/civicrm/CRM/Contribute/BAO/Premium.php
+++ b/civicrm/CRM/Contribute/BAO/Premium.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/BAO/Query.php b/civicrm/CRM/Contribute/BAO/Query.php
index 0c60a6eb758f53529054a8ab2601fd4211142f54..94aa7386664d475fbf2bda4e4458c7fc6dbb4a62 100644
--- a/civicrm/CRM/Contribute/BAO/Query.php
+++ b/civicrm/CRM/Contribute/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/BAO/Widget.php b/civicrm/CRM/Contribute/BAO/Widget.php
index 3d3e1808a994688b5e9a182783b8f951ad95e342..5c84178e7b7a6f0740aafc3e6f22bcaa71fce6ef 100644
--- a/civicrm/CRM/Contribute/BAO/Widget.php
+++ b/civicrm/CRM/Contribute/BAO/Widget.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Controller/Contribution.php b/civicrm/CRM/Contribute/Controller/Contribution.php
index d6205a11d14b304571a98504191e329a2c333915..d0fd04e7c0aa4141e5708d2ac8d08a9419e26f50 100644
--- a/civicrm/CRM/Contribute/Controller/Contribution.php
+++ b/civicrm/CRM/Contribute/Controller/Contribution.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Controller/ContributionPage.php b/civicrm/CRM/Contribute/Controller/ContributionPage.php
index e427bd26fbb389689b1cfd905d4fb701797553d5..3b0fb1c14795668f30f8f3381a012f3bdb2ab3a5 100644
--- a/civicrm/CRM/Contribute/Controller/ContributionPage.php
+++ b/civicrm/CRM/Contribute/Controller/ContributionPage.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Controller/Search.php b/civicrm/CRM/Contribute/Controller/Search.php
index 464a8584f5d06c55f6efdb3fbd2128dfed2db02f..d044d1146add173c1465d66c09cee1bd4e1330d2 100644
--- a/civicrm/CRM/Contribute/Controller/Search.php
+++ b/civicrm/CRM/Contribute/Controller/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/DAO/ContributionSoft.php b/civicrm/CRM/Contribute/DAO/ContributionSoft.php
index 5f81c2cf00ce1c16090f95d74bdf77d18430e6e5..977a00bea708ccaf79a4338ff3581bdf020eb303 100644
--- a/civicrm/CRM/Contribute/DAO/ContributionSoft.php
+++ b/civicrm/CRM/Contribute/DAO/ContributionSoft.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/ContributionSoft.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:eb1e493dc7ff4da34167ad0828d61fd4)
+ * (GenCodeChecksum:e183ac4d1412bc227a1be7975cc67b0a)
*/
/**
@@ -261,6 +261,9 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO {
'entity' => 'ContributionSoft',
'bao' => 'CRM_Contribute_BAO_ContributionSoft',
'localizable' => 0,
+ 'html' => [
+ 'type' => 'TextArea',
+ ],
],
'soft_credit_type_id' => [
'name' => 'soft_credit_type_id',
diff --git a/civicrm/CRM/Contribute/Form.php b/civicrm/CRM/Contribute/Form.php
index 82aba90ac3efab073ae4342624dccf67f311d242..dd819ba664fd25006ce9603ebb28114ab91e30d5 100644
--- a/civicrm/CRM/Contribute/Form.php
+++ b/civicrm/CRM/Contribute/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/AbstractEditPayment.php b/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
index 353bcad960e150278bc45713c5a99eb026490504..0c6b84a8cee83dbcbf62316dd50736c979c0ba1a 100644
--- a/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
+++ b/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/AdditionalInfo.php b/civicrm/CRM/Contribute/Form/AdditionalInfo.php
index 9d73e1e87944f0d72cdfc726266e8cef0f93ca25..d279d644e109ad92270bab31b114e05f96266cfb 100644
--- a/civicrm/CRM/Contribute/Form/AdditionalInfo.php
+++ b/civicrm/CRM/Contribute/Form/AdditionalInfo.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/AdditionalPayment.php b/civicrm/CRM/Contribute/Form/AdditionalPayment.php
index 77916e00fd3fef85c576ac536284808ba4626959..075206d6928222679d8cd8d21fd17392a8b1953a 100644
--- a/civicrm/CRM/Contribute/Form/AdditionalPayment.php
+++ b/civicrm/CRM/Contribute/Form/AdditionalPayment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/CancelSubscription.php b/civicrm/CRM/Contribute/Form/CancelSubscription.php
index f9227d42bca77943c6d72dd393a71c444d02f526..06941d9035bf3b4dc88c3c17ace08bfcdf8fb147 100644
--- a/civicrm/CRM/Contribute/Form/CancelSubscription.php
+++ b/civicrm/CRM/Contribute/Form/CancelSubscription.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Contribution.php b/civicrm/CRM/Contribute/Form/Contribution.php
index 07daaa7368dfe1ba3858f43dc0554ad98aff3075..6b99be29fef7549956ce24690e849cf1f568b7df 100644
--- a/civicrm/CRM/Contribute/Form/Contribution.php
+++ b/civicrm/CRM/Contribute/Form/Contribution.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Contribution/Confirm.php b/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
index a47603f86f6f10ede4d939c14a5f5bef4443ce37..17a0bd2f92bbd99c4d34af27924ccf03209e82b6 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -1279,11 +1279,12 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
$params = array('id' => $contributionSoft->pcp_id);
CRM_Core_DAO::commonRetrieve('CRM_PCP_DAO_PCP', $params, $pcpInfo);
$ownerNotifyID = CRM_Core_DAO::getFieldValue('CRM_PCP_DAO_PCPBlock', $pcpInfo['pcp_block_id'], 'owner_notify_id');
+ $ownerNotifyOption = CRM_Core_PseudoConstant::getName('CRM_PCP_DAO_PCPBlock', 'owner_notify_id', $ownerNotifyID);
- if ($ownerNotifyID != CRM_Core_OptionGroup::getValue('pcp_owner_notify', 'no_notifications', 'name') &&
- (($ownerNotifyID == CRM_Core_OptionGroup::getValue('pcp_owner_notify', 'owner_chooses', 'name') &&
+ if ($ownerNotifyOption != 'no_notifications' &&
+ (($ownerNotifyOption == 'owner_chooses' &&
CRM_Core_DAO::getFieldValue('CRM_PCP_DAO_PCP', $contributionSoft->pcp_id, 'is_notify')) ||
- $ownerNotifyID == CRM_Core_OptionGroup::getValue('pcp_owner_notify', 'all_owners', 'name'))) {
+ $ownerNotifyOption == 'all_owners')) {
$pcpInfoURL = CRM_Utils_System::url('civicrm/pcp/info',
"reset=1&id={$contributionSoft->pcp_id}",
TRUE, NULL, FALSE, TRUE
diff --git a/civicrm/CRM/Contribute/Form/Contribution/Main.php b/civicrm/CRM/Contribute/Form/Contribution/Main.php
index 5439099b60b5c081281b87d16493e58fe43aab56..da9214d221194f09085473c995870d3e5d37bd8d 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/Main.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/Main.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -484,7 +484,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
$this->addGroup($elements, 'pcp_is_anonymous', NULL, ' ');
$this->add('text', 'pcp_roll_nickname', ts('Name'), array('maxlength' => 30));
- $this->add('textarea', 'pcp_personal_note', ts('Personal Note'), array('style' => 'height: 3em; width: 40em;'));
+ $this->addField('pcp_personal_note', array('entity' => 'ContributionSoft', 'context' => 'create', 'style' => 'height: 3em; width: 40em;'));
}
}
if (empty($this->_values['fee']) && empty($this->_ccid)) {
diff --git a/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php b/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
index 4a0cd690bffaa62fb4f9d31c58f96e293acca1cc..76245be96a8828fba4aee67ebb0ccacc614c1e7c 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionBase.php b/civicrm/CRM/Contribute/Form/ContributionBase.php
index a94e06a65200ab2fb8a6ca40c65b910e4fd3db32..97a06e145ce4f0c404de754dc6e69920dd8ff68c 100644
--- a/civicrm/CRM/Contribute/Form/ContributionBase.php
+++ b/civicrm/CRM/Contribute/Form/ContributionBase.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionCharts.php b/civicrm/CRM/Contribute/Form/ContributionCharts.php
index 3642e11ba84403235a2f8506c2b53ffacdb6e226..56002dbce175f94a7873c557093fef7e0e2c3614 100644
--- a/civicrm/CRM/Contribute/Form/ContributionCharts.php
+++ b/civicrm/CRM/Contribute/Form/ContributionCharts.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage.php b/civicrm/CRM/Contribute/Form/ContributionPage.php
index 138e98bb41db353908fe5199a85cd3e4fe5e361b..238353ca077d2d350f858326475e5e03f895da14 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/AddProduct.php b/civicrm/CRM/Contribute/Form/ContributionPage/AddProduct.php
index 4356c6598b2bd93cf9b6a5f2eebdcc9b18a91aae..cf3b8055157e5cb1f705a68c7720e239e25b08fb 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/AddProduct.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/AddProduct.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php b/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php
index be1caea309c47a88d608db867fab9ee6e06b7d90..fc6486c24fd91fde50f3b44ee9344c50f4f56519 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -423,17 +423,6 @@ class CRM_Contribute_Form_ContributionPage_Amount extends CRM_Contribute_Form_Co
$errors['payment_processor'] = ts("Financial Account of account relationship of 'Expense Account is' is not configured for Financial Type : ") . $financialType;
}
- if (!empty($fields['is_recur_interval'])) {
- foreach (array_keys($fields['payment_processor']) as $paymentProcessorID) {
- $paymentProcessorTypeId = CRM_Core_DAO::getFieldValue(
- 'CRM_Financial_DAO_PaymentProcessor',
- $paymentProcessorID,
- 'payment_processor_type_id'
- );
- $paymentProcessorType = CRM_Core_PseudoConstant::paymentProcessorType(FALSE, $paymentProcessorTypeId, 'name');
- }
- }
-
return $errors;
}
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Custom.php b/civicrm/CRM/Contribute/Form/ContributionPage/Custom.php
index c22f1e23874344545dd77cb61c32c13981e01f2c..931475d1cad4439cf28aa648ad89fad485385fde 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Custom.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Custom.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Delete.php b/civicrm/CRM/Contribute/Form/ContributionPage/Delete.php
index 486f5021bd9d1c67e532c7d1c504658370a9dbea..9ef7b0065bdd03da9afce66643c2807217a2a432 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Delete.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Premium.php b/civicrm/CRM/Contribute/Form/ContributionPage/Premium.php
index 017b6f88134a9f8dfc3a1845ab3f6210f8108278..f8c2bd30e311c4c4c9ba82a476c0f72b6b88af81 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Premium.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Premium.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Settings.php b/civicrm/CRM/Contribute/Form/ContributionPage/Settings.php
index a69e654ad295d72b45172d1764d8375b0313a20e..49e595bfec0a967e5d6205e239d53395a9893df7 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Settings.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Settings.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php b/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php
index bc5f0e9b2414bae692b2b40f61e4f1b4bd3d72ee..cd8611c404edaf5cbfd44aae26f8cbba07d768b8 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/ThankYou.php b/civicrm/CRM/Contribute/Form/ContributionPage/ThankYou.php
index dee7eb1f21408cb6c011b1977d5d2ce7aa5a2329..b055103a0704e39a8bc04e4aa2de9e84256c58f2 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/ThankYou.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/ThankYou.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php b/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php
index 09bb4b2416026db966882d80eb921b51bda3fe42..df8905af0af200bc94ebe9fb20eba394b6e169b0 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ContributionView.php b/civicrm/CRM/Contribute/Form/ContributionView.php
index 50752ca04863988e782b157e3a4c284372d55475..b70a1eabefa7d309eff118d7f47c1408560082ab 100644
--- a/civicrm/CRM/Contribute/Form/ContributionView.php
+++ b/civicrm/CRM/Contribute/Form/ContributionView.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/ManagePremiums.php b/civicrm/CRM/Contribute/Form/ManagePremiums.php
index 17ae8ffe42bfef593eaa2e63b3314059c30e9861..8ac350b9c6a80e53aab8a51b4ded0519c1857972 100644
--- a/civicrm/CRM/Contribute/Form/ManagePremiums.php
+++ b/civicrm/CRM/Contribute/Form/ManagePremiums.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Search.php b/civicrm/CRM/Contribute/Form/Search.php
index c3100a2e53752ff0f9e4f7e2a612dc6a7c96ab22..7fa4f02bf0bc317b3fa6fb08afa4213bfb5a7d9b 100644
--- a/civicrm/CRM/Contribute/Form/Search.php
+++ b/civicrm/CRM/Contribute/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/SearchContribution.php b/civicrm/CRM/Contribute/Form/SearchContribution.php
index d49ccc9cd9e7479f4ebe10504edee28457325c42..729f5ca30d687a845f574b307295ea6654508d85 100644
--- a/civicrm/CRM/Contribute/Form/SearchContribution.php
+++ b/civicrm/CRM/Contribute/Form/SearchContribution.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/SoftCredit.php b/civicrm/CRM/Contribute/Form/SoftCredit.php
index f5de070e47723d089e20d32aecab98ff3a34e770..c1bbd1b5e473904b72b2397ca1480cc977f07f7c 100644
--- a/civicrm/CRM/Contribute/Form/SoftCredit.php
+++ b/civicrm/CRM/Contribute/Form/SoftCredit.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task.php b/civicrm/CRM/Contribute/Form/Task.php
index dc53ce711cb126ddcbcf79c474a5d5bcb8d7f529..dbfb3976e28afcd2f61335b7947ce6e95c038ad3 100644
--- a/civicrm/CRM/Contribute/Form/Task.php
+++ b/civicrm/CRM/Contribute/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/Batch.php b/civicrm/CRM/Contribute/Form/Task/Batch.php
index 95fd0be3d6e596056354225b5ae61462fa536ff5..4563e86e503c18760ddfe4a47c1f5e05b41f524d 100644
--- a/civicrm/CRM/Contribute/Form/Task/Batch.php
+++ b/civicrm/CRM/Contribute/Form/Task/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -206,6 +206,9 @@ class CRM_Contribute_Form_Task_Batch extends CRM_Contribute_Form_Task {
*/
public function postProcess() {
$params = $this->exportValues();
+ // @todo extract submit functions &
+ // extend CRM_Event_Form_Task_BatchTest::testSubmit with a data provider to test
+ // handling of custom data, specifically checkbox fields.
if (isset($params['field'])) {
foreach ($params['field'] as $contributionID => $value) {
diff --git a/civicrm/CRM/Contribute/Form/Task/Delete.php b/civicrm/CRM/Contribute/Form/Task/Delete.php
index c51fdc9d7e7497fc305c2f19b35494b787137699..49e942e875d71df46740028c35e232ce505e8b2d 100644
--- a/civicrm/CRM/Contribute/Form/Task/Delete.php
+++ b/civicrm/CRM/Contribute/Form/Task/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/Email.php b/civicrm/CRM/Contribute/Form/Task/Email.php
index 22688109015efb25a071e915ab4149681f3b2f38..57ddee0ba47b385b6b3974097b2683be2a8c51d7 100644
--- a/civicrm/CRM/Contribute/Form/Task/Email.php
+++ b/civicrm/CRM/Contribute/Form/Task/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/Invoice.php b/civicrm/CRM/Contribute/Form/Task/Invoice.php
index 495bc32c9baa9ff9f35544ada71c6bcb42596c2d..5395aed2cd5a33f92540a17ee37caa85c7231647 100644
--- a/civicrm/CRM/Contribute/Form/Task/Invoice.php
+++ b/civicrm/CRM/Contribute/Form/Task/Invoice.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/PDF.php b/civicrm/CRM/Contribute/Form/Task/PDF.php
index eab146007d57f323bc0fd5dd33b474d0fd903744..70356166e8714a541192d13731d4b4f15bef282d 100644
--- a/civicrm/CRM/Contribute/Form/Task/PDF.php
+++ b/civicrm/CRM/Contribute/Form/Task/PDF.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/PDFLetter.php b/civicrm/CRM/Contribute/Form/Task/PDFLetter.php
index 3945fc97f8e3c86e20fb6fafc208984ccdb36d81..5502b297dcc7ab5353b50b65f31f1fcb57296c21 100644
--- a/civicrm/CRM/Contribute/Form/Task/PDFLetter.php
+++ b/civicrm/CRM/Contribute/Form/Task/PDFLetter.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/PickProfile.php b/civicrm/CRM/Contribute/Form/Task/PickProfile.php
index cad493a3c7fe7b165941b4eb7db62836cc50851d..ec683c1e80aeeb069c5e402be4469282dc3ccd0d 100644
--- a/civicrm/CRM/Contribute/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Contribute/Form/Task/PickProfile.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/Print.php b/civicrm/CRM/Contribute/Form/Task/Print.php
index acc122b8d8019afc54dcad9804550789d4a41a2a..b099fa48f702ce37b4c7e53376569c8f7fd0412e 100644
--- a/civicrm/CRM/Contribute/Form/Task/Print.php
+++ b/civicrm/CRM/Contribute/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/Result.php b/civicrm/CRM/Contribute/Form/Task/Result.php
index 907ab5c3cf26e645a732e5442b67a2ba9273efc5..048662928316a5e937a1abfdd15e2830c5e4f2a6 100644
--- a/civicrm/CRM/Contribute/Form/Task/Result.php
+++ b/civicrm/CRM/Contribute/Form/Task/Result.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Contribute/Form/Task/SearchTaskHookSample.php
index 60f456e922d8593ef70351c7ffc9a5d12a8c69fa..8edb6db138ba9f84990396e85e402aa2f15e00cf 100644
--- a/civicrm/CRM/Contribute/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Contribute/Form/Task/SearchTaskHookSample.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/Task/Status.php b/civicrm/CRM/Contribute/Form/Task/Status.php
index 13e7f6c0f78e8a9104c44aa24da99beb1d1e1a9a..d330e42fac22782e2d747dc83b72d79722df5edf 100644
--- a/civicrm/CRM/Contribute/Form/Task/Status.php
+++ b/civicrm/CRM/Contribute/Form/Task/Status.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/UpdateBilling.php b/civicrm/CRM/Contribute/Form/UpdateBilling.php
index 1aba1d1b6a34d64f00c1b4b18e3cd6bfc5c36210..73a2b9b0b069bfbcaf36c76e757d9e24b24bb4c6 100644
--- a/civicrm/CRM/Contribute/Form/UpdateBilling.php
+++ b/civicrm/CRM/Contribute/Form/UpdateBilling.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Form/UpdateSubscription.php b/civicrm/CRM/Contribute/Form/UpdateSubscription.php
index a1c90737b4b26101397daf7b15aef72c9514742d..31907156ec9a89ab7b5611d837b91cd53e674e4a 100644
--- a/civicrm/CRM/Contribute/Form/UpdateSubscription.php
+++ b/civicrm/CRM/Contribute/Form/UpdateSubscription.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Import/Controller.php b/civicrm/CRM/Contribute/Import/Controller.php
index 0a09843534b062ba6c85737a7a384e93b092b83c..1fec489254227e0ef0cc06ad8696e39be0cd1499 100644
--- a/civicrm/CRM/Contribute/Import/Controller.php
+++ b/civicrm/CRM/Contribute/Import/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Import/Field.php b/civicrm/CRM/Contribute/Import/Field.php
index 6ab5b41cc3da304646de1802c903e3a1348abaa2..c618402ff7204d1931295b97991901e9a6948757 100644
--- a/civicrm/CRM/Contribute/Import/Field.php
+++ b/civicrm/CRM/Contribute/Import/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Import/Form/DataSource.php b/civicrm/CRM/Contribute/Import/Form/DataSource.php
index a0159b5ebcd091002529f9b17335c0b7d152ccdd..f2dc9fa714dec48d2c5abfc914ffcf7998a0b060 100644
--- a/civicrm/CRM/Contribute/Import/Form/DataSource.php
+++ b/civicrm/CRM/Contribute/Import/Form/DataSource.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Import/Form/MapField.php b/civicrm/CRM/Contribute/Import/Form/MapField.php
index d8f1eac5198f2c09e0b7a6265c2cd31e36d67006..4ca87d8774d5b8fe87a1ba18d6baef0160998439 100644
--- a/civicrm/CRM/Contribute/Import/Form/MapField.php
+++ b/civicrm/CRM/Contribute/Import/Form/MapField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Import/Form/Preview.php b/civicrm/CRM/Contribute/Import/Form/Preview.php
index ccc66456318244b918a335e7ecb1f20f2eda777c..f03c2f16d302cff3a89a1b34043870bae4bd6ee3 100644
--- a/civicrm/CRM/Contribute/Import/Form/Preview.php
+++ b/civicrm/CRM/Contribute/Import/Form/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Import/Form/Summary.php b/civicrm/CRM/Contribute/Import/Form/Summary.php
index 68511dfdbe49a0d18d4345c637f141a565b98b06..fd680da9e6b0f337d2d5fc537e2da24dfdb63446 100644
--- a/civicrm/CRM/Contribute/Import/Form/Summary.php
+++ b/civicrm/CRM/Contribute/Import/Form/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Import/Parser.php b/civicrm/CRM/Contribute/Import/Parser.php
index 8d86fcb3300567c9c22017f214c0f1c16f731c21..bdd5962a34cf8e168bc02b524334f0264061325c 100644
--- a/civicrm/CRM/Contribute/Import/Parser.php
+++ b/civicrm/CRM/Contribute/Import/Parser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Import/Parser/Contribution.php b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
index 0e22418d61931f0278fc83cc2904991712ad0696..2ca4c314b8d6e9b3a38cbac741d707270fb9af94 100644
--- a/civicrm/CRM/Contribute/Import/Parser/Contribution.php
+++ b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Info.php b/civicrm/CRM/Contribute/Info.php
index 8c6304632d64428e5911e50d5ee1eb14dd7e3d04..41f03e46b42c74517a3b2858339d40d9f00f8cfd 100644
--- a/civicrm/CRM/Contribute/Info.php
+++ b/civicrm/CRM/Contribute/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/AJAX.php b/civicrm/CRM/Contribute/Page/AJAX.php
index ef0e696d10e04be7d9c48fb9b78ef55d77042a73..78fa36d714226bcc0784aeeb82a38d4024af9ca5 100644
--- a/civicrm/CRM/Contribute/Page/AJAX.php
+++ b/civicrm/CRM/Contribute/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/ContributionPage.php b/civicrm/CRM/Contribute/Page/ContributionPage.php
index 505c9b0418ead55b0d50f7a42f9178ff7e1dfc36..77b28a1dbeeae10c8753a3bfbd3b479764b0cb17 100644
--- a/civicrm/CRM/Contribute/Page/ContributionPage.php
+++ b/civicrm/CRM/Contribute/Page/ContributionPage.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/ContributionRecur.php b/civicrm/CRM/Contribute/Page/ContributionRecur.php
index a2c746a828df9c856dea7e2542cb143ce8194aab..84ba834139ac0c3db5d4f0523065cabe684f8a95 100644
--- a/civicrm/CRM/Contribute/Page/ContributionRecur.php
+++ b/civicrm/CRM/Contribute/Page/ContributionRecur.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/DashBoard.php b/civicrm/CRM/Contribute/Page/DashBoard.php
index c3bee31f183480b489d4b3b2c73c09d906dfd134..244ba72482a822af84b61cd9336cbd1b2534294e 100644
--- a/civicrm/CRM/Contribute/Page/DashBoard.php
+++ b/civicrm/CRM/Contribute/Page/DashBoard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/ManagePremiums.php b/civicrm/CRM/Contribute/Page/ManagePremiums.php
index 3b6fa4a1288e9f1839244a729c76b179506fa7d1..d4abc4dcd014775bcd98dc11a43f218eeee01991 100644
--- a/civicrm/CRM/Contribute/Page/ManagePremiums.php
+++ b/civicrm/CRM/Contribute/Page/ManagePremiums.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/PaymentInfo.php b/civicrm/CRM/Contribute/Page/PaymentInfo.php
index 1824edfb4bbaf1128dfe3d387453ce44a6d574e3..7fb1b4d4e55d96cc38a3eab85aa46d728cca0b06 100644
--- a/civicrm/CRM/Contribute/Page/PaymentInfo.php
+++ b/civicrm/CRM/Contribute/Page/PaymentInfo.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/Premium.php b/civicrm/CRM/Contribute/Page/Premium.php
index 7f75a9dae31bdf810d32e555f3701acee16f53e3..3a61d21ed0dc48929179a425479387bdf9014460 100644
--- a/civicrm/CRM/Contribute/Page/Premium.php
+++ b/civicrm/CRM/Contribute/Page/Premium.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/SubscriptionStatus.php b/civicrm/CRM/Contribute/Page/SubscriptionStatus.php
index 228e25038982d5bd56b728dc9cf4d2e525aec97f..5f6c0145b49bb6b78543661ebe13c0d5d4360c9d 100644
--- a/civicrm/CRM/Contribute/Page/SubscriptionStatus.php
+++ b/civicrm/CRM/Contribute/Page/SubscriptionStatus.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/Tab.php b/civicrm/CRM/Contribute/Page/Tab.php
index 52026bf13321125fbf8e7a7ee281b26b83cfbd53..9e7f2eedba7988d0372930a445118bf885170fc6 100644
--- a/civicrm/CRM/Contribute/Page/Tab.php
+++ b/civicrm/CRM/Contribute/Page/Tab.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Page/UserDashboard.php b/civicrm/CRM/Contribute/Page/UserDashboard.php
index efad130378ceff7e99bf96cba3d522f841ac664a..2b4687f234c5daedf0401a7ba530cbaad87f06bc 100644
--- a/civicrm/CRM/Contribute/Page/UserDashboard.php
+++ b/civicrm/CRM/Contribute/Page/UserDashboard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/PseudoConstant.php b/civicrm/CRM/Contribute/PseudoConstant.php
index c2b95a9aeee62c4e59f738540f9ea3ff4fe6ca06..8373687ac8807037b686ccef8723139572f8c4df 100644
--- a/civicrm/CRM/Contribute/PseudoConstant.php
+++ b/civicrm/CRM/Contribute/PseudoConstant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Selector/Search.php b/civicrm/CRM/Contribute/Selector/Search.php
index 6837bd26593331bbed294093791a89694e70e038..2a4584fe1747511655297348dd3c44f28396f826 100644
--- a/civicrm/CRM/Contribute/Selector/Search.php
+++ b/civicrm/CRM/Contribute/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/StateMachine/Contribution.php b/civicrm/CRM/Contribute/StateMachine/Contribution.php
index b094ccb0786bfa8361b4953bab8cdb09b81119c8..26c491a7286c89a530309248f4963d77854144d2 100644
--- a/civicrm/CRM/Contribute/StateMachine/Contribution.php
+++ b/civicrm/CRM/Contribute/StateMachine/Contribution.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/StateMachine/ContributionPage.php b/civicrm/CRM/Contribute/StateMachine/ContributionPage.php
index 0a7cea692e124371f21a59b87bd07c03d0c6d739..a7971b967a9e31364b16c6200b2fbdd9ae8b35f7 100644
--- a/civicrm/CRM/Contribute/StateMachine/ContributionPage.php
+++ b/civicrm/CRM/Contribute/StateMachine/ContributionPage.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/StateMachine/Search.php b/civicrm/CRM/Contribute/StateMachine/Search.php
index a2f0107bba68ce27dd2d79c46887b498f3cb4296..a1989135d674e9bf8ed3f623abb16c38a1b7dade 100644
--- a/civicrm/CRM/Contribute/StateMachine/Search.php
+++ b/civicrm/CRM/Contribute/StateMachine/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Task.php b/civicrm/CRM/Contribute/Task.php
index a5debaa6572c6e11129a7184b3bf56c69d4922e9..e30a28404988313a41d98609b16f2a907f2f27e5 100644
--- a/civicrm/CRM/Contribute/Task.php
+++ b/civicrm/CRM/Contribute/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Contribute/Tokens.php b/civicrm/CRM/Contribute/Tokens.php
index e85f08effa046a9d4daf2c8dd1753a81b7e1a5f1..2e27094620f64a7116d5914fdcaabb8b08a6d26f 100644
--- a/civicrm/CRM/Contribute/Tokens.php
+++ b/civicrm/CRM/Contribute/Tokens.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Action.php b/civicrm/CRM/Core/Action.php
index b4095b83bf32c011d69f1cf7ac7753159bf36e0c..8381d7d0224e04a086e5e01320467b6570fdea35 100644
--- a/civicrm/CRM/Core/Action.php
+++ b/civicrm/CRM/Core/Action.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/ActionLog.php b/civicrm/CRM/Core/BAO/ActionLog.php
index 77c67ee2739d30d3b15ef2c2ac21aaffba62b027..b4ee5997c969273009ec2f61b1384f8d70a8c8f2 100644
--- a/civicrm/CRM/Core/BAO/ActionLog.php
+++ b/civicrm/CRM/Core/BAO/ActionLog.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/ActionSchedule.php b/civicrm/CRM/Core/BAO/ActionSchedule.php
index eeaebf4c9e3ed0f1c258c1452fb60d5cb45a7c9c..a71dae53ea7e6b6e2b1dd6498e246c4fb8b92898 100644
--- a/civicrm/CRM/Core/BAO/ActionSchedule.php
+++ b/civicrm/CRM/Core/BAO/ActionSchedule.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Address.php b/civicrm/CRM/Core/BAO/Address.php
index 0d19ca5b68b797f4307e88e21099deca2f19bcfa..a1141500015fa6454e3c08404a38ecaf56855c2f 100644
--- a/civicrm/CRM/Core/BAO/Address.php
+++ b/civicrm/CRM/Core/BAO/Address.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Block.php b/civicrm/CRM/Core/BAO/Block.php
index b3052fea75a77152a4e3e52854d1a7c45a8f5c2f..d192d077affbb262b3df61652c0663cebf6f438f 100644
--- a/civicrm/CRM/Core/BAO/Block.php
+++ b/civicrm/CRM/Core/BAO/Block.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/CMSUser.php b/civicrm/CRM/Core/BAO/CMSUser.php
index 5df962260c16c9c009554ce56fd907e51df36d71..b97e6c7c55581eb7a351eabdf24b5ea154d5c057 100644
--- a/civicrm/CRM/Core/BAO/CMSUser.php
+++ b/civicrm/CRM/Core/BAO/CMSUser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Cache.php b/civicrm/CRM/Core/BAO/Cache.php
index 7f993a7e5bad73d358220926c400c4874f8759d9..0e619143e33a830c4623ac49657158bff82a32c7 100644
--- a/civicrm/CRM/Core/BAO/Cache.php
+++ b/civicrm/CRM/Core/BAO/Cache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/ConfigSetting.php b/civicrm/CRM/Core/BAO/ConfigSetting.php
index c9268f7f0a369487b2963ce3ce692084c61d3e82..8cc765328614251e238f1584ea598fd56b2c3fcf 100644
--- a/civicrm/CRM/Core/BAO/ConfigSetting.php
+++ b/civicrm/CRM/Core/BAO/ConfigSetting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Country.php b/civicrm/CRM/Core/BAO/Country.php
index 77fef1be198c5d332f9c67eac9485580a3063563..632b46de05b29a2652bc82df22f6298f3b0a487d 100644
--- a/civicrm/CRM/Core/BAO/Country.php
+++ b/civicrm/CRM/Core/BAO/Country.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/CustomField.php b/civicrm/CRM/Core/BAO/CustomField.php
index 02a6ca4d88ae3a122ca3b838a316c0ab94191a24..ce816c53d1e44db8e74e9fa851551850ecf25120 100644
--- a/civicrm/CRM/Core/BAO/CustomField.php
+++ b/civicrm/CRM/Core/BAO/CustomField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -193,21 +193,14 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
}
$transaction = new CRM_Core_Transaction();
- // create any option group & values if required
- if ($params['html_type'] != 'Text' &&
- in_array($params['data_type'], array(
- 'String',
- 'Int',
- 'Float',
- 'Money',
- ))
- ) {
- $tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup',
- $params['custom_group_id'],
- 'table_name'
- );
+ $htmlType = CRM_Utils_Array::value('html_type', $params);
+ $dataType = CRM_Utils_Array::value('data_type', $params);
+ $allowedOptionTypes = array('String', 'Int', 'Float', 'Money');
+ // create any option group & values if required
+ if ($htmlType != 'Text' && in_array($dataType, $allowedOptionTypes)
+ ) {
//CRM-16659: if option_value then create an option group for this custom field.
if ($params['option_type'] == 1 && (empty($params['option_group_id']) || !empty($params['option_value']))) {
// first create an option group for this custom group
@@ -215,7 +208,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
$optionGroup->name = "{$columnName}_" . date('YmdHis');
$optionGroup->title = $params['label'];
$optionGroup->is_active = 1;
- $optionGroup->data_type = $params['data_type'];
+ $optionGroup->data_type = $dataType;
$optionGroup->save();
$params['option_group_id'] = $optionGroup->id;
if (!empty($params['option_value']) && is_array($params['option_value'])) {
@@ -225,7 +218,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
$optionValue->option_group_id = $optionGroup->id;
$optionValue->label = $params['option_label'][$k];
$optionValue->name = CRM_Utils_String::titleToVar($params['option_label'][$k]);
- switch ($params['data_type']) {
+ switch ($dataType) {
case 'Money':
$optionValue->value = CRM_Utils_Rule::cleanMoney($v);
break;
@@ -262,7 +255,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
if (empty($params['default_value'])) {
//don't insert only value separator as default value, CRM-4579
$defaultValue = self::getOptionGroupDefault($params['option_group_id'],
- $params['html_type']
+ $htmlType
);
if (!CRM_Utils_System::isNull(explode(CRM_Core_DAO::VALUE_SEPARATOR,
@@ -275,7 +268,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
}
// since we need to save option group id :)
- if (!isset($params['attributes']) && strtolower($params['html_type']) == 'textarea') {
+ if (!isset($params['attributes']) && strtolower($htmlType) == 'textarea') {
$params['attributes'] = 'rows=4, cols=60';
}
diff --git a/civicrm/CRM/Core/BAO/CustomGroup.php b/civicrm/CRM/Core/BAO/CustomGroup.php
index 6653d6b4f7fb8770d7c294227dc5cc1382b37785..bb5d77df17a97ce98cf45bf00f0b2c5b90231f38 100644
--- a/civicrm/CRM/Core/BAO/CustomGroup.php
+++ b/civicrm/CRM/Core/BAO/CustomGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -60,37 +60,37 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup {
$group->title = $params['title'];
}
- if (in_array($params['extends'][0],
- array(
- 'ParticipantRole',
- 'ParticipantEventName',
- 'ParticipantEventType',
- )
- )) {
+ $extends = CRM_Utils_Array::value('extends', $params, []);
+ $extendsEntity = CRM_Utils_Array::value(0, $extends);
+
+ $participantEntities = array(
+ 'ParticipantRole',
+ 'ParticipantEventName',
+ 'ParticipantEventType',
+ );
+
+ if (in_array($extendsEntity, $participantEntities)) {
$group->extends = 'Participant';
}
else {
- $group->extends = $params['extends'][0];
+ $group->extends = $extendsEntity;
}
$group->extends_entity_column_id = 'null';
- if (
- $params['extends'][0] == 'ParticipantRole' ||
- $params['extends'][0] == 'ParticipantEventName' ||
- $params['extends'][0] == 'ParticipantEventType'
+ if (in_array($extendsEntity, $participantEntities)
) {
- $group->extends_entity_column_id = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue', $params['extends'][0], 'value', 'name');
+ $group->extends_entity_column_id = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue', $extendsEntity, 'value', 'name');
}
//this is format when form get submit.
- $extendsChildType = CRM_Utils_Array::value(1, $params['extends']);
+ $extendsChildType = CRM_Utils_Array::value(1, $extends);
//lets allow user to pass direct child type value, CRM-6893
if (!empty($params['extends_entity_column_value'])) {
$extendsChildType = $params['extends_entity_column_value'];
}
if (!CRM_Utils_System::isNull($extendsChildType)) {
$extendsChildType = implode(CRM_Core_DAO::VALUE_SEPARATOR, $extendsChildType);
- if (CRM_Utils_Array::value(0, $params['extends']) == 'Relationship') {
+ if (CRM_Utils_Array::value(0, $extends) == 'Relationship') {
$extendsChildType = str_replace(array('_a_b', '_b_a'), array(
'',
'',
@@ -211,7 +211,7 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup {
$params['id'],
'table_name'
);
- CRM_Core_BAO_SchemaHandler::changeFKConstraint($table, self::mapTableName($params['extends'][0]));
+ CRM_Core_BAO_SchemaHandler::changeFKConstraint($table, self::mapTableName($extendsEntity));
}
$transaction->commit();
diff --git a/civicrm/CRM/Core/BAO/CustomOption.php b/civicrm/CRM/Core/BAO/CustomOption.php
index 6cee5cf2eb2c4373fec808a909f119777ca2f078..1f3281a528133fe2b04859cb538db97f99abd7ed 100644
--- a/civicrm/CRM/Core/BAO/CustomOption.php
+++ b/civicrm/CRM/Core/BAO/CustomOption.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/CustomQuery.php b/civicrm/CRM/Core/BAO/CustomQuery.php
index e7b1ad62e30fd83145412858ba582b1460de60b9..bc082255a3d635cf49569f27e46f709f6ccc7b4b 100644
--- a/civicrm/CRM/Core/BAO/CustomQuery.php
+++ b/civicrm/CRM/Core/BAO/CustomQuery.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/CustomValue.php b/civicrm/CRM/Core/BAO/CustomValue.php
index f9954b3a81048c55f66a54cdfd2cce29ab68ed4a..516eb9fe6dc01a656070b05c34659d261bd45831 100644
--- a/civicrm/CRM/Core/BAO/CustomValue.php
+++ b/civicrm/CRM/Core/BAO/CustomValue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/CustomValueTable.php b/civicrm/CRM/Core/BAO/CustomValueTable.php
index 850084e7f03307d67a870485abf25881d2d856ec..9455b06a4fa3cabc91315e1f4e16d0858aabd5d6 100644
--- a/civicrm/CRM/Core/BAO/CustomValueTable.php
+++ b/civicrm/CRM/Core/BAO/CustomValueTable.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Dashboard.php b/civicrm/CRM/Core/BAO/Dashboard.php
index 558614615fc51d56d0a115eaa8e6bb61515e67ce..4662e0471c235d00e302569e931f7c020a1b6e38 100644
--- a/civicrm/CRM/Core/BAO/Dashboard.php
+++ b/civicrm/CRM/Core/BAO/Dashboard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Discount.php b/civicrm/CRM/Core/BAO/Discount.php
index 32f1728242664693eebbfca727c6bfcc34919467..8ffdd3594517e38b1c34c6c57f15945ef453709d 100644
--- a/civicrm/CRM/Core/BAO/Discount.php
+++ b/civicrm/CRM/Core/BAO/Discount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Domain.php b/civicrm/CRM/Core/BAO/Domain.php
index a7bf37ed2b1e6533bd7b2c9b5bc8844669822b73..c3a9094d6f44f3e7d4c58303a5a410517adb1234 100644
--- a/civicrm/CRM/Core/BAO/Domain.php
+++ b/civicrm/CRM/Core/BAO/Domain.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Email.php b/civicrm/CRM/Core/BAO/Email.php
index 9e08e3460c849a9b633f2f8f5a093928bfd01ab7..7be3aab41f47e93d6c274fd277ef8b3d1e3aa0a3 100644
--- a/civicrm/CRM/Core/BAO/Email.php
+++ b/civicrm/CRM/Core/BAO/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/EntityTag.php b/civicrm/CRM/Core/BAO/EntityTag.php
index 1cb1030ac531d43e7d5cb6f073b203c1b82ea765..b717d0e82f2c46857befbb64116de80782951ec8 100644
--- a/civicrm/CRM/Core/BAO/EntityTag.php
+++ b/civicrm/CRM/Core/BAO/EntityTag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Extension.php b/civicrm/CRM/Core/BAO/Extension.php
index 760101b098c5fa56592734113dc213d01be95d4d..f0687f1c5966b9679c922a4a754d6c1848715c18 100644
--- a/civicrm/CRM/Core/BAO/Extension.php
+++ b/civicrm/CRM/Core/BAO/Extension.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/File.php b/civicrm/CRM/Core/BAO/File.php
index e6ad7ee197487a29b9dba87250f8b7f282965eb0..424d40682f71e9f9b986d06a34592c901417ed4d 100644
--- a/civicrm/CRM/Core/BAO/File.php
+++ b/civicrm/CRM/Core/BAO/File.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/FinancialTrxn.php b/civicrm/CRM/Core/BAO/FinancialTrxn.php
index f61af4f391368ffb9be414a8c27e6ca2e0cf2be1..ccb7d9ca0a15b3333be4ebd5b2970bf7245e09b2 100644
--- a/civicrm/CRM/Core/BAO/FinancialTrxn.php
+++ b/civicrm/CRM/Core/BAO/FinancialTrxn.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/IM.php b/civicrm/CRM/Core/BAO/IM.php
index baba3acd3fd12e6ea75359edeb4890d17f8d766a..c0be140710dc776b728f5d3770ce3820586ddfa0 100644
--- a/civicrm/CRM/Core/BAO/IM.php
+++ b/civicrm/CRM/Core/BAO/IM.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Job.php b/civicrm/CRM/Core/BAO/Job.php
index 7819f2721ab5b487c6ab250989a5a3943f869369..fcb749a2c791536af995ca76848ee0bd7a54dc6f 100644
--- a/civicrm/CRM/Core/BAO/Job.php
+++ b/civicrm/CRM/Core/BAO/Job.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/LabelFormat.php b/civicrm/CRM/Core/BAO/LabelFormat.php
index 642ea1e1aea95987d0a52ee1f215133427083989..99fd677817bb77a7ec244f2ee003c5c88e9f4bc3 100644
--- a/civicrm/CRM/Core/BAO/LabelFormat.php
+++ b/civicrm/CRM/Core/BAO/LabelFormat.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Core/BAO/Location.php b/civicrm/CRM/Core/BAO/Location.php
index 46c72a2af8bce1445b601265ea299c5c63f6d975..388f1e5df291b997a4dd45b5ab24c2da1d5589a1 100644
--- a/civicrm/CRM/Core/BAO/Location.php
+++ b/civicrm/CRM/Core/BAO/Location.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/LocationType.php b/civicrm/CRM/Core/BAO/LocationType.php
index f7ef6f9219e13dd124fa2b81923d47b875b7a9fe..d75cb632f18fa942d15b1f38bc1edbe7486bbed3 100644
--- a/civicrm/CRM/Core/BAO/LocationType.php
+++ b/civicrm/CRM/Core/BAO/LocationType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Log.php b/civicrm/CRM/Core/BAO/Log.php
index 767f5a1d365b75a2bfef603b0751a359da919153..5a99372c4098351f5aaf40ded41739dff1744deb 100644
--- a/civicrm/CRM/Core/BAO/Log.php
+++ b/civicrm/CRM/Core/BAO/Log.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/MailSettings.php b/civicrm/CRM/Core/BAO/MailSettings.php
index 08a99e3842895e222b3998464f5c11af3b1bade2..247787d988a87d047621c987212c052e43c3806c 100644
--- a/civicrm/CRM/Core/BAO/MailSettings.php
+++ b/civicrm/CRM/Core/BAO/MailSettings.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Mapping.php b/civicrm/CRM/Core/BAO/Mapping.php
index 75be147b1246a4ae77aee8f7b32ddeacd6fe7bdf..65a8ba51f53ed4b8ffb3f8160202c92fdfce541b 100644
--- a/civicrm/CRM/Core/BAO/Mapping.php
+++ b/civicrm/CRM/Core/BAO/Mapping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/MessageTemplate.php b/civicrm/CRM/Core/BAO/MessageTemplate.php
index 4433b7d51f1248e16b06aa9002f6713fa9295cd3..871ca35427d77a8f9c2639e67a7e5921b262fe74 100644
--- a/civicrm/CRM/Core/BAO/MessageTemplate.php
+++ b/civicrm/CRM/Core/BAO/MessageTemplate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Navigation.php b/civicrm/CRM/Core/BAO/Navigation.php
index f6f395a03d941bf04d6d2d8d5d17dd1b94239419..c159724c34060c866ccbf42a0080ce75c221c8c4 100644
--- a/civicrm/CRM/Core/BAO/Navigation.php
+++ b/civicrm/CRM/Core/BAO/Navigation.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Note.php b/civicrm/CRM/Core/BAO/Note.php
index 3457c4e08db57271dd0f3f1f7c777897aacdea78..5bae9d4f4aefcd32251a0e99fb070d7c41aa773c 100644
--- a/civicrm/CRM/Core/BAO/Note.php
+++ b/civicrm/CRM/Core/BAO/Note.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/OpenID.php b/civicrm/CRM/Core/BAO/OpenID.php
index 6c5d6fcd62bff7fa9df960b6214fb1ed4530664f..9d73dbfb836a7fb0e77b21b5c94afa37e5bed1d6 100644
--- a/civicrm/CRM/Core/BAO/OpenID.php
+++ b/civicrm/CRM/Core/BAO/OpenID.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/OptionGroup.php b/civicrm/CRM/Core/BAO/OptionGroup.php
index 25db8a43e248273fd0b8ceb697126b47b0556e4d..85b2e5203de0b00ba48c7caa1bb3fc423e05ddb9 100644
--- a/civicrm/CRM/Core/BAO/OptionGroup.php
+++ b/civicrm/CRM/Core/BAO/OptionGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/OptionValue.php b/civicrm/CRM/Core/BAO/OptionValue.php
index 560b255dc3c5ba2a7aac61e0cfa589d750b2b40e..2e621cf073ccafcb09c2e2c3fd48dc911db761d1 100644
--- a/civicrm/CRM/Core/BAO/OptionValue.php
+++ b/civicrm/CRM/Core/BAO/OptionValue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/PaperSize.php b/civicrm/CRM/Core/BAO/PaperSize.php
index 29a0da0c629e44956627ab3d208c6cb3e5d97f04..ea6f221f6123e05bb42fb7286454de6ad55ecc6d 100644
--- a/civicrm/CRM/Core/BAO/PaperSize.php
+++ b/civicrm/CRM/Core/BAO/PaperSize.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Core/BAO/PdfFormat.php b/civicrm/CRM/Core/BAO/PdfFormat.php
index 73cf693d68dae03f007bf6540d4f678581df916a..14281573952fd1b0ddf63cf7f7f1fa2f753b8bc3 100644
--- a/civicrm/CRM/Core/BAO/PdfFormat.php
+++ b/civicrm/CRM/Core/BAO/PdfFormat.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Core/BAO/Persistent.php b/civicrm/CRM/Core/BAO/Persistent.php
index 9586145c6447843a0e85cb1f3ccc86f88efbcfe1..5fd9382304e7dec7c75efb2bcc8c49d5f57bf6e6 100644
--- a/civicrm/CRM/Core/BAO/Persistent.php
+++ b/civicrm/CRM/Core/BAO/Persistent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Phone.php b/civicrm/CRM/Core/BAO/Phone.php
index fe8d31a5bf2a0517a9fc1a7ebe9d6315cb985234..f8fb83ba2df22c482b5a36412bbc59f057add585 100644
--- a/civicrm/CRM/Core/BAO/Phone.php
+++ b/civicrm/CRM/Core/BAO/Phone.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/PreferencesDate.php b/civicrm/CRM/Core/BAO/PreferencesDate.php
index 0ce7dc4df5155e06863eb986d2b2ada4ec486b88..57ec216802c756b5b98ee3769c19fb5758f4914a 100644
--- a/civicrm/CRM/Core/BAO/PreferencesDate.php
+++ b/civicrm/CRM/Core/BAO/PreferencesDate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/PrevNextCache.php b/civicrm/CRM/Core/BAO/PrevNextCache.php
index 157783dddd2e5f112f8ee1f7a70a97c254843acd..bf9cc0e8d477c0d294adb3fe8370c41cc30db12f 100644
--- a/civicrm/CRM/Core/BAO/PrevNextCache.php
+++ b/civicrm/CRM/Core/BAO/PrevNextCache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Query.php b/civicrm/CRM/Core/BAO/Query.php
index fc83b012c1f613ef743dc6b4fc510bf5b43037ab..b1e8f08f3eb6e842bc325d2820adffa517ac9608 100644
--- a/civicrm/CRM/Core/BAO/Query.php
+++ b/civicrm/CRM/Core/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/RecurringEntity.php b/civicrm/CRM/Core/BAO/RecurringEntity.php
index 729d3f8ca59799181bde7ea7ef0c12496eed2ce1..fb73a78cf2cf1c21296de29ec276a7d32ceec975 100644
--- a/civicrm/CRM/Core/BAO/RecurringEntity.php
+++ b/civicrm/CRM/Core/BAO/RecurringEntity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/SchemaHandler.php b/civicrm/CRM/Core/BAO/SchemaHandler.php
index e8a8c705e0ee1de4b2f571226e3d74e5c45b95ff..ef28021a7c9ceb89f79cf880a0ac4ec293d306be 100644
--- a/civicrm/CRM/Core/BAO/SchemaHandler.php
+++ b/civicrm/CRM/Core/BAO/SchemaHandler.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Setting.php b/civicrm/CRM/Core/BAO/Setting.php
index dc2dd9d523c79e556328e1777e4af7590983412d..96a8b7d414bfbe1e9f63cbb1584a0683f8678f9c 100644
--- a/civicrm/CRM/Core/BAO/Setting.php
+++ b/civicrm/CRM/Core/BAO/Setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/StatusPreference.php b/civicrm/CRM/Core/BAO/StatusPreference.php
index 9a2767fcd74b6de1e6c335c7369d2c6198bec7c3..0436d65dad41cdd113be1c79b523d158b2a37564 100644
--- a/civicrm/CRM/Core/BAO/StatusPreference.php
+++ b/civicrm/CRM/Core/BAO/StatusPreference.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Tag.php b/civicrm/CRM/Core/BAO/Tag.php
index f9c950d7b5809c1f5ddeb151dcd945b93e09ab12..69d03fe6e26666ce5df179616b164f17c331856b 100644
--- a/civicrm/CRM/Core/BAO/Tag.php
+++ b/civicrm/CRM/Core/BAO/Tag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/UFField.php b/civicrm/CRM/Core/BAO/UFField.php
index 58811263c705564178b60f34bc485edc564570ff..b9e0c3133c79ed1c65fd3381056699bcdbe1c247 100644
--- a/civicrm/CRM/Core/BAO/UFField.php
+++ b/civicrm/CRM/Core/BAO/UFField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/UFGroup.php b/civicrm/CRM/Core/BAO/UFGroup.php
index 64417e7b853a853e666b0a0ac4111cd703b20fca..5543a560150d8a2b7cb14c38c84c8a62621a9f0c 100644
--- a/civicrm/CRM/Core/BAO/UFGroup.php
+++ b/civicrm/CRM/Core/BAO/UFGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/UFJoin.php b/civicrm/CRM/Core/BAO/UFJoin.php
index 9564b206511305e803f0abe3b126be50c8b85d51..f6df703442042914e2c5b8062d2bb528268dfcbf 100644
--- a/civicrm/CRM/Core/BAO/UFJoin.php
+++ b/civicrm/CRM/Core/BAO/UFJoin.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/UFMatch.php b/civicrm/CRM/Core/BAO/UFMatch.php
index 265d27828d97a1159af003d7bea826e0a8c72dc7..a781b645873d603d23d2782cc3cf74a047bad3f1 100644
--- a/civicrm/CRM/Core/BAO/UFMatch.php
+++ b/civicrm/CRM/Core/BAO/UFMatch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/Website.php b/civicrm/CRM/Core/BAO/Website.php
index 3f968d231bc69c19626181a27322557194ae88fb..d114991249bfa79a238fb8a9200330afcfc0fb80 100644
--- a/civicrm/CRM/Core/BAO/Website.php
+++ b/civicrm/CRM/Core/BAO/Website.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/BAO/WordReplacement.php b/civicrm/CRM/Core/BAO/WordReplacement.php
index 237ce337cf66eb1a874ede369346745118b39b59..4351025becd3e324faf3a33506623204261c3b8f 100644
--- a/civicrm/CRM/Core/BAO/WordReplacement.php
+++ b/civicrm/CRM/Core/BAO/WordReplacement.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Base.php b/civicrm/CRM/Core/Base.php
index 76d1ff967145d0c9ba6f9f9aec88e2f46a2a81ad..18fb51f5d16c20334d76ebf127ac288a3b579dad 100644
--- a/civicrm/CRM/Core/Base.php
+++ b/civicrm/CRM/Core/Base.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Block.php b/civicrm/CRM/Core/Block.php
index a9249598441b314e1059adfdc099e91774d55daa..8a9ea1f895f233e81a85e271a75d487d3754b068 100644
--- a/civicrm/CRM/Core/Block.php
+++ b/civicrm/CRM/Core/Block.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/ClassLoader.php b/civicrm/CRM/Core/ClassLoader.php
index 18e5254dc81e6188e8d93f79a2d39ea858be2c04..148e23a9191dbd05bb4050057597195015c15ee7 100644
--- a/civicrm/CRM/Core/ClassLoader.php
+++ b/civicrm/CRM/Core/ClassLoader.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/CodeGen/Reflection.php b/civicrm/CRM/Core/CodeGen/Reflection.php
index 6f056f585c1c69bd858eaf5ee49d4ad0f8b14651..0dd7f23545077bf3b1f6492a5f66134ea70837be 100644
--- a/civicrm/CRM/Core/CodeGen/Reflection.php
+++ b/civicrm/CRM/Core/CodeGen/Reflection.php
@@ -5,60 +5,33 @@
*/
class CRM_Core_CodeGen_Reflection extends CRM_Core_CodeGen_BaseTask {
- protected $checksum;
-
- /**
- * @var string
- */
- private $raw;
-
/**
* @return bool
* TRUE if an update is needed.
*/
public function needsUpdate() {
- if (!file_exists($this->getAbsFileName())) {
- return TRUE;
- }
-
// Generating this file is fairly cheap, and we don't have robust heuristic
// for the checksum.
- // if ($this->getSchemaChecksum() !== self::extractRegex($this->getAbsFileName(), ';\(GenCodeChecksum:([a-zA-Z0-9]+)\);')) {
- // return TRUE;
- // }
- return !$this->isApproxPhpMatch(
- file_get_contents($this->getAbsFileName()),
- $this->getRaw());
- }
+ // skip this task on test environment as the schema generation should only be triggered during installation/upgrade
+ if (CIVICRM_UF == 'UnitTests') {
+ return FALSE;
+ }
+ return TRUE;
+ }
/**
* Run generator.
*/
public function run() {
echo "Generating table list\n";
- $template = new CRM_Core_CodeGen_Util_Template('php');
+ $template = new CRM_Core_CodeGen_Util_Template('php', FALSE);
$template->assign('tables', $this->tables);
$template->assign('genCodeChecksum', 'IGNORE');
$template->run('listAll.tpl', $this->getAbsFileName());
}
- /**
- * Generate the raw PHP code for the data file.
- *
- * @return string
- */
- public function getRaw() {
- if (!$this->raw) {
- $template = new CRM_Core_CodeGen_Util_Template('php');
- $template->assign('tables', $this->tables);
- $template->assign('genCodeChecksum', 'NEW');
- $this->raw = $template->fetch('listAll.tpl');
- }
- return $this->raw;
- }
-
/**
* Get absolute file name.
*
@@ -68,18 +41,4 @@ class CRM_Core_CodeGen_Reflection extends CRM_Core_CodeGen_BaseTask {
return $this->config->CoreDAOCodePath . "AllCoreTables.data.php";
}
- // /**
- // * Get the checksum for the schema.
- // *
- // * @return string
- // */
- // protected function getSchemaChecksum() {
- // if (!$this->checksum) {
- // CRM_Utils_Array::flatten($this->tables, $flat);
- // ksort($flat);
- // $this->checksum = md5(json_encode($flat));
- // }
- // return $this->checksum;
- // }
-
}
diff --git a/civicrm/CRM/Core/CodeGen/Util/Template.php b/civicrm/CRM/Core/CodeGen/Util/Template.php
index e5a7ea36923f5eb6eb63b2ee76c135a381f85d94..66efbc3867872c1d67d3f7609db30fad2ab413f8 100644
--- a/civicrm/CRM/Core/CodeGen/Util/Template.php
+++ b/civicrm/CRM/Core/CodeGen/Util/Template.php
@@ -9,17 +9,23 @@ class CRM_Core_CodeGen_Util_Template {
protected $smarty;
protected $beautifier;
+ /**
+ * @var bool
+ */
+ protected $beautify;
+
/**
* @param string $filetype
+ * @param bool $beautify
*/
- public function __construct($filetype) {
+ public function __construct($filetype, $beautify = TRUE) {
$this->filetype = $filetype;
$this->smarty = CRM_Core_CodeGen_Util_Smarty::singleton()->createSmarty();
$this->assign('generated', "DO NOT EDIT. Generated by CRM_Core_CodeGen");
- if ($this->filetype === 'php') {
+ if ($this->filetype === 'php' && $beautify) {
require_once 'PHP/Beautifier.php';
// create an instance
$this->beautifier = new PHP_Beautifier();
@@ -29,6 +35,8 @@ class CRM_Core_CodeGen_Util_Template {
$this->beautifier->setIndentNumber(2);
$this->beautifier->setNewLine("\n");
}
+
+ $this->beautify = $beautify;
}
/**
@@ -58,10 +66,11 @@ class CRM_Core_CodeGen_Util_Template {
public function run($infile, $outpath) {
$contents = $this->smarty->fetch($infile);
- if ($this->filetype === 'php') {
+ if ($this->filetype === 'php' && $this->beautify) {
$this->beautifier->setInputString($contents);
$this->beautifier->process();
$contents = $this->beautifier->get();
+
// The beautifier isn't as beautiful as one would hope. Here's some extra string fudging.
$replacements = [
') ,' => '),',
@@ -71,13 +80,15 @@ class CRM_Core_CodeGen_Util_Template {
];
$contents = str_replace(array_keys($replacements), array_values($replacements), $contents);
$contents = preg_replace('#(\s*)\\/\\*\\*#', "\n\$1/**", $contents);
+
// Convert old array syntax to new square brackets
$contents = CRM_Core_CodeGen_Util_ArraySyntaxConverter::convert($contents);
- file_put_contents($outpath, $contents);
}
- else {
- file_put_contents($outpath, $contents);
+ // Ensure file ends with a newline
+ if (substr($contents, -1) !== "\n") {
+ $contents .= "\n";
}
+ file_put_contents($outpath, $contents);
}
/**
diff --git a/civicrm/CRM/Core/CommunityMessages.php b/civicrm/CRM/Core/CommunityMessages.php
index 87359a2afa76121da51df63624855771844c84a1..7bf3ada503c5b3744e200c9a5dc8e336ab56b201 100644
--- a/civicrm/CRM/Core/CommunityMessages.php
+++ b/civicrm/CRM/Core/CommunityMessages.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Component.php b/civicrm/CRM/Core/Component.php
index 2ca887901743d68afbf18d3b48c605254d326f02..8316aafd86e8a4d1ebd1d0d79c0d17dfd68fab29 100644
--- a/civicrm/CRM/Core/Component.php
+++ b/civicrm/CRM/Core/Component.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Component/Info.php b/civicrm/CRM/Core/Component/Info.php
index b978145e96c579e42e838aec9116daa60dec118d..00c228ef64e49d3a5581eff6836bcb406c2cbf9f 100644
--- a/civicrm/CRM/Core/Component/Info.php
+++ b/civicrm/CRM/Core/Component/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Config.php b/civicrm/CRM/Core/Config.php
index 940b8a272dd487e6abc3ec4ceef356dc4e47d17d..349c672b83de8990f98e1ea3dffeea1908eb7951 100644
--- a/civicrm/CRM/Core/Config.php
+++ b/civicrm/CRM/Core/Config.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Config/MagicMerge.php b/civicrm/CRM/Core/Config/MagicMerge.php
index 6fb845ceb1830a89860943e2158914a1b89e6808..e9414cb783edcc0a6ca021b52bf8303ebb30adee 100644
--- a/civicrm/CRM/Core/Config/MagicMerge.php
+++ b/civicrm/CRM/Core/Config/MagicMerge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Config/Runtime.php b/civicrm/CRM/Core/Config/Runtime.php
index 88220f44889f57d28311623c36780bcd6013f02f..79f894c3cd6c80c47418d25176c82405d93bc65b 100644
--- a/civicrm/CRM/Core/Config/Runtime.php
+++ b/civicrm/CRM/Core/Config/Runtime.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Controller.php b/civicrm/CRM/Core/Controller.php
index e5e7022e986cf0f01b2c2ab3dfb33c5f51e0374c..088ba07ef64db11d408c89396fdd2f3d27a2153d 100644
--- a/civicrm/CRM/Core/Controller.php
+++ b/civicrm/CRM/Core/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Controller/Simple.php b/civicrm/CRM/Core/Controller/Simple.php
index 59856f634208177153f22f5cd463c635f74fcd0a..c5b353fd311f228f631c70f53b71d27321004b31 100644
--- a/civicrm/CRM/Core/Controller/Simple.php
+++ b/civicrm/CRM/Core/Controller/Simple.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/DAO.php b/civicrm/CRM/Core/DAO.php
index 45f2760a7425f611cad2c17d46513c416a50f4ad..12af2b3c403a4c7456107c66905a9aea04a6d79d 100644
--- a/civicrm/CRM/Core/DAO.php
+++ b/civicrm/CRM/Core/DAO.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/DAO/AllCoreTables.data.php b/civicrm/CRM/Core/DAO/AllCoreTables.data.php
index 2b49bc6691a94d4f01b18b773bef3bb0702d6448..730aadb7b03f510770cab326808b27b40579fd9e 100644
--- a/civicrm/CRM/Core/DAO/AllCoreTables.data.php
+++ b/civicrm/CRM/Core/DAO/AllCoreTables.data.php
@@ -1,789 +1,765 @@
<?php
-/*
-+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
-+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2018 |
-+--------------------------------------------------------------------+
-| This file is a part of CiviCRM. |
-| |
-| CiviCRM is free software; you can copy, modify, and distribute it |
-| under the terms of the GNU Affero General Public License |
-| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
-| |
-| CiviCRM is distributed in the hope that it will be useful, but |
-| WITHOUT ANY WARRANTY; without even the implied warranty of |
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
-| See the GNU Affero General Public License for more details. |
-| |
-| You should have received a copy of the GNU Affero General Public |
-| License and the CiviCRM Licensing Exception along |
-| with this program; if not, contact CiviCRM LLC |
-| at info[AT]civicrm[DOT]org. If you have questions about the |
-| GNU Affero General Public License or the licensing of CiviCRM, |
-| see the CiviCRM license FAQ at http://civicrm.org/licensing |
-+--------------------------------------------------------------------+
-*/
// (GenCodeChecksum:IGNORE)
-return array(
- 'CRM_Core_DAO_AddressFormat' => array(
+
+return [
+ 'CRM_Core_DAO_AddressFormat' => [
'name' => 'AddressFormat',
'class' => 'CRM_Core_DAO_AddressFormat',
'table' => 'civicrm_address_format',
- ) ,
- 'CRM_Core_DAO_Extension' => array(
+ ],
+ 'CRM_Core_DAO_Extension' => [
'name' => 'Extension',
'class' => 'CRM_Core_DAO_Extension',
'table' => 'civicrm_extension',
- ) ,
- 'CRM_Core_DAO_File' => array(
+ ],
+ 'CRM_Core_DAO_File' => [
'name' => 'File',
'class' => 'CRM_Core_DAO_File',
'table' => 'civicrm_file',
- ) ,
- 'CRM_Core_DAO_LocationType' => array(
+ ],
+ 'CRM_Core_DAO_LocationType' => [
'name' => 'LocationType',
'class' => 'CRM_Core_DAO_LocationType',
'table' => 'civicrm_location_type',
- ) ,
- 'CRM_Core_DAO_Managed' => array(
+ ],
+ 'CRM_Core_DAO_Managed' => [
'name' => 'Managed',
'class' => 'CRM_Core_DAO_Managed',
'table' => 'civicrm_managed',
- ) ,
- 'CRM_Core_DAO_Mapping' => array(
+ ],
+ 'CRM_Core_DAO_Mapping' => [
'name' => 'Mapping',
'class' => 'CRM_Core_DAO_Mapping',
'table' => 'civicrm_mapping',
- ) ,
- 'CRM_Core_DAO_MessageTemplate' => array(
+ ],
+ 'CRM_Core_DAO_MessageTemplate' => [
'name' => 'MessageTemplate',
'class' => 'CRM_Core_DAO_MessageTemplate',
'table' => 'civicrm_msg_template',
- ) ,
- 'CRM_Core_DAO_OptionGroup' => array(
+ ],
+ 'CRM_Core_DAO_OptionGroup' => [
'name' => 'OptionGroup',
'class' => 'CRM_Core_DAO_OptionGroup',
'table' => 'civicrm_option_group',
- ) ,
- 'CRM_Core_DAO_PreferencesDate' => array(
+ ],
+ 'CRM_Core_DAO_PreferencesDate' => [
'name' => 'PreferencesDate',
'class' => 'CRM_Core_DAO_PreferencesDate',
'table' => 'civicrm_preferences_date',
- ) ,
- 'CRM_Core_DAO_SystemLog' => array(
+ ],
+ 'CRM_Core_DAO_SystemLog' => [
'name' => 'SystemLog',
'class' => 'CRM_Core_DAO_SystemLog',
'table' => 'civicrm_system_log',
- ) ,
- 'CRM_Core_DAO_Worldregion' => array(
+ ],
+ 'CRM_Core_DAO_Worldregion' => [
'name' => 'Worldregion',
'class' => 'CRM_Core_DAO_Worldregion',
'table' => 'civicrm_worldregion',
- ) ,
- 'CRM_Core_DAO_Component' => array(
+ ],
+ 'CRM_Core_DAO_Component' => [
'name' => 'Component',
'class' => 'CRM_Core_DAO_Component',
'table' => 'civicrm_component',
- ) ,
- 'CRM_Core_DAO_Persistent' => array(
+ ],
+ 'CRM_Core_DAO_Persistent' => [
'name' => 'Persistent',
'class' => 'CRM_Core_DAO_Persistent',
'table' => 'civicrm_persistent',
- ) ,
- 'CRM_Core_DAO_PrevNextCache' => array(
+ ],
+ 'CRM_Core_DAO_PrevNextCache' => [
'name' => 'PrevNextCache',
'class' => 'CRM_Core_DAO_PrevNextCache',
'table' => 'civicrm_prevnext_cache',
- ) ,
- 'CRM_Core_DAO_ActionMapping' => array(
+ ],
+ 'CRM_Core_DAO_ActionMapping' => [
'name' => 'ActionMapping',
'class' => 'CRM_Core_DAO_ActionMapping',
'table' => 'civicrm_action_mapping',
- ) ,
- 'CRM_Core_DAO_RecurringEntity' => array(
+ ],
+ 'CRM_Core_DAO_RecurringEntity' => [
'name' => 'RecurringEntity',
'class' => 'CRM_Core_DAO_RecurringEntity',
'table' => 'civicrm_recurring_entity',
- ) ,
- 'CRM_ACL_DAO_ACL' => array(
+ ],
+ 'CRM_ACL_DAO_ACL' => [
'name' => 'ACL',
'class' => 'CRM_ACL_DAO_ACL',
'table' => 'civicrm_acl',
- ) ,
- 'CRM_ACL_DAO_EntityRole' => array(
+ ],
+ 'CRM_ACL_DAO_EntityRole' => [
'name' => 'EntityRole',
'class' => 'CRM_ACL_DAO_EntityRole',
'table' => 'civicrm_acl_entity_role',
- ) ,
- 'CRM_Contact_DAO_Contact' => array(
+ ],
+ 'CRM_Contact_DAO_Contact' => [
'name' => 'Contact',
'class' => 'CRM_Contact_DAO_Contact',
'table' => 'civicrm_contact',
- ) ,
- 'CRM_Contact_DAO_ACLContactCache' => array(
+ ],
+ 'CRM_Contact_DAO_ACLContactCache' => [
'name' => 'ACLContactCache',
'class' => 'CRM_Contact_DAO_ACLContactCache',
'table' => 'civicrm_acl_contact_cache',
- ) ,
- 'CRM_Contact_DAO_RelationshipType' => array(
+ ],
+ 'CRM_Contact_DAO_RelationshipType' => [
'name' => 'RelationshipType',
'class' => 'CRM_Contact_DAO_RelationshipType',
'table' => 'civicrm_relationship_type',
- ) ,
- 'CRM_Contact_DAO_SavedSearch' => array(
+ ],
+ 'CRM_Contact_DAO_SavedSearch' => [
'name' => 'SavedSearch',
'class' => 'CRM_Contact_DAO_SavedSearch',
'table' => 'civicrm_saved_search',
- ) ,
- 'CRM_Contact_DAO_ContactType' => array(
+ ],
+ 'CRM_Contact_DAO_ContactType' => [
'name' => 'ContactType',
'class' => 'CRM_Contact_DAO_ContactType',
'table' => 'civicrm_contact_type',
- ) ,
- 'CRM_Batch_DAO_Batch' => array(
+ ],
+ 'CRM_Batch_DAO_Batch' => [
'name' => 'Batch',
'class' => 'CRM_Batch_DAO_Batch',
'table' => 'civicrm_batch',
- ) ,
- 'CRM_Batch_DAO_EntityBatch' => array(
+ ],
+ 'CRM_Batch_DAO_EntityBatch' => [
'name' => 'EntityBatch',
'class' => 'CRM_Batch_DAO_EntityBatch',
'table' => 'civicrm_entity_batch',
- ) ,
- 'CRM_Mailing_DAO_Component' => array(
+ ],
+ 'CRM_Mailing_DAO_Component' => [
'name' => 'Component',
'class' => 'CRM_Mailing_DAO_Component',
'table' => 'civicrm_mailing_component',
- ) ,
- 'CRM_Mailing_DAO_MailingAB' => array(
+ ],
+ 'CRM_Mailing_DAO_MailingAB' => [
'name' => 'MailingAB',
'class' => 'CRM_Mailing_DAO_MailingAB',
'table' => 'civicrm_mailing_abtest',
- ) ,
- 'CRM_Mailing_DAO_BounceType' => array(
+ ],
+ 'CRM_Mailing_DAO_BounceType' => [
'name' => 'BounceType',
'class' => 'CRM_Mailing_DAO_BounceType',
'table' => 'civicrm_mailing_bounce_type',
- ) ,
- 'CRM_Mailing_DAO_BouncePattern' => array(
+ ],
+ 'CRM_Mailing_DAO_BouncePattern' => [
'name' => 'BouncePattern',
'class' => 'CRM_Mailing_DAO_BouncePattern',
'table' => 'civicrm_mailing_bounce_pattern',
- ) ,
- 'CRM_Contribute_DAO_Premium' => array(
+ ],
+ 'CRM_Contribute_DAO_Premium' => [
'name' => 'Premium',
'class' => 'CRM_Contribute_DAO_Premium',
'table' => 'civicrm_premiums',
- ) ,
- 'CRM_Financial_DAO_Currency' => array(
+ ],
+ 'CRM_Financial_DAO_Currency' => [
'name' => 'Currency',
'class' => 'CRM_Financial_DAO_Currency',
'table' => 'civicrm_currency',
- ) ,
- 'CRM_Financial_DAO_FinancialAccount' => array(
+ ],
+ 'CRM_Financial_DAO_FinancialAccount' => [
'name' => 'FinancialAccount',
'class' => 'CRM_Financial_DAO_FinancialAccount',
'table' => 'civicrm_financial_account',
- ) ,
- 'CRM_Financial_DAO_PaymentProcessorType' => array(
+ ],
+ 'CRM_Financial_DAO_PaymentProcessorType' => [
'name' => 'PaymentProcessorType',
'class' => 'CRM_Financial_DAO_PaymentProcessorType',
'table' => 'civicrm_payment_processor_type',
- ) ,
- 'CRM_Financial_DAO_FinancialType' => array(
+ ],
+ 'CRM_Financial_DAO_FinancialType' => [
'name' => 'FinancialType',
'class' => 'CRM_Financial_DAO_FinancialType',
'table' => 'civicrm_financial_type',
- ) ,
- 'CRM_Financial_DAO_EntityFinancialAccount' => array(
+ ],
+ 'CRM_Financial_DAO_EntityFinancialAccount' => [
'name' => 'EntityFinancialAccount',
'class' => 'CRM_Financial_DAO_EntityFinancialAccount',
'table' => 'civicrm_entity_financial_account',
- ) ,
- 'CRM_Financial_DAO_FinancialItem' => array(
+ ],
+ 'CRM_Financial_DAO_FinancialItem' => [
'name' => 'FinancialItem',
'class' => 'CRM_Financial_DAO_FinancialItem',
'table' => 'civicrm_financial_item',
- ) ,
- 'CRM_Member_DAO_MembershipStatus' => array(
+ ],
+ 'CRM_Member_DAO_MembershipStatus' => [
'name' => 'MembershipStatus',
'class' => 'CRM_Member_DAO_MembershipStatus',
'table' => 'civicrm_membership_status',
- ) ,
- 'CRM_Campaign_DAO_Campaign' => array(
+ ],
+ 'CRM_Campaign_DAO_Campaign' => [
'name' => 'Campaign',
'class' => 'CRM_Campaign_DAO_Campaign',
'table' => 'civicrm_campaign',
- ) ,
- 'CRM_Campaign_DAO_CampaignGroup' => array(
+ ],
+ 'CRM_Campaign_DAO_CampaignGroup' => [
'name' => 'CampaignGroup',
'class' => 'CRM_Campaign_DAO_CampaignGroup',
'table' => 'civicrm_campaign_group',
- ) ,
- 'CRM_Campaign_DAO_Survey' => array(
+ ],
+ 'CRM_Campaign_DAO_Survey' => [
'name' => 'Survey',
'class' => 'CRM_Campaign_DAO_Survey',
'table' => 'civicrm_survey',
- ) ,
- 'CRM_Event_DAO_ParticipantStatusType' => array(
+ ],
+ 'CRM_Event_DAO_ParticipantStatusType' => [
'name' => 'ParticipantStatusType',
'class' => 'CRM_Event_DAO_ParticipantStatusType',
'table' => 'civicrm_participant_status_type',
- ) ,
- 'CRM_Event_Cart_DAO_Cart' => array(
+ ],
+ 'CRM_Event_Cart_DAO_Cart' => [
'name' => 'Cart',
'class' => 'CRM_Event_Cart_DAO_Cart',
'table' => 'civicrm_event_carts',
- ) ,
- 'CRM_Dedupe_DAO_RuleGroup' => array(
+ ],
+ 'CRM_Dedupe_DAO_RuleGroup' => [
'name' => 'RuleGroup',
'class' => 'CRM_Dedupe_DAO_RuleGroup',
'table' => 'civicrm_dedupe_rule_group',
- ) ,
- 'CRM_Dedupe_DAO_Rule' => array(
+ ],
+ 'CRM_Dedupe_DAO_Rule' => [
'name' => 'Rule',
'class' => 'CRM_Dedupe_DAO_Rule',
'table' => 'civicrm_dedupe_rule',
- ) ,
- 'CRM_Dedupe_DAO_Exception' => array(
+ ],
+ 'CRM_Dedupe_DAO_Exception' => [
'name' => 'Exception',
'class' => 'CRM_Dedupe_DAO_Exception',
'table' => 'civicrm_dedupe_exception',
- ) ,
- 'CRM_Case_DAO_CaseType' => array(
+ ],
+ 'CRM_Case_DAO_CaseType' => [
'name' => 'CaseType',
'class' => 'CRM_Case_DAO_CaseType',
'table' => 'civicrm_case_type',
- ) ,
- 'CRM_Grant_DAO_Grant' => array(
+ ],
+ 'CRM_Grant_DAO_Grant' => [
'name' => 'Grant',
'class' => 'CRM_Grant_DAO_Grant',
'table' => 'civicrm_grant',
- ) ,
- 'CRM_Friend_DAO_Friend' => array(
+ ],
+ 'CRM_Friend_DAO_Friend' => [
'name' => 'Friend',
'class' => 'CRM_Friend_DAO_Friend',
'table' => 'civicrm_tell_friend',
- ) ,
- 'CRM_Pledge_DAO_PledgeBlock' => array(
+ ],
+ 'CRM_Pledge_DAO_PledgeBlock' => [
'name' => 'PledgeBlock',
'class' => 'CRM_Pledge_DAO_PledgeBlock',
'table' => 'civicrm_pledge_block',
- ) ,
- 'CRM_Queue_DAO_QueueItem' => array(
+ ],
+ 'CRM_Queue_DAO_QueueItem' => [
'name' => 'QueueItem',
'class' => 'CRM_Queue_DAO_QueueItem',
'table' => 'civicrm_queue_item',
- ) ,
- 'CRM_PCP_DAO_PCP' => array(
+ ],
+ 'CRM_PCP_DAO_PCP' => [
'name' => 'PCP',
'class' => 'CRM_PCP_DAO_PCP',
'table' => 'civicrm_pcp',
- ) ,
- 'CRM_Cxn_DAO_Cxn' => array(
+ ],
+ 'CRM_Cxn_DAO_Cxn' => [
'name' => 'Cxn',
'class' => 'CRM_Cxn_DAO_Cxn',
'table' => 'civicrm_cxn',
- ) ,
- 'CRM_Core_DAO_Cache' => array(
+ ],
+ 'CRM_Core_DAO_Cache' => [
'name' => 'Cache',
'class' => 'CRM_Core_DAO_Cache',
'table' => 'civicrm_cache',
- ) ,
- 'CRM_Core_DAO_Country' => array(
+ ],
+ 'CRM_Core_DAO_Country' => [
'name' => 'Country',
'class' => 'CRM_Core_DAO_Country',
'table' => 'civicrm_country',
- ) ,
- 'CRM_Core_DAO_CustomGroup' => array(
+ ],
+ 'CRM_Core_DAO_CustomGroup' => [
'name' => 'CustomGroup',
'class' => 'CRM_Core_DAO_CustomGroup',
'table' => 'civicrm_custom_group',
- ) ,
- 'CRM_Core_DAO_CustomField' => array(
+ ],
+ 'CRM_Core_DAO_CustomField' => [
'name' => 'CustomField',
'class' => 'CRM_Core_DAO_CustomField',
'table' => 'civicrm_custom_field',
- ) ,
- 'CRM_Core_DAO_Domain' => array(
+ ],
+ 'CRM_Core_DAO_Domain' => [
'name' => 'Domain',
'class' => 'CRM_Core_DAO_Domain',
'table' => 'civicrm_domain',
- ) ,
- 'CRM_Core_DAO_Email' => array(
+ ],
+ 'CRM_Core_DAO_Email' => [
'name' => 'Email',
'class' => 'CRM_Core_DAO_Email',
'table' => 'civicrm_email',
- ) ,
- 'CRM_Core_DAO_EntityFile' => array(
+ ],
+ 'CRM_Core_DAO_EntityFile' => [
'name' => 'EntityFile',
'class' => 'CRM_Core_DAO_EntityFile',
'table' => 'civicrm_entity_file',
- ) ,
- 'CRM_Core_DAO_IM' => array(
+ ],
+ 'CRM_Core_DAO_IM' => [
'name' => 'IM',
'class' => 'CRM_Core_DAO_IM',
'table' => 'civicrm_im',
- ) ,
- 'CRM_Core_DAO_Job' => array(
+ ],
+ 'CRM_Core_DAO_Job' => [
'name' => 'Job',
'class' => 'CRM_Core_DAO_Job',
'table' => 'civicrm_job',
- ) ,
- 'CRM_Core_DAO_JobLog' => array(
+ ],
+ 'CRM_Core_DAO_JobLog' => [
'name' => 'JobLog',
'class' => 'CRM_Core_DAO_JobLog',
'table' => 'civicrm_job_log',
- ) ,
- 'CRM_Core_DAO_Log' => array(
+ ],
+ 'CRM_Core_DAO_Log' => [
'name' => 'Log',
'class' => 'CRM_Core_DAO_Log',
'table' => 'civicrm_log',
- ) ,
- 'CRM_Core_DAO_MailSettings' => array(
+ ],
+ 'CRM_Core_DAO_MailSettings' => [
'name' => 'MailSettings',
'class' => 'CRM_Core_DAO_MailSettings',
'table' => 'civicrm_mail_settings',
- ) ,
- 'CRM_Core_DAO_MappingField' => array(
+ ],
+ 'CRM_Core_DAO_MappingField' => [
'name' => 'MappingField',
'class' => 'CRM_Core_DAO_MappingField',
'table' => 'civicrm_mapping_field',
- ) ,
- 'CRM_Core_DAO_Menu' => array(
+ ],
+ 'CRM_Core_DAO_Menu' => [
'name' => 'Menu',
'class' => 'CRM_Core_DAO_Menu',
'table' => 'civicrm_menu',
- ) ,
- 'CRM_Core_DAO_Navigation' => array(
+ ],
+ 'CRM_Core_DAO_Navigation' => [
'name' => 'Navigation',
'class' => 'CRM_Core_DAO_Navigation',
'table' => 'civicrm_navigation',
- ) ,
- 'CRM_Core_DAO_Note' => array(
+ ],
+ 'CRM_Core_DAO_Note' => [
'name' => 'Note',
'class' => 'CRM_Core_DAO_Note',
'table' => 'civicrm_note',
- ) ,
- 'CRM_Core_DAO_OptionValue' => array(
+ ],
+ 'CRM_Core_DAO_OptionValue' => [
'name' => 'OptionValue',
'class' => 'CRM_Core_DAO_OptionValue',
'table' => 'civicrm_option_value',
- ) ,
- 'CRM_Core_DAO_Phone' => array(
+ ],
+ 'CRM_Core_DAO_Phone' => [
'name' => 'Phone',
'class' => 'CRM_Core_DAO_Phone',
'table' => 'civicrm_phone',
- ) ,
- 'CRM_Core_DAO_StateProvince' => array(
+ ],
+ 'CRM_Core_DAO_StateProvince' => [
'name' => 'StateProvince',
'class' => 'CRM_Core_DAO_StateProvince',
'table' => 'civicrm_state_province',
- ) ,
- 'CRM_Core_DAO_Tag' => array(
+ ],
+ 'CRM_Core_DAO_Tag' => [
'name' => 'Tag',
'class' => 'CRM_Core_DAO_Tag',
'table' => 'civicrm_tag',
- ) ,
- 'CRM_Core_DAO_UFMatch' => array(
+ ],
+ 'CRM_Core_DAO_UFMatch' => [
'name' => 'UFMatch',
'class' => 'CRM_Core_DAO_UFMatch',
'table' => 'civicrm_uf_match',
- ) ,
- 'CRM_Core_DAO_Timezone' => array(
+ ],
+ 'CRM_Core_DAO_Timezone' => [
'name' => 'Timezone',
'class' => 'CRM_Core_DAO_Timezone',
'table' => 'civicrm_timezone',
- ) ,
- 'CRM_Core_DAO_OpenID' => array(
+ ],
+ 'CRM_Core_DAO_OpenID' => [
'name' => 'OpenID',
'class' => 'CRM_Core_DAO_OpenID',
'table' => 'civicrm_openid',
- ) ,
- 'CRM_Core_DAO_Website' => array(
+ ],
+ 'CRM_Core_DAO_Website' => [
'name' => 'Website',
'class' => 'CRM_Core_DAO_Website',
'table' => 'civicrm_website',
- ) ,
- 'CRM_Core_DAO_Setting' => array(
+ ],
+ 'CRM_Core_DAO_Setting' => [
'name' => 'Setting',
'class' => 'CRM_Core_DAO_Setting',
'table' => 'civicrm_setting',
- ) ,
- 'CRM_Core_DAO_PrintLabel' => array(
+ ],
+ 'CRM_Core_DAO_PrintLabel' => [
'name' => 'PrintLabel',
'class' => 'CRM_Core_DAO_PrintLabel',
'table' => 'civicrm_print_label',
- ) ,
- 'CRM_Core_DAO_WordReplacement' => array(
+ ],
+ 'CRM_Core_DAO_WordReplacement' => [
'name' => 'WordReplacement',
'class' => 'CRM_Core_DAO_WordReplacement',
'table' => 'civicrm_word_replacement',
- ) ,
- 'CRM_Core_DAO_StatusPreference' => array(
+ ],
+ 'CRM_Core_DAO_StatusPreference' => [
'name' => 'StatusPreference',
'class' => 'CRM_Core_DAO_StatusPreference',
'table' => 'civicrm_status_pref',
- ) ,
- 'CRM_ACL_DAO_Cache' => array(
+ ],
+ 'CRM_ACL_DAO_Cache' => [
'name' => 'Cache',
'class' => 'CRM_ACL_DAO_Cache',
'table' => 'civicrm_acl_cache',
- ) ,
- 'CRM_Contact_DAO_Group' => array(
+ ],
+ 'CRM_Contact_DAO_Group' => [
'name' => 'Group',
'class' => 'CRM_Contact_DAO_Group',
'table' => 'civicrm_group',
- ) ,
- 'CRM_Contact_DAO_SubscriptionHistory' => array(
+ ],
+ 'CRM_Contact_DAO_SubscriptionHistory' => [
'name' => 'SubscriptionHistory',
'class' => 'CRM_Contact_DAO_SubscriptionHistory',
'table' => 'civicrm_subscription_history',
- ) ,
- 'CRM_Contact_DAO_GroupContactCache' => array(
+ ],
+ 'CRM_Contact_DAO_GroupContactCache' => [
'name' => 'GroupContactCache',
'class' => 'CRM_Contact_DAO_GroupContactCache',
'table' => 'civicrm_group_contact_cache',
- ) ,
- 'CRM_Contact_DAO_GroupNesting' => array(
+ ],
+ 'CRM_Contact_DAO_GroupNesting' => [
'name' => 'GroupNesting',
'class' => 'CRM_Contact_DAO_GroupNesting',
'table' => 'civicrm_group_nesting',
- ) ,
- 'CRM_Contact_DAO_GroupOrganization' => array(
+ ],
+ 'CRM_Contact_DAO_GroupOrganization' => [
'name' => 'GroupOrganization',
'class' => 'CRM_Contact_DAO_GroupOrganization',
'table' => 'civicrm_group_organization',
- ) ,
- 'CRM_Mailing_Event_DAO_Subscribe' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_Subscribe' => [
'name' => 'Subscribe',
'class' => 'CRM_Mailing_Event_DAO_Subscribe',
'table' => 'civicrm_mailing_event_subscribe',
- ) ,
- 'CRM_Mailing_Event_DAO_Confirm' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_Confirm' => [
'name' => 'Confirm',
'class' => 'CRM_Mailing_Event_DAO_Confirm',
'table' => 'civicrm_mailing_event_confirm',
- ) ,
- 'CRM_Contribute_DAO_ContributionPage' => array(
+ ],
+ 'CRM_Contribute_DAO_ContributionPage' => [
'name' => 'ContributionPage',
'class' => 'CRM_Contribute_DAO_ContributionPage',
'table' => 'civicrm_contribution_page',
- ) ,
- 'CRM_Contribute_DAO_Product' => array(
+ ],
+ 'CRM_Contribute_DAO_Product' => [
'name' => 'Product',
'class' => 'CRM_Contribute_DAO_Product',
'table' => 'civicrm_product',
- ) ,
- 'CRM_Contribute_DAO_PremiumsProduct' => array(
+ ],
+ 'CRM_Contribute_DAO_PremiumsProduct' => [
'name' => 'PremiumsProduct',
'class' => 'CRM_Contribute_DAO_PremiumsProduct',
'table' => 'civicrm_premiums_product',
- ) ,
- 'CRM_Contribute_DAO_Widget' => array(
+ ],
+ 'CRM_Contribute_DAO_Widget' => [
'name' => 'Widget',
'class' => 'CRM_Contribute_DAO_Widget',
'table' => 'civicrm_contribution_widget',
- ) ,
- 'CRM_Financial_DAO_PaymentProcessor' => array(
+ ],
+ 'CRM_Financial_DAO_PaymentProcessor' => [
'name' => 'PaymentProcessor',
'class' => 'CRM_Financial_DAO_PaymentProcessor',
'table' => 'civicrm_payment_processor',
- ) ,
- 'CRM_Financial_DAO_PaymentToken' => array(
+ ],
+ 'CRM_Financial_DAO_PaymentToken' => [
'name' => 'PaymentToken',
'class' => 'CRM_Financial_DAO_PaymentToken',
'table' => 'civicrm_payment_token',
- ) ,
- 'CRM_SMS_DAO_Provider' => array(
+ ],
+ 'CRM_SMS_DAO_Provider' => [
'name' => 'Provider',
'class' => 'CRM_SMS_DAO_Provider',
'table' => 'civicrm_sms_provider',
- ) ,
- 'CRM_Member_DAO_MembershipType' => array(
+ ],
+ 'CRM_Member_DAO_MembershipType' => [
'name' => 'MembershipType',
'class' => 'CRM_Member_DAO_MembershipType',
'table' => 'civicrm_membership_type',
- ) ,
- 'CRM_Member_DAO_MembershipBlock' => array(
+ ],
+ 'CRM_Member_DAO_MembershipBlock' => [
'name' => 'MembershipBlock',
'class' => 'CRM_Member_DAO_MembershipBlock',
'table' => 'civicrm_membership_block',
- ) ,
- 'CRM_Case_DAO_Case' => array(
+ ],
+ 'CRM_Case_DAO_Case' => [
'name' => 'Case',
'class' => 'CRM_Case_DAO_Case',
'table' => 'civicrm_case',
- ) ,
- 'CRM_Case_DAO_CaseContact' => array(
+ ],
+ 'CRM_Case_DAO_CaseContact' => [
'name' => 'CaseContact',
'class' => 'CRM_Case_DAO_CaseContact',
'table' => 'civicrm_case_contact',
- ) ,
- 'CRM_Pledge_DAO_Pledge' => array(
+ ],
+ 'CRM_Pledge_DAO_Pledge' => [
'name' => 'Pledge',
'class' => 'CRM_Pledge_DAO_Pledge',
'table' => 'civicrm_pledge',
- ) ,
- 'CRM_Report_DAO_ReportInstance' => array(
+ ],
+ 'CRM_Report_DAO_ReportInstance' => [
'name' => 'ReportInstance',
'class' => 'CRM_Report_DAO_ReportInstance',
'table' => 'civicrm_report_instance',
- ) ,
- 'CRM_Price_DAO_PriceSet' => array(
+ ],
+ 'CRM_Price_DAO_PriceSet' => [
'name' => 'PriceSet',
'class' => 'CRM_Price_DAO_PriceSet',
'table' => 'civicrm_price_set',
- ) ,
- 'CRM_Price_DAO_PriceSetEntity' => array(
+ ],
+ 'CRM_Price_DAO_PriceSetEntity' => [
'name' => 'PriceSetEntity',
'class' => 'CRM_Price_DAO_PriceSetEntity',
'table' => 'civicrm_price_set_entity',
- ) ,
- 'CRM_Core_DAO_County' => array(
+ ],
+ 'CRM_Core_DAO_County' => [
'name' => 'County',
'class' => 'CRM_Core_DAO_County',
'table' => 'civicrm_county',
- ) ,
- 'CRM_Core_DAO_Dashboard' => array(
+ ],
+ 'CRM_Core_DAO_Dashboard' => [
'name' => 'Dashboard',
'class' => 'CRM_Core_DAO_Dashboard',
'table' => 'civicrm_dashboard',
- ) ,
- 'CRM_Core_DAO_Discount' => array(
+ ],
+ 'CRM_Core_DAO_Discount' => [
'name' => 'Discount',
'class' => 'CRM_Core_DAO_Discount',
'table' => 'civicrm_discount',
- ) ,
- 'CRM_Core_DAO_EntityTag' => array(
+ ],
+ 'CRM_Core_DAO_EntityTag' => [
'name' => 'EntityTag',
'class' => 'CRM_Core_DAO_EntityTag',
'table' => 'civicrm_entity_tag',
- ) ,
- 'CRM_Core_DAO_UFGroup' => array(
+ ],
+ 'CRM_Core_DAO_UFGroup' => [
'name' => 'UFGroup',
'class' => 'CRM_Core_DAO_UFGroup',
'table' => 'civicrm_uf_group',
- ) ,
- 'CRM_Core_DAO_UFField' => array(
+ ],
+ 'CRM_Core_DAO_UFField' => [
'name' => 'UFField',
'class' => 'CRM_Core_DAO_UFField',
'table' => 'civicrm_uf_field',
- ) ,
- 'CRM_Core_DAO_UFJoin' => array(
+ ],
+ 'CRM_Core_DAO_UFJoin' => [
'name' => 'UFJoin',
'class' => 'CRM_Core_DAO_UFJoin',
'table' => 'civicrm_uf_join',
- ) ,
- 'CRM_Core_DAO_ActionSchedule' => array(
+ ],
+ 'CRM_Core_DAO_ActionSchedule' => [
'name' => 'ActionSchedule',
'class' => 'CRM_Core_DAO_ActionSchedule',
'table' => 'civicrm_action_schedule',
- ) ,
- 'CRM_Core_DAO_ActionLog' => array(
+ ],
+ 'CRM_Core_DAO_ActionLog' => [
'name' => 'ActionLog',
'class' => 'CRM_Core_DAO_ActionLog',
'table' => 'civicrm_action_log',
- ) ,
- 'CRM_Contact_DAO_DashboardContact' => array(
+ ],
+ 'CRM_Contact_DAO_DashboardContact' => [
'name' => 'DashboardContact',
'class' => 'CRM_Contact_DAO_DashboardContact',
'table' => 'civicrm_dashboard_contact',
- ) ,
- 'CRM_Contact_DAO_Relationship' => array(
+ ],
+ 'CRM_Contact_DAO_Relationship' => [
'name' => 'Relationship',
'class' => 'CRM_Contact_DAO_Relationship',
'table' => 'civicrm_relationship',
- ) ,
- 'CRM_Mailing_DAO_Mailing' => array(
+ ],
+ 'CRM_Mailing_DAO_Mailing' => [
'name' => 'Mailing',
'class' => 'CRM_Mailing_DAO_Mailing',
'table' => 'civicrm_mailing',
- ) ,
- 'CRM_Mailing_DAO_MailingGroup' => array(
+ ],
+ 'CRM_Mailing_DAO_MailingGroup' => [
'name' => 'MailingGroup',
'class' => 'CRM_Mailing_DAO_MailingGroup',
'table' => 'civicrm_mailing_group',
- ) ,
- 'CRM_Mailing_DAO_TrackableURL' => array(
+ ],
+ 'CRM_Mailing_DAO_TrackableURL' => [
'name' => 'TrackableURL',
'class' => 'CRM_Mailing_DAO_TrackableURL',
'table' => 'civicrm_mailing_trackable_url',
- ) ,
- 'CRM_Mailing_DAO_MailingJob' => array(
+ ],
+ 'CRM_Mailing_DAO_MailingJob' => [
'name' => 'MailingJob',
'class' => 'CRM_Mailing_DAO_MailingJob',
'table' => 'civicrm_mailing_job',
- ) ,
- 'CRM_Mailing_DAO_Recipients' => array(
+ ],
+ 'CRM_Mailing_DAO_Recipients' => [
'name' => 'Recipients',
'class' => 'CRM_Mailing_DAO_Recipients',
'table' => 'civicrm_mailing_recipients',
- ) ,
- 'CRM_Mailing_DAO_Spool' => array(
+ ],
+ 'CRM_Mailing_DAO_Spool' => [
'name' => 'Spool',
'class' => 'CRM_Mailing_DAO_Spool',
'table' => 'civicrm_mailing_spool',
- ) ,
- 'CRM_Mailing_Event_DAO_Queue' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_Queue' => [
'name' => 'Queue',
'class' => 'CRM_Mailing_Event_DAO_Queue',
'table' => 'civicrm_mailing_event_queue',
- ) ,
- 'CRM_Mailing_Event_DAO_Bounce' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_Bounce' => [
'name' => 'Bounce',
'class' => 'CRM_Mailing_Event_DAO_Bounce',
'table' => 'civicrm_mailing_event_bounce',
- ) ,
- 'CRM_Mailing_Event_DAO_Delivered' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_Delivered' => [
'name' => 'Delivered',
'class' => 'CRM_Mailing_Event_DAO_Delivered',
'table' => 'civicrm_mailing_event_delivered',
- ) ,
- 'CRM_Mailing_Event_DAO_Forward' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_Forward' => [
'name' => 'Forward',
'class' => 'CRM_Mailing_Event_DAO_Forward',
'table' => 'civicrm_mailing_event_forward',
- ) ,
- 'CRM_Mailing_Event_DAO_Opened' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_Opened' => [
'name' => 'Opened',
'class' => 'CRM_Mailing_Event_DAO_Opened',
'table' => 'civicrm_mailing_event_opened',
- ) ,
- 'CRM_Mailing_Event_DAO_Reply' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_Reply' => [
'name' => 'Reply',
'class' => 'CRM_Mailing_Event_DAO_Reply',
'table' => 'civicrm_mailing_event_reply',
- ) ,
- 'CRM_Mailing_Event_DAO_TrackableURLOpen' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_TrackableURLOpen' => [
'name' => 'TrackableURLOpen',
'class' => 'CRM_Mailing_Event_DAO_TrackableURLOpen',
'table' => 'civicrm_mailing_event_trackable_url_open',
- ) ,
- 'CRM_Mailing_Event_DAO_Unsubscribe' => array(
+ ],
+ 'CRM_Mailing_Event_DAO_Unsubscribe' => [
'name' => 'Unsubscribe',
'class' => 'CRM_Mailing_Event_DAO_Unsubscribe',
'table' => 'civicrm_mailing_event_unsubscribe',
- ) ,
- 'CRM_Contribute_DAO_ContributionRecur' => array(
+ ],
+ 'CRM_Contribute_DAO_ContributionRecur' => [
'name' => 'ContributionRecur',
'class' => 'CRM_Contribute_DAO_ContributionRecur',
'table' => 'civicrm_contribution_recur',
- ) ,
- 'CRM_Financial_DAO_FinancialTrxn' => array(
+ ],
+ 'CRM_Financial_DAO_FinancialTrxn' => [
'name' => 'FinancialTrxn',
'class' => 'CRM_Financial_DAO_FinancialTrxn',
'table' => 'civicrm_financial_trxn',
- ) ,
- 'CRM_Member_DAO_Membership' => array(
+ ],
+ 'CRM_Member_DAO_Membership' => [
'name' => 'Membership',
'class' => 'CRM_Member_DAO_Membership',
'table' => 'civicrm_membership',
- ) ,
- 'CRM_Member_DAO_MembershipLog' => array(
+ ],
+ 'CRM_Member_DAO_MembershipLog' => [
'name' => 'MembershipLog',
'class' => 'CRM_Member_DAO_MembershipLog',
'table' => 'civicrm_membership_log',
- ) ,
- 'CRM_Activity_DAO_Activity' => array(
+ ],
+ 'CRM_Activity_DAO_Activity' => [
'name' => 'Activity',
'class' => 'CRM_Activity_DAO_Activity',
'table' => 'civicrm_activity',
- ) ,
- 'CRM_Activity_DAO_ActivityContact' => array(
+ ],
+ 'CRM_Activity_DAO_ActivityContact' => [
'name' => 'ActivityContact',
'class' => 'CRM_Activity_DAO_ActivityContact',
'table' => 'civicrm_activity_contact',
- ) ,
- 'CRM_Case_DAO_CaseActivity' => array(
+ ],
+ 'CRM_Case_DAO_CaseActivity' => [
'name' => 'CaseActivity',
'class' => 'CRM_Case_DAO_CaseActivity',
'table' => 'civicrm_case_activity',
- ) ,
- 'CRM_Price_DAO_PriceField' => array(
+ ],
+ 'CRM_Price_DAO_PriceField' => [
'name' => 'PriceField',
'class' => 'CRM_Price_DAO_PriceField',
'table' => 'civicrm_price_field',
- ) ,
- 'CRM_Price_DAO_PriceFieldValue' => array(
+ ],
+ 'CRM_Price_DAO_PriceFieldValue' => [
'name' => 'PriceFieldValue',
'class' => 'CRM_Price_DAO_PriceFieldValue',
'table' => 'civicrm_price_field_value',
- ) ,
- 'CRM_PCP_DAO_PCPBlock' => array(
+ ],
+ 'CRM_PCP_DAO_PCPBlock' => [
'name' => 'PCPBlock',
'class' => 'CRM_PCP_DAO_PCPBlock',
'table' => 'civicrm_pcp_block',
- ) ,
- 'CRM_Core_DAO_Address' => array(
+ ],
+ 'CRM_Core_DAO_Address' => [
'name' => 'Address',
'class' => 'CRM_Core_DAO_Address',
'table' => 'civicrm_address',
- ) ,
- 'CRM_Core_DAO_LocBlock' => array(
+ ],
+ 'CRM_Core_DAO_LocBlock' => [
'name' => 'LocBlock',
'class' => 'CRM_Core_DAO_LocBlock',
'table' => 'civicrm_loc_block',
- ) ,
- 'CRM_Contact_DAO_GroupContact' => array(
+ ],
+ 'CRM_Contact_DAO_GroupContact' => [
'name' => 'GroupContact',
'class' => 'CRM_Contact_DAO_GroupContact',
'table' => 'civicrm_group_contact',
- ) ,
- 'CRM_Contribute_DAO_Contribution' => array(
+ ],
+ 'CRM_Contribute_DAO_Contribution' => [
'name' => 'Contribution',
'class' => 'CRM_Contribute_DAO_Contribution',
'table' => 'civicrm_contribution',
- ) ,
- 'CRM_Contribute_DAO_ContributionProduct' => array(
+ ],
+ 'CRM_Contribute_DAO_ContributionProduct' => [
'name' => 'ContributionProduct',
'class' => 'CRM_Contribute_DAO_ContributionProduct',
'table' => 'civicrm_contribution_product',
- ) ,
- 'CRM_Contribute_DAO_ContributionSoft' => array(
+ ],
+ 'CRM_Contribute_DAO_ContributionSoft' => [
'name' => 'ContributionSoft',
'class' => 'CRM_Contribute_DAO_ContributionSoft',
'table' => 'civicrm_contribution_soft',
- ) ,
- 'CRM_Financial_DAO_EntityFinancialTrxn' => array(
+ ],
+ 'CRM_Financial_DAO_EntityFinancialTrxn' => [
'name' => 'EntityFinancialTrxn',
'class' => 'CRM_Financial_DAO_EntityFinancialTrxn',
'table' => 'civicrm_entity_financial_trxn',
- ) ,
- 'CRM_Member_DAO_MembershipPayment' => array(
+ ],
+ 'CRM_Member_DAO_MembershipPayment' => [
'name' => 'MembershipPayment',
'class' => 'CRM_Member_DAO_MembershipPayment',
'table' => 'civicrm_membership_payment',
- ) ,
- 'CRM_Event_DAO_Event' => array(
+ ],
+ 'CRM_Event_DAO_Event' => [
'name' => 'Event',
'class' => 'CRM_Event_DAO_Event',
'table' => 'civicrm_event',
- ) ,
- 'CRM_Event_DAO_Participant' => array(
+ ],
+ 'CRM_Event_DAO_Participant' => [
'name' => 'Participant',
'class' => 'CRM_Event_DAO_Participant',
'table' => 'civicrm_participant',
- ) ,
- 'CRM_Event_DAO_ParticipantPayment' => array(
+ ],
+ 'CRM_Event_DAO_ParticipantPayment' => [
'name' => 'ParticipantPayment',
'class' => 'CRM_Event_DAO_ParticipantPayment',
'table' => 'civicrm_participant_payment',
- ) ,
- 'CRM_Event_Cart_DAO_EventInCart' => array(
+ ],
+ 'CRM_Event_Cart_DAO_EventInCart' => [
'name' => 'EventInCart',
'class' => 'CRM_Event_Cart_DAO_EventInCart',
'table' => 'civicrm_events_in_carts',
- ) ,
- 'CRM_Pledge_DAO_PledgePayment' => array(
+ ],
+ 'CRM_Pledge_DAO_PledgePayment' => [
'name' => 'PledgePayment',
'class' => 'CRM_Pledge_DAO_PledgePayment',
'table' => 'civicrm_pledge_payment',
- ) ,
- 'CRM_Price_DAO_LineItem' => array(
+ ],
+ 'CRM_Price_DAO_LineItem' => [
'name' => 'LineItem',
'class' => 'CRM_Price_DAO_LineItem',
'table' => 'civicrm_line_item',
- ) ,
-);
+ ],
+];
diff --git a/civicrm/CRM/Core/DAO/AllCoreTables.php b/civicrm/CRM/Core/DAO/AllCoreTables.php
index 80a5747771c7b1fcc3acad480a54d7e10e551ecc..6be5be07f763499ac0ec58febc8a082e08e2518f 100644
--- a/civicrm/CRM/Core/DAO/AllCoreTables.php
+++ b/civicrm/CRM/Core/DAO/AllCoreTables.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/DAO/permissions.php b/civicrm/CRM/Core/DAO/permissions.php
index 2ab41a7d2333a1355c4e7200194f7e164587ec1f..7eec741ed822721536bd4b932cdb633a1024cdf0 100644
--- a/civicrm/CRM/Core/DAO/permissions.php
+++ b/civicrm/CRM/Core/DAO/permissions.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Error.php b/civicrm/CRM/Core/Error.php
index a32df209640f523f957c6236db59c63459caf9db..c009a7ffa17e0c862b10e73806012e73db12d4a5 100644
--- a/civicrm/CRM/Core/Error.php
+++ b/civicrm/CRM/Core/Error.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Error/Log.php b/civicrm/CRM/Core/Error/Log.php
index 17d7043175fd572e9f79c19a0477b56d289e7de4..682f4187db04f33481e6906484e0d4df7effd277 100644
--- a/civicrm/CRM/Core/Error/Log.php
+++ b/civicrm/CRM/Core/Error/Log.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Exception.php b/civicrm/CRM/Core/Exception.php
index f538f9aa3a9700dc7a94c36bcfbdbb0f6e31c8fc..7983228060cac481a50829f84b5a6e3bd95591fc 100644
--- a/civicrm/CRM/Core/Exception.php
+++ b/civicrm/CRM/Core/Exception.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Form.php b/civicrm/CRM/Core/Form.php
index 015b8390a7ca7f127234c938dd3723ea348633f3..d6abdc7b3ecc0a901c080d36ae12829aa4e8691d 100644
--- a/civicrm/CRM/Core/Form.php
+++ b/civicrm/CRM/Core/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -408,6 +408,12 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
}
}
+ // Add context for the editing of option groups
+ if (isset($extra['option_context'])) {
+ $context = json_encode($extra['option_context']);
+ $element->setAttribute('data-option-edit-context', $context);
+ }
+
return $element;
}
@@ -1469,6 +1475,9 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
//Set default columns and rows for textarea.
$props['rows'] = isset($props['rows']) ? $props['rows'] : 4;
$props['cols'] = isset($props['cols']) ? $props['cols'] : 60;
+ if (!$props['maxlength'] && isset($fieldSpec['length'])) {
+ $props['maxlength'] = $fieldSpec['length'];
+ }
return $this->add('textarea', $name, $label, $props, $required);
case 'Select Date':
diff --git a/civicrm/CRM/Core/Form/Date.php b/civicrm/CRM/Core/Form/Date.php
index 7e292f8b5aa20a483c5c333c48b6de0d7bcf7926..4d551d39b546e5783be0552570f4cadbfd58e984 100644
--- a/civicrm/CRM/Core/Form/Date.php
+++ b/civicrm/CRM/Core/Form/Date.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Form/RecurringEntity.php b/civicrm/CRM/Core/Form/RecurringEntity.php
index 77d5d62c04a2f2eb073d5853a05120952b52b280..8f3b4d8898da712f112367d0b02fd3a66455058d 100644
--- a/civicrm/CRM/Core/Form/RecurringEntity.php
+++ b/civicrm/CRM/Core/Form/RecurringEntity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Form/Renderer.php b/civicrm/CRM/Core/Form/Renderer.php
index 17bf8d03087ce52b6bc572f15eaf8e6022757918..435506661f611ef789a04b0479ab2a38d1505d9a 100644
--- a/civicrm/CRM/Core/Form/Renderer.php
+++ b/civicrm/CRM/Core/Form/Renderer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Form/Search.php b/civicrm/CRM/Core/Form/Search.php
index 3fe18e72722521f1ed5c07bd1d7bf8c2d96c4c94..9c1e316acb6ce456c2b9fe9324cb16478e1e45cd 100644
--- a/civicrm/CRM/Core/Form/Search.php
+++ b/civicrm/CRM/Core/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Form/ShortCode.php b/civicrm/CRM/Core/Form/ShortCode.php
index cab80329167d51c2d813cb676a5bebf5bef94110..dd1567f386c3dfda62e16e0f455f5bba6dbd2620 100644
--- a/civicrm/CRM/Core/Form/ShortCode.php
+++ b/civicrm/CRM/Core/Form/ShortCode.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Form/Tag.php b/civicrm/CRM/Core/Form/Tag.php
index 386ecab64e601a6a16b8d2fddf0057ba04d87c21..43cbd27e3439c96cefa2d94426c2ef48bb8184d8 100644
--- a/civicrm/CRM/Core/Form/Tag.php
+++ b/civicrm/CRM/Core/Form/Tag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Form/Task.php b/civicrm/CRM/Core/Form/Task.php
index 3342d30bb9a7f66fc64baa55d06cd731d967098b..2a487ba70f1d0f705e68d85e208ea7884508dd4e 100644
--- a/civicrm/CRM/Core/Form/Task.php
+++ b/civicrm/CRM/Core/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Form/Task/Batch.php b/civicrm/CRM/Core/Form/Task/Batch.php
index 034439838b921ff3dfed97aec822c4105c44754b..c242e6cb1f6615a72727884d579cff11fc1ff8eb 100644
--- a/civicrm/CRM/Core/Form/Task/Batch.php
+++ b/civicrm/CRM/Core/Form/Task/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Form/Task/PickProfile.php b/civicrm/CRM/Core/Form/Task/PickProfile.php
index a749fd4a10ee0d4f8b643adcf7cacc55d7ac4c8d..fa655509c75f43bec31800bbfbe1805db1d76534 100644
--- a/civicrm/CRM/Core/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Core/Form/Task/PickProfile.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/HTMLInputCoder.php b/civicrm/CRM/Core/HTMLInputCoder.php
index 695a9969733237dff274db57607f3af8e0ac5b33..9501fe9e990244bee046295bf911be64085162de 100644
--- a/civicrm/CRM/Core/HTMLInputCoder.php
+++ b/civicrm/CRM/Core/HTMLInputCoder.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n.php b/civicrm/CRM/Core/I18n.php
index e54ee44e8186dedafc8291e00633658d435b417d..40107e9824c082af67b837882c90f4a6dcd7f6fd 100644
--- a/civicrm/CRM/Core/I18n.php
+++ b/civicrm/CRM/Core/I18n.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/Form.php b/civicrm/CRM/Core/I18n/Form.php
index 5fe809fdc0cf72491a266d845a6241a5c2927b53..72a32835b77de07231de12d340d55cf90e4eff6d 100644
--- a/civicrm/CRM/Core/I18n/Form.php
+++ b/civicrm/CRM/Core/I18n/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/NativeGettext.php b/civicrm/CRM/Core/I18n/NativeGettext.php
index 16e80fd223b299f07f2ea9d0d0ed8ac3e353aff6..7741229f7205cdda4ae1a870b24fba0f5ef918db 100644
--- a/civicrm/CRM/Core/I18n/NativeGettext.php
+++ b/civicrm/CRM/Core/I18n/NativeGettext.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/PseudoConstant.php b/civicrm/CRM/Core/I18n/PseudoConstant.php
index 699f945b29de2d98cf09bfefc45656bda0318bb7..1f0bf714f063520141fb6a3c6607a1514ba142a2 100644
--- a/civicrm/CRM/Core/I18n/PseudoConstant.php
+++ b/civicrm/CRM/Core/I18n/PseudoConstant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/Schema.php b/civicrm/CRM/Core/I18n/Schema.php
index d1117d080fde28f39bcaa6fdf5343579c5af6424..9d72908401ea76c739ae6a16bcad9dbc0ca11aac 100644
--- a/civicrm/CRM/Core/I18n/Schema.php
+++ b/civicrm/CRM/Core/I18n/Schema.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure.php b/civicrm/CRM/Core/I18n/SchemaStructure.php
index a5cd8d6e63a1fecf4815b2f440d85976101dbf8f..6e06171f2f9e2ff184cdc55814f7d6c3e916116f 100755
--- a/civicrm/CRM/Core/I18n/SchemaStructure.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php
index 194c73e76ea4326a473fc5197e3e4122a02d906b..c28465943f0b31bd348ec44cb8c6d65c4063abde 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php
index dc519f0ea95570a7362ac4b7b1871b6e8217eb8f..0c42fed73e8bddbbe97e02a36f5f2f17ba4a4f9f 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php
index ed7ca438e5e3b8bd706d97ca07fa24a23573bcf7..c6dfcb7b53994cda664263340a6eaad299b5bc6b 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php
index 47981b496f81f8d4e26225485d2e20e74e886894..97d5cc8770e62732931e005ab89ee5537638aaca 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php
index a10b96db02d3b9af538bef6f3e57c9aaca751d00..842798f5241a4600682cb7af0334f7811f308029 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/IDS.php b/civicrm/CRM/Core/IDS.php
index 361682a6f7da43259d5ff4dc9f20463c0aae4d01..1ad9a259bbaab2038bde3e99dd9fec01c3d1bd06 100644
--- a/civicrm/CRM/Core/IDS.php
+++ b/civicrm/CRM/Core/IDS.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/InnoDBIndexer.php b/civicrm/CRM/Core/InnoDBIndexer.php
index 733372ad7843048ab23e67744c74a0b955f8a9e4..9719a0e402e11937aaa0a1708ed52c2e51de06ae 100644
--- a/civicrm/CRM/Core/InnoDBIndexer.php
+++ b/civicrm/CRM/Core/InnoDBIndexer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Invoke.php b/civicrm/CRM/Core/Invoke.php
index 0bd0ed2d310eb3ac5c0e04d737ef9f452462a9d5..e5edcd82c95608fe0fc71d00580392a0f92d412c 100644
--- a/civicrm/CRM/Core/Invoke.php
+++ b/civicrm/CRM/Core/Invoke.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/JobManager.php b/civicrm/CRM/Core/JobManager.php
index a85ce48f0ee98e1e05dbd1ad14c5e9e0e98a4681..e7008ea64517f7801bb4b467af2d018d28afc536 100644
--- a/civicrm/CRM/Core/JobManager.php
+++ b/civicrm/CRM/Core/JobManager.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Joomla.php b/civicrm/CRM/Core/Joomla.php
index 1f03bfa9ea27429916443ebc6f5b20c0334f6122..b64bf9da7d4946d0cee0308df1192bdc800fe0c2 100644
--- a/civicrm/CRM/Core/Joomla.php
+++ b/civicrm/CRM/Core/Joomla.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Key.php b/civicrm/CRM/Core/Key.php
index 7c73a2177b7923b1826326bb7478445781b54598..f8b084463248c287d2df3ac12f423f914b6cc40e 100644
--- a/civicrm/CRM/Core/Key.php
+++ b/civicrm/CRM/Core/Key.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Lock.php b/civicrm/CRM/Core/Lock.php
index 0d175ce6fa0d7067f0fc3d8067774d170cb2f445..ac5c5466edb26ab44c3efd088dfc1a969aeb767d 100644
--- a/civicrm/CRM/Core/Lock.php
+++ b/civicrm/CRM/Core/Lock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Menu.php b/civicrm/CRM/Core/Menu.php
index 8bdf2371e682ec2bd339b2866563f7886e197ffa..c7c0904355069c8ce6dcc3d801dd0fb692196622 100644
--- a/civicrm/CRM/Core/Menu.php
+++ b/civicrm/CRM/Core/Menu.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Module.php b/civicrm/CRM/Core/Module.php
index e792e686525c55800b7c76a7880395469a1a69f8..e75372d49884eb4f90ec0b6d6008244f642a4f84 100644
--- a/civicrm/CRM/Core/Module.php
+++ b/civicrm/CRM/Core/Module.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/OptionGroup.php b/civicrm/CRM/Core/OptionGroup.php
index c9a95591b820d20e6519d1c188e7496ba95c5626..db946e6ca62546275e03d10052fafc3165fc3c20 100644
--- a/civicrm/CRM/Core/OptionGroup.php
+++ b/civicrm/CRM/Core/OptionGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/OptionValue.php b/civicrm/CRM/Core/OptionValue.php
index 33860b52c802018d3a808d51460205163eafe156..c5d9fda7623bfdeda3c985dde919ad4f2e5e13c9 100644
--- a/civicrm/CRM/Core/OptionValue.php
+++ b/civicrm/CRM/Core/OptionValue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Page.php b/civicrm/CRM/Core/Page.php
index 234d9fa85c86d41c6939f2c33ec5bfb6813f3997..54b0ef6ff0a338baf45bb83409d8401da106c561 100644
--- a/civicrm/CRM/Core/Page.php
+++ b/civicrm/CRM/Core/Page.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Page/AJAX.php b/civicrm/CRM/Core/Page/AJAX.php
index 76a6f7ef0e79d098863fa29d615d5cac530bffc5..941c53ff044bd51cb0927f1991772dac6154f9c1 100644
--- a/civicrm/CRM/Core/Page/AJAX.php
+++ b/civicrm/CRM/Core/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Page/AJAX/Attachment.php b/civicrm/CRM/Core/Page/AJAX/Attachment.php
index 6c973b899971eac3372c72308ccac78b2399f542..59fcf9a50a6457fc1182e8994f7655687bd55de2 100644
--- a/civicrm/CRM/Core/Page/AJAX/Attachment.php
+++ b/civicrm/CRM/Core/Page/AJAX/Attachment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Page/AJAX/Location.php b/civicrm/CRM/Core/Page/AJAX/Location.php
index 1ac3f1029b5a9477b44a0e8a1ad5fb0e269ba4ea..96b5df2d1ac5d9f2b8e9038f7b67e098424fd09f 100644
--- a/civicrm/CRM/Core/Page/AJAX/Location.php
+++ b/civicrm/CRM/Core/Page/AJAX/Location.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Page/Basic.php b/civicrm/CRM/Core/Page/Basic.php
index 89b63d0e345d9283ed4f3dbe68c08d1a3113a375..fe3f1652cb9855c0178fc5fb6140c947712658d9 100644
--- a/civicrm/CRM/Core/Page/Basic.php
+++ b/civicrm/CRM/Core/Page/Basic.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Page/File.php b/civicrm/CRM/Core/Page/File.php
index 08e169f8f1b4c8154c10b4f5123127bf238e699e..faa0a114800c433bcbb23ba8e4157c9c6e6dd359 100644
--- a/civicrm/CRM/Core/Page/File.php
+++ b/civicrm/CRM/Core/Page/File.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Page/Inline/Help.php b/civicrm/CRM/Core/Page/Inline/Help.php
index 7ee79b60953b88cd4b1d295526fe7961b51f155a..03717e693452e372a09b75f1e5ee4c439a52e384 100644
--- a/civicrm/CRM/Core/Page/Inline/Help.php
+++ b/civicrm/CRM/Core/Page/Inline/Help.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Page/RecurringEntityPreview.php b/civicrm/CRM/Core/Page/RecurringEntityPreview.php
index 8add4beb3e692addea82f74dab7e6be2c7a3cbfa..07935f9810f9d117341f2068779f37c2268c9bc4 100644
--- a/civicrm/CRM/Core/Page/RecurringEntityPreview.php
+++ b/civicrm/CRM/Core/Page/RecurringEntityPreview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Payment.php b/civicrm/CRM/Core/Payment.php
index f16e6b48ee50331e9f80648abec4c380909aff76..a4192ac9fd20b49805b6d0019861e9357e4ba50d 100644
--- a/civicrm/CRM/Core/Payment.php
+++ b/civicrm/CRM/Core/Payment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
index 621ebde1eedabacb269827fd85fa8cb581ba85bd..2696e2a1abb9f07e24f64c22ddddfd937b2c0224 100644
--- a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -67,24 +67,34 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
// load post ids in $ids
$this->getIDs($ids, $input);
- // This is an unreliable method as there could be more than one instance.
- // Recommended approach is to use the civicrm/payment/ipn/xx url where xx is the payment
- // processor id & the handleNotification function (which should call the completetransaction api & by-pass this
- // entirely). The only thing the IPN class should really do is extract data from the request, validate it
- // & call completetransaction or call fail? (which may not exist yet).
- $paymentProcessorTypeID = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_PaymentProcessorType',
- 'AuthNet', 'id', 'name'
- );
- $paymentProcessorID = (int) civicrm_api3('PaymentProcessor', 'getvalue', array(
- 'is_test' => 0,
- 'options' => array('limit' => 1),
- 'payment_processor_type_id' => $paymentProcessorTypeID,
- 'return' => 'id',
- ));
+ // Attempt to get payment processor ID from URL
+ if (!empty($this->_inputParameters['processor_id'])) {
+ $paymentProcessorID = $this->_inputParameters['processor_id'];
+ }
+ else {
+ // This is an unreliable method as there could be more than one instance.
+ // Recommended approach is to use the civicrm/payment/ipn/xx url where xx is the payment
+ // processor id & the handleNotification function (which should call the completetransaction api & by-pass this
+ // entirely). The only thing the IPN class should really do is extract data from the request, validate it
+ // & call completetransaction or call fail? (which may not exist yet).
+ Civi::log()->warning('Unreliable method used for AuthNet IPN - this will cause problems if you have more than one instance');
+ $paymentProcessorTypeID = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_PaymentProcessorType',
+ 'AuthNet', 'id', 'name'
+ );
+ $paymentProcessorID = (int) civicrm_api3('PaymentProcessor', 'getvalue', array(
+ 'is_test' => 0,
+ 'options' => array('limit' => 1),
+ 'payment_processor_type_id' => $paymentProcessorTypeID,
+ 'return' => 'id',
+ ));
+ }
if (!$this->validateData($input, $ids, $objects, TRUE, $paymentProcessorID)) {
return FALSE;
}
+ if (!empty($ids['paymentProcessor']) && $objects['contributionRecur']->payment_processor_id != $ids['paymentProcessor']) {
+ Civi::log()->warning('Payment Processor does not match the recurring processor id.', array('civi.tag' => 'deprecated'));
+ }
if ($component == 'contribute' && $ids['contributionRecur']) {
// check if first contribution is completed, else complete first contribution
diff --git a/civicrm/CRM/Core/Payment/BaseIPN.php b/civicrm/CRM/Core/Payment/BaseIPN.php
index e77761484bb8585fe15aea2c915cde64fc335542..96cdc87698f57fa3446fbbb4a91388f0c7c52499 100644
--- a/civicrm/CRM/Core/Payment/BaseIPN.php
+++ b/civicrm/CRM/Core/Payment/BaseIPN.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Payment/Elavon.php b/civicrm/CRM/Core/Payment/Elavon.php
index b322859fe87751a40288b60a365f6eea09943f48..eef6b148295fded3ef8683ba38a65ee59090c93c 100644
--- a/civicrm/CRM/Core/Payment/Elavon.php
+++ b/civicrm/CRM/Core/Payment/Elavon.php
@@ -1,7 +1,7 @@
<?php
/*
+----------------------------------------------------------------------------+
- | Elavon (Nova) Virtual Merchant Core Payment Module for CiviCRM version 4.7 |
+ | Elavon (Nova) Virtual Merchant Core Payment Module for CiviCRM version 5 |
+----------------------------------------------------------------------------+
| Licensed to CiviCRM under the Academic Free License version 3.0 |
| |
diff --git a/civicrm/CRM/Core/Payment/FirstData.php b/civicrm/CRM/Core/Payment/FirstData.php
index 116d2322ba533dee6440f013610e11320502007c..6af1f1cea298e0658fa179ecbfd38c872c71df1f 100644
--- a/civicrm/CRM/Core/Payment/FirstData.php
+++ b/civicrm/CRM/Core/Payment/FirstData.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | FirstData Core Payment Module for CiviCRM version 4.7 |
+ | FirstData Core Payment Module for CiviCRM version 5 |
+--------------------------------------------------------------------+
| Licensed to CiviCRM under the Academic Free License version 3.0 |
| |
diff --git a/civicrm/CRM/Core/Payment/Form.php b/civicrm/CRM/Core/Payment/Form.php
index 58b95a84d8e28d09fb5f9cd1882c047d12a67d52..05de148e8248308ddb8c12d44a53c9b2c63b1a19 100644
--- a/civicrm/CRM/Core/Payment/Form.php
+++ b/civicrm/CRM/Core/Payment/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Payment/Manual.php b/civicrm/CRM/Core/Payment/Manual.php
index 5fd1353916e48ec80ba6090f9a77ff9f96631033..bd376a560928289fe94c528ee881b56d90b39087 100644
--- a/civicrm/CRM/Core/Payment/Manual.php
+++ b/civicrm/CRM/Core/Payment/Manual.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Payment/PayPalIPN.php b/civicrm/CRM/Core/Payment/PayPalIPN.php
index 0ff4161ca804001de0f696e62b2711d997537fda..0100ca27d54228aa2f5e125188904094e0907d8f 100644
--- a/civicrm/CRM/Core/Payment/PayPalIPN.php
+++ b/civicrm/CRM/Core/Payment/PayPalIPN.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Payment/PayPalImpl.php b/civicrm/CRM/Core/Payment/PayPalImpl.php
index 80b01dba5788ff0394039e691cdd896a89619c97..3fde78c1bbfddf32a29558ca26cca613280aeebd 100644
--- a/civicrm/CRM/Core/Payment/PayPalImpl.php
+++ b/civicrm/CRM/Core/Payment/PayPalImpl.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -994,6 +994,14 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment {
$url = $this->_paymentProcessor['url_api'] . 'nvp';
}
+ $p = array();
+ foreach ($args as $n => $v) {
+ $p[] = "$n=" . urlencode($v);
+ }
+
+ //NVPRequest for submitting to server
+ $nvpreq = implode('&', $p);
+
if (!function_exists('curl_init')) {
CRM_Core_Error::fatal("curl functions NOT available.");
}
@@ -1010,14 +1018,6 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_POST, 1);
- $p = array();
- foreach ($args as $n => $v) {
- $p[] = "$n=" . urlencode($v);
- }
-
- //NVPRequest for submitting to server
- $nvpreq = implode('&', $p);
-
//setting the nvpreq as POST FIELD to curl
curl_setopt($ch, CURLOPT_POSTFIELDS, $nvpreq);
@@ -1039,9 +1039,9 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment {
curl_close($ch);
}
- if (strtolower($result['ack']) != 'success' &&
- strtolower($result['ack']) != 'successwithwarning'
- ) {
+ $outcome = strtolower(CRM_Utils_Array::value('ack', $result));
+
+ if ($outcome != 'success' && $outcome != 'successwithwarning') {
throw new PaymentProcessorException("{$result['l_shortmessage0']} {$result['l_longmessage0']}");
$e = CRM_Core_Error::singleton();
$e->push($result['l_errorcode0'],
diff --git a/civicrm/CRM/Core/Payment/PayPalProIPN.php b/civicrm/CRM/Core/Payment/PayPalProIPN.php
index 26bf9b38cced62681daf838e8686310f27849b12..d230762395c7a94f7a6e26c8c746dc89276c31ae 100644
--- a/civicrm/CRM/Core/Payment/PayPalProIPN.php
+++ b/civicrm/CRM/Core/Payment/PayPalProIPN.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Payment/PayflowPro.php b/civicrm/CRM/Core/Payment/PayflowPro.php
index 0a914317ba256e5741b58a8d4bda81265a13bdb3..3ca0fa0f7fbd26ad53190ab6d2bdc167261aa73c 100644
--- a/civicrm/CRM/Core/Payment/PayflowPro.php
+++ b/civicrm/CRM/Core/Payment/PayflowPro.php
@@ -1,7 +1,7 @@
<?php
/*
+----------------------------------------------------------------------------+
- | PayflowPro Core Payment Module for CiviCRM version 4.7 |
+ | PayflowPro Core Payment Module for CiviCRM version 5 |
+----------------------------------------------------------------------------+
| Licensed to CiviCRM under the Academic Free License version 3.0 |
| |
@@ -102,7 +102,7 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment {
'CVV2' => $params['cvv2'],
'EXPDATE' => urlencode(sprintf('%02d', (int) $params['month']) . substr($params['year'], 2, 2)),
'ACCTTYPE' => urlencode($params['credit_card_type']),
- 'AMT' => urlencode($params['amount']),
+ 'AMT' => urlencode($this->getAmount($params)),
'CURRENCY' => urlencode($params['currency']),
'FIRSTNAME' => $params['billing_first_name'],
//credit card name
@@ -131,7 +131,7 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment {
$payflow_query_array['TRXTYPE'] = 'R';
$payflow_query_array['OPTIONALTRX'] = 'S';
- $payflow_query_array['OPTIONALTRXAMT'] = $params['amount'];
+ $payflow_query_array['OPTIONALTRXAMT'] = $this->getAmount($params);
//Amount of the initial Transaction. Required
$payflow_query_array['ACTION'] = 'A';
//A for add recurring (M-modify,C-cancel,R-reactivate,I-inquiry,P-payment
diff --git a/civicrm/CRM/Core/Payment/PaymentExpress.php b/civicrm/CRM/Core/Payment/PaymentExpress.php
index f26ddfd571ba88a0dbc8133fb67af995dab7a07e..07322ed5ba53028a64609b9f403312a16b7dd365 100644
--- a/civicrm/CRM/Core/Payment/PaymentExpress.php
+++ b/civicrm/CRM/Core/Payment/PaymentExpress.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Payment/PaymentExpressIPN.php b/civicrm/CRM/Core/Payment/PaymentExpressIPN.php
index 079f81b1aa5a6295d57656717f4c1ee6feae5c0f..52bd5ce82ee7a5d8e1bf47fad650771fdbdbae00 100644
--- a/civicrm/CRM/Core/Payment/PaymentExpressIPN.php
+++ b/civicrm/CRM/Core/Payment/PaymentExpressIPN.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Payment/PaymentExpressUtils.php b/civicrm/CRM/Core/Payment/PaymentExpressUtils.php
index 194f870b9b6228cdf480e4554ab2d68e684019df..c4a544e29e733e1b086445f3ff1e692e4e32840d 100644
--- a/civicrm/CRM/Core/Payment/PaymentExpressUtils.php
+++ b/civicrm/CRM/Core/Payment/PaymentExpressUtils.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Payment/ProcessorForm.php b/civicrm/CRM/Core/Payment/ProcessorForm.php
index 7c924ef88aba0d123e5ae4689d2a87267629b2e0..4b777356ecc5fb42ab8485f398ddb9714e360cfe 100644
--- a/civicrm/CRM/Core/Payment/ProcessorForm.php
+++ b/civicrm/CRM/Core/Payment/ProcessorForm.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Payment/Realex.php b/civicrm/CRM/Core/Payment/Realex.php
index 9af1649742aeb19b211d1d8cfcc0c588cb461b63..c757923468daca684c2fe0e7dab62e2158b36548 100644
--- a/civicrm/CRM/Core/Payment/Realex.php
+++ b/civicrm/CRM/Core/Payment/Realex.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Payment/eWAY.php b/civicrm/CRM/Core/Payment/eWAY.php
index 10be2be366210eb063cf93af9e44ce76ba8c6b13..e26e80e7bfa4d7b359d1a3753392a66573e124e9 100644
--- a/civicrm/CRM/Core/Payment/eWAY.php
+++ b/civicrm/CRM/Core/Payment/eWAY.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Permission.php b/civicrm/CRM/Core/Permission.php
index b9f344975fc4d8455499001883a2af992762c074..ce7d2b2bd6e47eb43d605f15d6fa9d83955252f2 100644
--- a/civicrm/CRM/Core/Permission.php
+++ b/civicrm/CRM/Core/Permission.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -724,7 +724,7 @@ class CRM_Core_Permission {
),
'skip IDS check' => array(
$prefix . ts('skip IDS check'),
- ts('IDS system is bypassed for users with this permission. Prevents false errors for admin users.'),
+ ts('Warning: Give to trusted roles only; this permission has security implications. IDS system is bypassed for users with this permission. Prevents false errors for admin users.'),
),
'access uploaded files' => array(
$prefix . ts('access uploaded files'),
@@ -732,21 +732,23 @@ class CRM_Core_Permission {
),
'profile listings and forms' => array(
$prefix . ts('profile listings and forms'),
- ts('Access the profile Search form and listings'),
+ ts('Warning: Give to trusted roles only; this permission has privacy implications. Add/edit data in online forms and access public searchable directories.'),
),
'profile listings' => array(
$prefix . ts('profile listings'),
+ ts('Warning: Give to trusted roles only; this permission has privacy implications. Access public searchable directories.'),
),
'profile create' => array(
$prefix . ts('profile create'),
- ts('Use profiles in Create mode'),
+ ts('Add data in a profile form.'),
),
'profile edit' => array(
$prefix . ts('profile edit'),
- ts('Use profiles in Edit mode'),
+ ts('Edit data in a profile form.'),
),
'profile view' => array(
$prefix . ts('profile view'),
+ ts('View data in a profile.'),
),
'access all custom data' => array(
$prefix . ts('access all custom data'),
@@ -760,8 +762,8 @@ class CRM_Core_Permission {
$prefix . ts('Delete activities'),
),
'access CiviCRM' => array(
- $prefix . ts('access CiviCRM'),
- ts('Master control for access to the main CiviCRM backend and API'),
+ $prefix . ts('access CiviCRM backend and API'),
+ ts('Master control for access to the main CiviCRM backend and API. Give to trusted roles only.'),
),
'access Contact Dashboard' => array(
$prefix . ts('access Contact Dashboard'),
diff --git a/civicrm/CRM/Core/Permission/Backdrop.php b/civicrm/CRM/Core/Permission/Backdrop.php
index aab5d15f519fcad5eab652bccc00f2d70b2322de..f6a0d6f330ab45035ff9024bfd2a552d63ac213e 100644
--- a/civicrm/CRM/Core/Permission/Backdrop.php
+++ b/civicrm/CRM/Core/Permission/Backdrop.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/Base.php b/civicrm/CRM/Core/Permission/Base.php
index e8ddd3ad75c6d336fbefadadc9c4e2dbbefd13fe..c1a48cc49ce4f0b709e8ea836ed1b9e436f2cb9a 100644
--- a/civicrm/CRM/Core/Permission/Base.php
+++ b/civicrm/CRM/Core/Permission/Base.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/Drupal.php b/civicrm/CRM/Core/Permission/Drupal.php
index 814fed6f659fdfdcfa090d5fb17a2e0b684da65a..45ebe56fe1497a3dea4cdcd8a017d712ca333511 100644
--- a/civicrm/CRM/Core/Permission/Drupal.php
+++ b/civicrm/CRM/Core/Permission/Drupal.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/Drupal6.php b/civicrm/CRM/Core/Permission/Drupal6.php
index dd29bdac69e2dba58ffe9d4719f2fb55a7b72ab5..93ddf08a4c53cfce610adb20755441233dff38d4 100644
--- a/civicrm/CRM/Core/Permission/Drupal6.php
+++ b/civicrm/CRM/Core/Permission/Drupal6.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/Drupal8.php b/civicrm/CRM/Core/Permission/Drupal8.php
index a37dcfcbc2eedeca44cf6b552b6d3bc271fa1d05..7c65629ef26de5f565cf13a1358a24fdd903fb1f 100644
--- a/civicrm/CRM/Core/Permission/Drupal8.php
+++ b/civicrm/CRM/Core/Permission/Drupal8.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/DrupalBase.php b/civicrm/CRM/Core/Permission/DrupalBase.php
index 37ca28008eed218cc2b0101f0457bc45bd8264f9..8088ef0820a383daa016c91ac271be503b14118d 100644
--- a/civicrm/CRM/Core/Permission/DrupalBase.php
+++ b/civicrm/CRM/Core/Permission/DrupalBase.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/Joomla.php b/civicrm/CRM/Core/Permission/Joomla.php
index d3c9e947a4197cf1299814766a5b3bf8eeb8b8c9..50f583fb61c34b5b4f56f7da168210a06ff2774e 100644
--- a/civicrm/CRM/Core/Permission/Joomla.php
+++ b/civicrm/CRM/Core/Permission/Joomla.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/Soap.php b/civicrm/CRM/Core/Permission/Soap.php
index 7bf7def981a09343743cecb1a1e1bd002ce8c5b0..57938812b6bf98b2191dbc8e7fe1e78bea3dda79 100644
--- a/civicrm/CRM/Core/Permission/Soap.php
+++ b/civicrm/CRM/Core/Permission/Soap.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/Temp.php b/civicrm/CRM/Core/Permission/Temp.php
index dc74563960051975c34040ce40bd35b67291e7ac..37eede8e9ee17e96b7c8d9e4343301881de34475 100644
--- a/civicrm/CRM/Core/Permission/Temp.php
+++ b/civicrm/CRM/Core/Permission/Temp.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/UnitTests.php b/civicrm/CRM/Core/Permission/UnitTests.php
index b8dc30c0809c6bd8494a70b890e543110d64c1dc..8dc1a057934c8df49a61e1d4c8697b0151fa1b7d 100644
--- a/civicrm/CRM/Core/Permission/UnitTests.php
+++ b/civicrm/CRM/Core/Permission/UnitTests.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Permission/WordPress.php b/civicrm/CRM/Core/Permission/WordPress.php
index bd289c18b76683eba52eef7ec9108527c259ab3c..bc032d05a276f0b0fdf2ff426de14c61bc6f2588 100644
--- a/civicrm/CRM/Core/Permission/WordPress.php
+++ b/civicrm/CRM/Core/Permission/WordPress.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/PseudoConstant.php b/civicrm/CRM/Core/PseudoConstant.php
index 5794c97b5786a1d02625f80eab036407df4ae1dc..fa4234ad1a882ef787973c231eec578be26cf1e3 100644
--- a/civicrm/CRM/Core/PseudoConstant.php
+++ b/civicrm/CRM/Core/PseudoConstant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action.php b/civicrm/CRM/Core/QuickForm/Action.php
index b2b427040c7b46316b0d4c7d368b0b4c1d8e4ab6..1c9577817ee07a69ac7955e15d27d625c2935ffa 100644
--- a/civicrm/CRM/Core/QuickForm/Action.php
+++ b/civicrm/CRM/Core/QuickForm/Action.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Back.php b/civicrm/CRM/Core/QuickForm/Action/Back.php
index 95786fe73dab128131053d927c00ef6cdba656e8..5dcf432b1f4df67c9d5e657d1ea32171abc6330e 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Back.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Back.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Cancel.php b/civicrm/CRM/Core/QuickForm/Action/Cancel.php
index 5e057b6a9a5901e05488f2654ea76ae2a9bc66ae..28bed69cd3ccfc26f9862ed64a6be5a6203a29b9 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Cancel.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Cancel.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Display.php b/civicrm/CRM/Core/QuickForm/Action/Display.php
index 8bde85d132e6b18f01dc42586e4ca20e4e8c920c..0746230ae4302fd2087766b41862f33ff23511af 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Display.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Display.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Done.php b/civicrm/CRM/Core/QuickForm/Action/Done.php
index d70eb55b021ce63cb625e3c40e7b99d21bd3f00f..cd6e0515df19e41cce7afa1abc678dca55a6d258 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Done.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Done.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Jump.php b/civicrm/CRM/Core/QuickForm/Action/Jump.php
index 342823087966cacd5065d144a1017e9df81a76c4..fa8e4db71fb6794e6b6c5d0fc52a6603c4964d02 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Jump.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Jump.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Next.php b/civicrm/CRM/Core/QuickForm/Action/Next.php
index 9167fd08771dab8a4567fda6a4f218586690c1c6..fdc7b9d4ee1cd7b5f1d349010ca55956b310bbf4 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Next.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Next.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Process.php b/civicrm/CRM/Core/QuickForm/Action/Process.php
index 756100875939686e624478f535942c9ecbbf2ed1..dba5f19b7369e71d545e1da9e7993864e23c10d9 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Process.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Process.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Refresh.php b/civicrm/CRM/Core/QuickForm/Action/Refresh.php
index 902f5e84ff5583a995dc42f4ffeaeab8b27acff4..5640ad796e9fa06ee4d236c71262e639f11a993e 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Refresh.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Refresh.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Reload.php b/civicrm/CRM/Core/QuickForm/Action/Reload.php
index 674e411b6b3be89ec809fa77832b4216dc918003..c7e4959a1b948c41846bc5e0946cd34a3f856375 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Reload.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Reload.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Submit.php b/civicrm/CRM/Core/QuickForm/Action/Submit.php
index 6a6dd240c057c4641f21a5398a931069fec3c7d1..400049aec8079f3cb75c5f9f4b5e29b03bd7efb8 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Submit.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Submit.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/Action/Upload.php b/civicrm/CRM/Core/QuickForm/Action/Upload.php
index 865a4669a74288645001d43a25f5b8f3e23956e8..6fa3ca1ddd51236a9df2ab49ca01704bc3e6e10f 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Upload.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Upload.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/QuickForm/GroupMultiSelect.php b/civicrm/CRM/Core/QuickForm/GroupMultiSelect.php
index 8da81e66cf782a70df6514f0922c3369140dd1d2..fe20778e805f7a693c49e7e54cf19e64fec0a55d 100644
--- a/civicrm/CRM/Core/QuickForm/GroupMultiSelect.php
+++ b/civicrm/CRM/Core/QuickForm/GroupMultiSelect.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright U.S. PIRG Education Fund (c) 2007 |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Core/QuickForm/NestedAdvMultiSelect.php b/civicrm/CRM/Core/QuickForm/NestedAdvMultiSelect.php
index fb691c33946987e0a2d1b11343548d22b1b5b2cc..a210b710b17f9672a9e6eeb06e88b0c66bbb9cf3 100644
--- a/civicrm/CRM/Core/QuickForm/NestedAdvMultiSelect.php
+++ b/civicrm/CRM/Core/QuickForm/NestedAdvMultiSelect.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright U.S. PIRG Education Fund (c) 2007 |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/CRM/Core/Report/Excel.php b/civicrm/CRM/Core/Report/Excel.php
index 79c73ebe3a9fee2745e7ad6c97d4a515b0369d93..91b1c74c7df764f47432aa1da42c0f30806b6c9a 100644
--- a/civicrm/CRM/Core/Report/Excel.php
+++ b/civicrm/CRM/Core/Report/Excel.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Resources.php b/civicrm/CRM/Core/Resources.php
index 1472ea4510ca8e19ef91fa389c929bff02bede29..cf937ffa2bb10084c7fefa237f4736f0425cfd3c 100644
--- a/civicrm/CRM/Core/Resources.php
+++ b/civicrm/CRM/Core/Resources.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Resources/Strings.php b/civicrm/CRM/Core/Resources/Strings.php
index 4ae59705003ab7694ec60bc7fed13c65671575e8..ead63dad35272deca24805c4b6bddd0598da41db 100644
--- a/civicrm/CRM/Core/Resources/Strings.php
+++ b/civicrm/CRM/Core/Resources/Strings.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/ScheduledJob.php b/civicrm/CRM/Core/ScheduledJob.php
index 83104896aaf3646edd8dc18e90a6d943e1b26b70..f08e112d3239fe086446dc1a272ed17fa95db2c8 100644
--- a/civicrm/CRM/Core/ScheduledJob.php
+++ b/civicrm/CRM/Core/ScheduledJob.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/SelectValues.php b/civicrm/CRM/Core/SelectValues.php
index 5b770e9a9a564bdb53de4f18393ecf2e54dbb702..73d92562d0f61cdaae7eb8265944c21316c1a47b 100644
--- a/civicrm/CRM/Core/SelectValues.php
+++ b/civicrm/CRM/Core/SelectValues.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -896,7 +896,7 @@ class CRM_Core_SelectValues {
* @return array
*/
public static function getSearchBuilderOperators($fieldType = NULL) {
- $builderOperators = array(
+ return [
'=' => '=',
'!=' => '≠',
'>' => '>',
@@ -912,18 +912,7 @@ class CRM_Core_SelectValues {
'IS NOT EMPTY' => ts('Not Empty'),
'IS NULL' => ts('Is Null'),
'IS NOT NULL' => ts('Not Null'),
- );
- if ($fieldType) {
- switch ($fieldType) {
- case CRM_Utils_Type::T_STRING:
- unset($builderOperators['>']);
- unset($builderOperators['<']);
- unset($builderOperators['>=']);
- unset($builderOperators['<=']);
- break;
- }
- }
- return $builderOperators;
+ ];
}
/**
diff --git a/civicrm/CRM/Core/Selector/API.php b/civicrm/CRM/Core/Selector/API.php
index e125128ee686ea6236596c4c35c8058f6449e31b..7d8dc1be88ac862107a50948bb72760d22f6da89 100644
--- a/civicrm/CRM/Core/Selector/API.php
+++ b/civicrm/CRM/Core/Selector/API.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Selector/Base.php b/civicrm/CRM/Core/Selector/Base.php
index 66ddd220a0242ad5c2e1792d922e87703c213c0b..f5ed2eed9c78bced4538ec6ea373ffa823e7a29d 100644
--- a/civicrm/CRM/Core/Selector/Base.php
+++ b/civicrm/CRM/Core/Selector/Base.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Selector/Controller.php b/civicrm/CRM/Core/Selector/Controller.php
index ed40e2b6ad0dbc8519a6287e39d72a11377c4acd..2ede4dedf72ffe2fe0a2a5f84bf211ecfa328fae 100644
--- a/civicrm/CRM/Core/Selector/Controller.php
+++ b/civicrm/CRM/Core/Selector/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Session.php b/civicrm/CRM/Core/Session.php
index 6ac85ac820c5b769d52bff0bb6ae2a95bddd3aa0..ccadd74bcda457240cbbfc7d97c12a90654b3a52 100644
--- a/civicrm/CRM/Core/Session.php
+++ b/civicrm/CRM/Core/Session.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/ShowHideBlocks.php b/civicrm/CRM/Core/ShowHideBlocks.php
index 7eabad7c0815ab77dd1ea54b5f18c798a4d955e9..510cdd8f5415986082f361b4e57e708d6b553c84 100644
--- a/civicrm/CRM/Core/ShowHideBlocks.php
+++ b/civicrm/CRM/Core/ShowHideBlocks.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty.php b/civicrm/CRM/Core/Smarty.php
index d7538fb12bea38a3fc5b9a6bace3d2e9b36e6656..0d89e7cb61843f11a8efe23331a08ceb4fd629e2 100644
--- a/civicrm/CRM/Core/Smarty.php
+++ b/civicrm/CRM/Core/Smarty.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.crmButton.php b/civicrm/CRM/Core/Smarty/plugins/block.crmButton.php
index 3fc36a2e8a28ab1cf7ca9d9d89173091deeb86df..cf89ef95f9a88dc9e6ae80b668e2a8ed6823ffb7 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.crmButton.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.crmButton.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.edit.php b/civicrm/CRM/Core/Smarty/plugins/block.edit.php
index 4ac39cf572c503ec079be71263081ce21e332340..ba71192b70847ad747bb0a0dd8824786470e4349 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.edit.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.edit.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.htxt.php b/civicrm/CRM/Core/Smarty/plugins/block.htxt.php
index 8556ffc553b3d8f1f60556520b9eb788695c5b12..d135a1965aeea1ff05f4e53d9393b7a5ef92a7c0 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.htxt.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.htxt.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.localize.php b/civicrm/CRM/Core/Smarty/plugins/block.localize.php
index 8d2bddbd4ff02b1aca5f2d09ecf5be7824ebc6cb..b88fc1a88905575883f26bb57b4c20dafa1cb8a4 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.localize.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.localize.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.serialize.php b/civicrm/CRM/Core/Smarty/plugins/block.serialize.php
index bfa1b61acdc1c3bd532ee61051095a59686d62f2..aefc8f8ec0c7e53239f8cae2bacc2c21b84d547a 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.serialize.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.serialize.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.ts.php b/civicrm/CRM/Core/Smarty/plugins/block.ts.php
index 7355190865dd3adf5920c00e149caf430b1a8770..c4fb0051986d2fd3d54b024c39b13028f170cf76 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.ts.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.ts.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php b/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php
index 75fb7e2163ba519ed01d863579f080b3593cc7c1..f86630d580b0648553d6dfa807aaa54ef1bb57be 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmAttributes.php b/civicrm/CRM/Core/Smarty/plugins/function.crmAttributes.php
index 5843e19c2199d1f72156a3fafeab72582978ba1e..456b6663897cbc0fff15e0e54b9af7efa6894670 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmAttributes.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmAttributes.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmCrudLink.php b/civicrm/CRM/Core/Smarty/plugins/function.crmCrudLink.php
index e9ddca479d91297b2c945fbb40434aecc6278ddf..828447a438fa8ae1233f1172b31fbdcceea0c493 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmCrudLink.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmCrudLink.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmDBTpl.php b/civicrm/CRM/Core/Smarty/plugins/function.crmDBTpl.php
index a91d85e6512a03ae650efe071cd201741202d032..ebcf428a6a88d9cea54a2444d6b254aa90421f01 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmDBTpl.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmDBTpl.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmGetAttribute.php b/civicrm/CRM/Core/Smarty/plugins/function.crmGetAttribute.php
index bad02518fb8e931a36f6cfcda4dd9cb543f78f61..de61c02e30abb2cae9d496c98d77a06a44b8fd70 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmGetAttribute.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmGetAttribute.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmKey.php b/civicrm/CRM/Core/Smarty/plugins/function.crmKey.php
index 3339604d6efdb43c996fef0d399ed579ec92887e..240a72e6ca6b64d2f752c1c32027d9a819d771d3 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmKey.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmKey.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmNavigationMenu.php b/civicrm/CRM/Core/Smarty/plugins/function.crmNavigationMenu.php
index ed8e9ddd9783def914e9284c7e01e3f58f4cfa94..90820445161727073871c9f126352829e65cab0d 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmNavigationMenu.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmNavigationMenu.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmResPath.php b/civicrm/CRM/Core/Smarty/plugins/function.crmResPath.php
index 19d5ff606ac9d11ca880d8cf6156ec7520a3afd9..5ae7ee249768471e08b31ce333d0fab348c5b828 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmResPath.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmResPath.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmResURL.php b/civicrm/CRM/Core/Smarty/plugins/function.crmResURL.php
index e1457b7dfa6a073c1eaaa76928d964a997a3e44c..c12d7fd03c4b498b1d8e7791fa223dec508e969e 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmResURL.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmResURL.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmScript.php b/civicrm/CRM/Core/Smarty/plugins/function.crmScript.php
index 2374f4a7a4613cf73a114a20219a6e673875e0b0..7ace2fe1fc0dd597b94cc925a28c8a8458aa0296 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmScript.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmScript.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmSetting.php b/civicrm/CRM/Core/Smarty/plugins/function.crmSetting.php
index ccb7d8ae72c034b3851314136a36c5b513514b16..d83e236f56771338454e8c25cc239f82d03d672c 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmSetting.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmSetting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmSigner.php b/civicrm/CRM/Core/Smarty/plugins/function.crmSigner.php
index 713f051be6f87df43312370f13552ab036f41c7d..21e13b05be79d7d771def380fa6c7ff8a512f373 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmSigner.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmSigner.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php b/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php
index 164f9d8fb61d58e5c51665a5bb79b9fcf398d8d8..51e70aaca6b1715018f470b4f759dfe5b771b102 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmVersion.php b/civicrm/CRM/Core/Smarty/plugins/function.crmVersion.php
index 338c5ec57f165e775f693f0ea29e1147d7817f3f..7bc3265c4e289e5aa030d9b3b7814dbea28443c5 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmVersion.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmVersion.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.docURL.php b/civicrm/CRM/Core/Smarty/plugins/function.docURL.php
index 0e9ec43638765ae32891670ee8302fed9270ddaf..f8fc6eb65347909cbbb962866aaf107424456bb2 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.docURL.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.docURL.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.help.php b/civicrm/CRM/Core/Smarty/plugins/function.help.php
index 9f989cbaeb5de70a389c575b73244c8aa61f3f16..c4e4836c9816152538e29f561ce1ca8ad7c11fc3 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.help.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.help.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.isValueChange.php b/civicrm/CRM/Core/Smarty/plugins/function.isValueChange.php
index 10d92b574ed33c9bc119ff63eddb9d4d9e8d5551..bb3fa6d111ec427aa3547da78c85c3a6c44fecab 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.isValueChange.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.isValueChange.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.sectionTotal.php b/civicrm/CRM/Core/Smarty/plugins/function.sectionTotal.php
index 36b0c9776a3c225f9bbbc5a98c3187c9e83e27a2..116ea1b04af81f8872694762869982ce21133d13 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.sectionTotal.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.sectionTotal.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.colorContrast.php b/civicrm/CRM/Core/Smarty/plugins/modifier.colorContrast.php
index 3f5b3a1c717bfcc5f7e7fc1d67818107b8a8bc3f..b67fad5d70ce8f77ad6248a380f959f1b794a35c 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.colorContrast.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.colorContrast.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmAddClass.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmAddClass.php
index ab4f4a5b77205a6c663b50f63cec0b300e12f66b..995ef5cf8ea32313d2b9c7e883582ee2802e6b2c 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmAddClass.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmAddClass.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmBtnType.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmBtnType.php
index ce43182c89580f03e61b7b6d895e59ab7b9c0e6a..4e87fe0f23fb80b1824328467c7262975cbb774e 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmBtnType.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmBtnType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php
index f25187afbca725610da1f5193042e723954c38e3..9be188e94f75f91221ad2877b89dd362efe3643f 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDelete.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDelete.php
index 938ba213905358096ba495e9d5218cdce8b2ae14..f37600f092886ce7b9595ece451ce96e32189a5a 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDelete.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDelete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmFirstWord.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmFirstWord.php
index e2ac20ac704ce0fd0912ec1acbc80ad359365175..c897e9be755d2b185378e0b765e941b49cb5ad58 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmFirstWord.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmFirstWord.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalDate.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalDate.php
index a79e951abffcf7ab2b2ce51bc5377e5c326b0a9d..592f077da8c623030fdde8500fc9a392cfcca3f0 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalDate.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalDate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalText.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalText.php
index 060540337618353a98fd74dc51a5778e52559e7d..deb7e5508171abcc115db5d481a3a89149139c7c 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalText.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalText.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmInsert.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmInsert.php
index 41a6bba50606a100e9605575807d561ec8fd8c32..065b389b8aa33747288addaf2348bf1dccb4c327 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmInsert.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmInsert.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmMoney.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmMoney.php
index 95562bf149182d93e143a920551fe2abdeb009ef..522ad2e9dc4ff5373061d501923d99e19ad5f008 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmMoney.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmMoney.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php
index 2cec64c283b94a31a9b19027f8d46b688795bc4b..b5ecd1703f39eb9db5c746eec78c19edca739bc9 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmReplace.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmReplace.php
index 9834bedce9f622a2897b5aab6908f625b42c7bf2..9a5f9a25dcf09ba8c7b904ea0ce7a5e31d089045 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmReplace.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmReplace.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmStripAlternatives.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmStripAlternatives.php
index 1cb555ac5ce3e9c0f84009282140adfd943a10ea..c573b4091b9ef2abda71730952ea6db7f8e45ebe 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmStripAlternatives.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmStripAlternatives.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.htmlize.php b/civicrm/CRM/Core/Smarty/plugins/modifier.htmlize.php
index 5bb137e965d5b58ff484d6932c0d3b023ab85449..8de710adf2b1bff767cd71264fba2d6553125c38 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.htmlize.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.htmlize.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.json.php b/civicrm/CRM/Core/Smarty/plugins/modifier.json.php
index 4924582e0b333f9ac82df80bc2eda8d28249a7ed..d35cf1957d7ce5036078b80a648c4388f90b96c7 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.json.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.json.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.mb_truncate.php b/civicrm/CRM/Core/Smarty/plugins/modifier.mb_truncate.php
index 3e320060693c7c0d833253935df12f71ab384bb8..e099673c9a891f0b58dcabbdeab5ecf783039e1b 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.mb_truncate.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.mb_truncate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.substring.php b/civicrm/CRM/Core/Smarty/plugins/modifier.substring.php
index 3314434a2e7fcc0c6c4764525aae21586f928fd4..d5de6ed42b5779b4ae874619da033e059e4053b3 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.substring.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.substring.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Smarty/resources/String.php b/civicrm/CRM/Core/Smarty/resources/String.php
index f6069669a151fe27ab543936692021d4ba27144f..72165a1690759420c89aa703397dcbb9152a68ae 100644
--- a/civicrm/CRM/Core/Smarty/resources/String.php
+++ b/civicrm/CRM/Core/Smarty/resources/String.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/State.php b/civicrm/CRM/Core/State.php
index 5c99b0aaded6c74878539f202c872b52a9a7f6f9..6997eed7e81cee3a819f30fd67ce3bfe15ed4de3 100644
--- a/civicrm/CRM/Core/State.php
+++ b/civicrm/CRM/Core/State.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/StateMachine.php b/civicrm/CRM/Core/StateMachine.php
index 73ac21ae5e7df014b6e77768882c23d58f7840ce..4b4679324016caf3a6deba0c221e9ed71e550fb1 100644
--- a/civicrm/CRM/Core/StateMachine.php
+++ b/civicrm/CRM/Core/StateMachine.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/TableHierarchy.php b/civicrm/CRM/Core/TableHierarchy.php
index 66cc644744b59b937642d01c97f8bfcc33ac1060..f45772c835443bb61e801d9cd20943e5112e6365 100644
--- a/civicrm/CRM/Core/TableHierarchy.php
+++ b/civicrm/CRM/Core/TableHierarchy.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Task.php b/civicrm/CRM/Core/Task.php
index f9b7ef95330778b4422b5db417e68c00e2784554..51e67c8346621eaae772f16ac44f1d74cba4bc03 100644
--- a/civicrm/CRM/Core/Task.php
+++ b/civicrm/CRM/Core/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Core/Transaction.php b/civicrm/CRM/Core/Transaction.php
index 8f9afb30f54c365e4ba311befedb9ab6f6d3e79f..478ac425f9476d80d6a6e8c682b2fa458dba7199 100644
--- a/civicrm/CRM/Core/Transaction.php
+++ b/civicrm/CRM/Core/Transaction.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/ChangeFieldType.php b/civicrm/CRM/Custom/Form/ChangeFieldType.php
index 364abec1c9ae91197deaf22c9076cc78d50e2f59..9fbc7bc571d665bef79b2e9c9671047fcd640f7b 100644
--- a/civicrm/CRM/Custom/Form/ChangeFieldType.php
+++ b/civicrm/CRM/Custom/Form/ChangeFieldType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/CustomData.php b/civicrm/CRM/Custom/Form/CustomData.php
index 876f595e3b0bf78b3c720fe7a693373fe6d195e8..91cd7409318bbbb2be2f2ac5710f9f6fa60f9756 100644
--- a/civicrm/CRM/Custom/Form/CustomData.php
+++ b/civicrm/CRM/Custom/Form/CustomData.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/CustomDataByType.php b/civicrm/CRM/Custom/Form/CustomDataByType.php
index 34fd321e41a7ffc76ca4df2241cf62e0a0c4e0fd..64011b742b652fe51798088b34ddb110355eb751 100644
--- a/civicrm/CRM/Custom/Form/CustomDataByType.php
+++ b/civicrm/CRM/Custom/Form/CustomDataByType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/DeleteField.php b/civicrm/CRM/Custom/Form/DeleteField.php
index 7a717906a9b4d5fe07e2068257d8868b485fdd46..17f946f34ab9def7ac11496aef9c1e254462601d 100644
--- a/civicrm/CRM/Custom/Form/DeleteField.php
+++ b/civicrm/CRM/Custom/Form/DeleteField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/DeleteGroup.php b/civicrm/CRM/Custom/Form/DeleteGroup.php
index 6daad09f21640637fa5dc42c511cc61be21e6dc8..edb8d1386ec8de820480abf515e795e92fb7f8fa 100644
--- a/civicrm/CRM/Custom/Form/DeleteGroup.php
+++ b/civicrm/CRM/Custom/Form/DeleteGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/Field.php b/civicrm/CRM/Custom/Form/Field.php
index c0b374cc74917cce5e7682d86ad09d733442b8cd..6b7b8ee79e4c86e3f3edeaa787224757fe63d5b0 100644
--- a/civicrm/CRM/Custom/Form/Field.php
+++ b/civicrm/CRM/Custom/Form/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/Group.php b/civicrm/CRM/Custom/Form/Group.php
index bedee2eaa2f5412e9776045b354328145cf514f0..90b6947adb6859a742b9a978d7be0b0f1e7a50da 100644
--- a/civicrm/CRM/Custom/Form/Group.php
+++ b/civicrm/CRM/Custom/Form/Group.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/MoveField.php b/civicrm/CRM/Custom/Form/MoveField.php
index 4725d4ca1749eb9efd5fef5104ec0dc4fb701794..73140dfb90531effdb6195e6fd708fcba275baf5 100644
--- a/civicrm/CRM/Custom/Form/MoveField.php
+++ b/civicrm/CRM/Custom/Form/MoveField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/Option.php b/civicrm/CRM/Custom/Form/Option.php
index 7d81cb606938ca6ee28bfe56a9d2fdced09a8cd7..b861c7f3447202c8b959ae206ad90f4076258d30 100644
--- a/civicrm/CRM/Custom/Form/Option.php
+++ b/civicrm/CRM/Custom/Form/Option.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Form/Preview.php b/civicrm/CRM/Custom/Form/Preview.php
index 22c3c0490bf9064b68aafe086cb6897017224361..b068f147c1891df3af06b422c1e289eb61d71472 100644
--- a/civicrm/CRM/Custom/Form/Preview.php
+++ b/civicrm/CRM/Custom/Form/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Import/Field.php b/civicrm/CRM/Custom/Import/Field.php
index 4934f65a15dd0b727b14407602242d2436ea2d3e..1bf1f339a3ba9b8a77aaf1de4c6eff4cb453aebe 100644
--- a/civicrm/CRM/Custom/Import/Field.php
+++ b/civicrm/CRM/Custom/Import/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Import/Form/DataSource.php b/civicrm/CRM/Custom/Import/Form/DataSource.php
index a4a2fdd67993a64750b3312a62a7177f29dc5f62..ef89df465fbbe38f606b667437e70252475e7132 100644
--- a/civicrm/CRM/Custom/Import/Form/DataSource.php
+++ b/civicrm/CRM/Custom/Import/Form/DataSource.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Import/Parser.php b/civicrm/CRM/Custom/Import/Parser.php
index 9a43a680701cf469ccadabf9cfff98ad82b9aafe..0ada953d5bc9dad97505e9fcbd43d2894e6d06c6 100644
--- a/civicrm/CRM/Custom/Import/Parser.php
+++ b/civicrm/CRM/Custom/Import/Parser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Page/AJAX.php b/civicrm/CRM/Custom/Page/AJAX.php
index 653971cde5994e86c750a20248c834cb6e231a0b..c38779e8d93e63bd44c80023539729d9df909e26 100644
--- a/civicrm/CRM/Custom/Page/AJAX.php
+++ b/civicrm/CRM/Custom/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Page/Field.php b/civicrm/CRM/Custom/Page/Field.php
index 0c8969ed94a08f85bd015c465f6a2f46b9e6c88a..4ef16b4cc851bff59e4f2a9120d5ba573b0f20e1 100644
--- a/civicrm/CRM/Custom/Page/Field.php
+++ b/civicrm/CRM/Custom/Page/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Page/Group.php b/civicrm/CRM/Custom/Page/Group.php
index e5cc05135f699f56f749a38e3f28adf2c1ca55f4..49f1996514db54b59b98a0b17a3abce9fc615a43 100644
--- a/civicrm/CRM/Custom/Page/Group.php
+++ b/civicrm/CRM/Custom/Page/Group.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Custom/Page/Option.php b/civicrm/CRM/Custom/Page/Option.php
index 6e4b6e8ec059b738962759015dfb183428edac1d..d17a216db29bcda67efc4a37d1d67e8b0688f934 100644
--- a/civicrm/CRM/Custom/Page/Option.php
+++ b/civicrm/CRM/Custom/Page/Option.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Cxn/ApiRouter.php b/civicrm/CRM/Cxn/ApiRouter.php
index e61dea7513e5d570e49a2b2749bf652025584d4c..f1e9b0056eced4dbaa78acae7f8513e764c2bf7a 100644
--- a/civicrm/CRM/Cxn/ApiRouter.php
+++ b/civicrm/CRM/Cxn/ApiRouter.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Cxn/BAO/Cxn.php b/civicrm/CRM/Cxn/BAO/Cxn.php
index 50b784cfc50986fa82e995728b83ae19a17932a0..4287e17b815327467547f7329024505e6ba74774 100644
--- a/civicrm/CRM/Cxn/BAO/Cxn.php
+++ b/civicrm/CRM/Cxn/BAO/Cxn.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dashlet/Page/Activity.php b/civicrm/CRM/Dashlet/Page/Activity.php
index fb633e58c80d45fdb0544b49f8de52ca8707f06d..aa0dcea3129602208f5b700c6ab1bb95283ec455 100644
--- a/civicrm/CRM/Dashlet/Page/Activity.php
+++ b/civicrm/CRM/Dashlet/Page/Activity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dashlet/Page/AllCases.php b/civicrm/CRM/Dashlet/Page/AllCases.php
index a8196d0fb872d51974cbd91e75930b56e1421427..80331e77b252176d20d6cc9daf0387191a8f46c8 100644
--- a/civicrm/CRM/Dashlet/Page/AllCases.php
+++ b/civicrm/CRM/Dashlet/Page/AllCases.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dashlet/Page/Blog.php b/civicrm/CRM/Dashlet/Page/Blog.php
index 1eb8025c7f8883a3efa680d0a39b1ce3bda06298..23cac0abf75e22fa22ed34297bc6a2e852830511 100644
--- a/civicrm/CRM/Dashlet/Page/Blog.php
+++ b/civicrm/CRM/Dashlet/Page/Blog.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dashlet/Page/CaseDashboard.php b/civicrm/CRM/Dashlet/Page/CaseDashboard.php
index 911079b4bf837eefe55ce20eb7e69c4ab0581a4f..65e25770172f752f5a6a0d6faff8ee0c7001cdcc 100644
--- a/civicrm/CRM/Dashlet/Page/CaseDashboard.php
+++ b/civicrm/CRM/Dashlet/Page/CaseDashboard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dashlet/Page/GettingStarted.php b/civicrm/CRM/Dashlet/Page/GettingStarted.php
index c6d3ebb42e48016bdb45f3af65e3c17b1f0a7ec8..6e51881791c9263c212a5f0db6680e6056c4ddb8 100644
--- a/civicrm/CRM/Dashlet/Page/GettingStarted.php
+++ b/civicrm/CRM/Dashlet/Page/GettingStarted.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dashlet/Page/MyCases.php b/civicrm/CRM/Dashlet/Page/MyCases.php
index 1b2e3bbc80f4d6905112cb13aead82e301134673..057c09ec9fec0262f013c49dd2fdc754d6bfcf2b 100644
--- a/civicrm/CRM/Dashlet/Page/MyCases.php
+++ b/civicrm/CRM/Dashlet/Page/MyCases.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php b/civicrm/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php
index 38bea2a76d3bb5c250ebe5fe0544267f452f204c..d4e1b30eb06ae7c281d517d00a8646cd31a723c4 100644
--- a/civicrm/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php
+++ b/civicrm/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dedupe/BAO/Rule.php b/civicrm/CRM/Dedupe/BAO/Rule.php
index 9cb7bb4d4c98d73d023c97cf483106bdb1d66213..53d73b32fe7a49e47b6810e842adc2374e068c5b 100644
--- a/civicrm/CRM/Dedupe/BAO/Rule.php
+++ b/civicrm/CRM/Dedupe/BAO/Rule.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dedupe/BAO/RuleGroup.php b/civicrm/CRM/Dedupe/BAO/RuleGroup.php
index 0437983151059ae6b959895a02db44d00c8b3ced..dda5bad13635fb55c36a2895b2c4a1b403e52ab9 100644
--- a/civicrm/CRM/Dedupe/BAO/RuleGroup.php
+++ b/civicrm/CRM/Dedupe/BAO/RuleGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dedupe/Finder.php b/civicrm/CRM/Dedupe/Finder.php
index f3baeee76f6b3f54181ee7c7afc3f7c9ba0cbdd5..6a5f7c9e0ccbf142ddc0b18dc8deee57c26b56f9 100644
--- a/civicrm/CRM/Dedupe/Finder.php
+++ b/civicrm/CRM/Dedupe/Finder.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Dedupe/Merger.php b/civicrm/CRM/Dedupe/Merger.php
index a2b25399dddd40c1194d1bab8b9c09cc1299c744..e5229c7d3e652772b4e1ec2475255c2b7362bb72 100644
--- a/civicrm/CRM/Dedupe/Merger.php
+++ b/civicrm/CRM/Dedupe/Merger.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/ActionMapping.php b/civicrm/CRM/Event/ActionMapping.php
index b0425ebc16826ed58b268cd62ce6988e2ba2259b..c58591407bc88a22063c880ebed91f34232c5eec 100644
--- a/civicrm/CRM/Event/ActionMapping.php
+++ b/civicrm/CRM/Event/ActionMapping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/BAO/Event.php b/civicrm/CRM/Event/BAO/Event.php
index e7d430cceaece17638b8320255796ccd765df8ef..30ca5ffaf6d4abe8b573ac85396deddd789baa31 100644
--- a/civicrm/CRM/Event/BAO/Event.php
+++ b/civicrm/CRM/Event/BAO/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/BAO/Participant.php b/civicrm/CRM/Event/BAO/Participant.php
index 7d6bd6c99204f163d4e7485caff0bdae9e9edabd..6d1033ddab690e4341d3c6f0c87211a8e6eddd49 100644
--- a/civicrm/CRM/Event/BAO/Participant.php
+++ b/civicrm/CRM/Event/BAO/Participant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/BAO/ParticipantPayment.php b/civicrm/CRM/Event/BAO/ParticipantPayment.php
index dc9dcfd12cc3aa93566e07ae0f5e28e8f15ea494..66c1b65816df6326e1382961d4efb73de9a0afea 100644
--- a/civicrm/CRM/Event/BAO/ParticipantPayment.php
+++ b/civicrm/CRM/Event/BAO/ParticipantPayment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/BAO/ParticipantStatusType.php b/civicrm/CRM/Event/BAO/ParticipantStatusType.php
index 73790bac2a80a27cd2e4e28b1d6a26ba796da03c..53f2720e9ca6f3fb9ed16cb3e5ee283e2fe294b8 100644
--- a/civicrm/CRM/Event/BAO/ParticipantStatusType.php
+++ b/civicrm/CRM/Event/BAO/ParticipantStatusType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/BAO/Query.php b/civicrm/CRM/Event/BAO/Query.php
index ef04f00564094324af153d0cf66dd7650c6b4bd0..1f96e40b1924a5665cdf2ee8215a94df276fe9bc 100644
--- a/civicrm/CRM/Event/BAO/Query.php
+++ b/civicrm/CRM/Event/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Badge.php b/civicrm/CRM/Event/Badge.php
index c9ef8a6ef006eee3ae1b170cebe8109c564d9045..e073c568271e7b516cf4fdd95ca2462e19717bf1 100644
--- a/civicrm/CRM/Event/Badge.php
+++ b/civicrm/CRM/Event/Badge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Event/Badge/NameTent.php b/civicrm/CRM/Event/Badge/NameTent.php
index c7ee776a036a55bccd66af9e636581a0a4009314..c7c7045cf10c8ab064e19c95c19b73a228a74943 100644
--- a/civicrm/CRM/Event/Badge/NameTent.php
+++ b/civicrm/CRM/Event/Badge/NameTent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Badge/Simple.php b/civicrm/CRM/Event/Badge/Simple.php
index c4705804c0102b258910bb6c18dcf397ef03b213..7d2852dd0468d6d6bed59faa7807ed2d963bca20 100644
--- a/civicrm/CRM/Event/Badge/Simple.php
+++ b/civicrm/CRM/Event/Badge/Simple.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Cart/BAO/MerParticipant.php b/civicrm/CRM/Event/Cart/BAO/MerParticipant.php
index 67586325940bcf6c6e9b4c0fcd60eb8731462498..b78ec0a8a99d76850b73ac42e2012950fe8e71c2 100644
--- a/civicrm/CRM/Event/Cart/BAO/MerParticipant.php
+++ b/civicrm/CRM/Event/Cart/BAO/MerParticipant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Controller/Registration.php b/civicrm/CRM/Event/Controller/Registration.php
index 46e89c3a3ed4ac6a6cc0a92f47ea878dd328f71d..5525c5cb75fa1c4c5e0f16b4942a33dc500252fd 100644
--- a/civicrm/CRM/Event/Controller/Registration.php
+++ b/civicrm/CRM/Event/Controller/Registration.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Controller/Search.php b/civicrm/CRM/Event/Controller/Search.php
index f158f08345c9bdaa894596a7bb67ca4579f8d5ac..7504730dc7efc159300f95cc2fd76d16deb9501d 100644
--- a/civicrm/CRM/Event/Controller/Search.php
+++ b/civicrm/CRM/Event/Controller/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/DAO/Participant.php b/civicrm/CRM/Event/DAO/Participant.php
index 0b7a3c25efbe337f6116bdd4b267013b02745826..a25c71bb8259d9b70a5378d3e5002c11eed989fe 100644
--- a/civicrm/CRM/Event/DAO/Participant.php
+++ b/civicrm/CRM/Event/DAO/Participant.php
@@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Event/Participant.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:444d0ee69773ce242341f8544e192087)
+ * (GenCodeChecksum:2fe76154a50c0317faace43c47c3456a)
*/
/**
@@ -333,6 +333,9 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO {
'entity' => 'Participant',
'bao' => 'CRM_Event_BAO_Participant',
'localizable' => 0,
+ 'html' => [
+ 'type' => 'Text',
+ ],
],
'participant_fee_level' => [
'name' => 'fee_level',
diff --git a/civicrm/CRM/Event/Form/EventFees.php b/civicrm/CRM/Event/Form/EventFees.php
index 618f82baba03f688ad53cd513f06fa7a359f81a2..30672a1d7900e7161acb79fb06c0910e4467061a 100644
--- a/civicrm/CRM/Event/Form/EventFees.php
+++ b/civicrm/CRM/Event/Form/EventFees.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -30,8 +30,6 @@
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2018
- * $Id$
- *
*/
/**
diff --git a/civicrm/CRM/Event/Form/ManageEvent.php b/civicrm/CRM/Event/Form/ManageEvent.php
index 94c41be19eecb433f1428cf450c317a87aebbaf8..d3173546fab3eef4170bbc56f0b26b35d2032385 100644
--- a/civicrm/CRM/Event/Form/ManageEvent.php
+++ b/civicrm/CRM/Event/Form/ManageEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Conference.php b/civicrm/CRM/Event/Form/ManageEvent/Conference.php
index e0fa8d2c2f8eb29e8ca242d95d22758d044090b2..4caa6d087e6f495ca84e129ca3435e89b905578b 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Conference.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Conference.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Delete.php b/civicrm/CRM/Event/Form/ManageEvent/Delete.php
index 4703816c6e9b150fafd9ed4e91d953cf5a859a97..0314f9251fa2d764da1a35b36056605b7dfdab57 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Delete.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php b/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php
index 463541fbdd5b6c86bb174f3788edd543dcd5d408..b6ee9a770c90694197ff129fc0360afcd0c074b9 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Fee.php b/civicrm/CRM/Event/Form/ManageEvent/Fee.php
index 86f406c622e0988c8de47d3d7e01c973565172fe..aea1485120084e3a4a889242448bcc23a8c3e4f2 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Fee.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Fee.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Location.php b/civicrm/CRM/Event/Form/ManageEvent/Location.php
index d8d148416ce348bbd70370fc53585efe6e94de6a..9e86414ea4a3487f8cfab248d5d245837bda9aa9 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Location.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Location.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Registration.php b/civicrm/CRM/Event/Form/ManageEvent/Registration.php
index ca54320d9c14988f71e614f2a85fc5cb71f157b7..aed44b7ad48d2de7912c95ed228d13f9f23c28e8 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Registration.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Registration.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/ManageEvent/ScheduleReminders.php b/civicrm/CRM/Event/Form/ManageEvent/ScheduleReminders.php
index 46e115efcccd700c54805130b1d1455dd35087af..475a0376718542635d0b5c0a98e6771fed01229e 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/ScheduleReminders.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/ScheduleReminders.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php b/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php
index 15f42eb4723668359f4f52e841206ccdcd05c663..b2d3b03649a30d12e606b287dca3d9b412484113 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Participant.php b/civicrm/CRM/Event/Form/Participant.php
index 05596f1f06f4381dd08cb7c9831bb4d7e0c85e4c..0de0114de4f0c6273efae289c576a3222ae6cb9e 100644
--- a/civicrm/CRM/Event/Form/Participant.php
+++ b/civicrm/CRM/Event/Form/Participant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -202,6 +202,13 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
return 'Participant';
}
+ /**
+ * Default form context used as part of addField()
+ */
+ public function getDefaultContext() {
+ return 'create';
+ }
+
/**
* Set variables up before form is built.
*
@@ -733,7 +740,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
$this->addElement('checkbox', 'is_notify', ts('Send Notification'), NULL);
- $this->add('text', 'source', ts('Event Source'));
+ $this->addField('source', array('entity' => 'Participant', 'name' => 'source'));
$noteAttributes = CRM_Core_DAO::getAttribute('CRM_Core_DAO_Note');
$this->add('textarea', 'note', ts('Notes'), $noteAttributes['note']);
diff --git a/civicrm/CRM/Event/Form/ParticipantFeeSelection.php b/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
index 626b906ab33bbd753b749cea0e2bc1e72a25ee6e..a64ef635ee00bffde60cd17f4d145ef509ce4126 100644
--- a/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
+++ b/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/ParticipantView.php b/civicrm/CRM/Event/Form/ParticipantView.php
index ea7f269b4075c617eca80c40617057a75f3b0335..6ad31e9c9f0b6426ce0a5d211d32fad776a934e5 100644
--- a/civicrm/CRM/Event/Form/ParticipantView.php
+++ b/civicrm/CRM/Event/Form/ParticipantView.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -100,6 +100,23 @@ class CRM_Event_Form_ParticipantView extends CRM_Core_Form {
}
$participantStatuses = CRM_Event_PseudoConstant::participantStatus();
+ // CRM-20879: Show 'Transfer or Cancel' option beside 'Change fee selection'
+ // only if logged in user have 'edit event participants' permission and
+ // participant status is not Cancelled or Transferred
+ if (CRM_Core_Permission::check('edit event participants') && !in_array($status, array('Cancelled', 'Transferred'))) {
+ $this->assign('transferOrCancelLink',
+ CRM_Utils_System::url(
+ 'civicrm/event/selfsvcupdate',
+ array(
+ 'reset' => 1,
+ 'is_backoffice' => 1,
+ 'pid' => $participantID,
+ 'cs' => CRM_Contact_BAO_Contact_Utils::generateChecksum($contactID, NULL, 'inf'),
+ )
+ )
+ );
+ }
+
if ($values[$participantID]['is_test']) {
$values[$participantID]['status'] .= ' (test) ';
}
diff --git a/civicrm/CRM/Event/Form/Registration.php b/civicrm/CRM/Event/Form/Registration.php
index 67d25120ea35743a2670cd32ca03eb710bc06f0b..7c10574c6043d6490d522dc3839271e958403cf3 100644
--- a/civicrm/CRM/Event/Form/Registration.php
+++ b/civicrm/CRM/Event/Form/Registration.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php b/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php
index ce698260f1e62064e12c7313a4d6350c8262864b..160c0132b3e90d5753713b7ec5bfec3f34af48c4 100644
--- a/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php
+++ b/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Registration/Confirm.php b/civicrm/CRM/Event/Form/Registration/Confirm.php
index 9780f397e8998440562998b52f5ce04426ec1a5c..da1a8ee522d420454695f1cd357adb3c51103a84 100644
--- a/civicrm/CRM/Event/Form/Registration/Confirm.php
+++ b/civicrm/CRM/Event/Form/Registration/Confirm.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Registration/ParticipantConfirm.php b/civicrm/CRM/Event/Form/Registration/ParticipantConfirm.php
index dd9db82e18a6cab5d9137e3405779a3d037587e0..e889ce4b2260c85fd785aab6e2f7f3f32098ad8b 100644
--- a/civicrm/CRM/Event/Form/Registration/ParticipantConfirm.php
+++ b/civicrm/CRM/Event/Form/Registration/ParticipantConfirm.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Registration/Register.php b/civicrm/CRM/Event/Form/Registration/Register.php
index 8d75931212da22d17bc56831d3ce560023eece66..af1519a35172efa6b4b25a8d9828c46288f14261 100644
--- a/civicrm/CRM/Event/Form/Registration/Register.php
+++ b/civicrm/CRM/Event/Form/Registration/Register.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Registration/ThankYou.php b/civicrm/CRM/Event/Form/Registration/ThankYou.php
index 47eb9929b0bc9192f96f475742db87f5d8818cf0..49af1281a7bb07e1f0687cc671daadb531b94ed6 100644
--- a/civicrm/CRM/Event/Form/Registration/ThankYou.php
+++ b/civicrm/CRM/Event/Form/Registration/ThankYou.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Search.php b/civicrm/CRM/Event/Form/Search.php
index 2243780d321bd722a6ca69ed51128daf16ce4b31..f2f4313b577f61978fd63681eee6ad12cfbb11d2 100644
--- a/civicrm/CRM/Event/Form/Search.php
+++ b/civicrm/CRM/Event/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/SearchEvent.php b/civicrm/CRM/Event/Form/SearchEvent.php
index 24e4ac1dfe0688aa5a7dc82351498c24ab816e8f..5d5966a0ea6f47e8809b9b4f6b088de3081d2152 100644
--- a/civicrm/CRM/Event/Form/SearchEvent.php
+++ b/civicrm/CRM/Event/Form/SearchEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/SelfSvcTransfer.php b/civicrm/CRM/Event/Form/SelfSvcTransfer.php
index a81ad6469f23f3ebf15c7b1b18a479294fe104fb..7452ccb246abe135b25ebaf2e76ba9b3d3c459a3 100644
--- a/civicrm/CRM/Event/Form/SelfSvcTransfer.php
+++ b/civicrm/CRM/Event/Form/SelfSvcTransfer.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -135,6 +135,13 @@ class CRM_Event_Form_SelfSvcTransfer extends CRM_Core_Form {
*/
protected $contact_id;
+ /**
+ * Is backoffice form?
+ *
+ * @array bool
+ */
+ protected $isBackoffice = FALSE;
+
/**
* Get source values for transfer based on participant id in URL. Line items will
* be transferred to this participant - at this point no transaction changes processed
@@ -147,6 +154,7 @@ class CRM_Event_Form_SelfSvcTransfer extends CRM_Core_Form {
$this->_userContext = $session->readUserContext();
$this->_from_participant_id = CRM_Utils_Request::retrieve('pid', 'Positive', $this, FALSE, NULL, 'REQUEST');
$this->_userChecksum = CRM_Utils_Request::retrieve('cs', 'String', $this, FALSE, NULL, 'REQUEST');
+ $this->isBackoffice = CRM_Utils_Request::retrieve('is_backoffice', 'String', $this, FALSE, NULL, 'REQUEST');
$params = array('id' => $this->_from_participant_id);
$participant = $values = array();
$this->_participant = CRM_Event_BAO_Participant::getValues($params, $values, $participant);
@@ -204,9 +212,17 @@ class CRM_Event_Form_SelfSvcTransfer extends CRM_Core_Form {
* return @void
*/
public function buildQuickForm() {
- $this->add('text', 'email', ts('To Email'), ts($this->_contact_email), TRUE);
- $this->add('text', 'last_name', ts('To Last Name'), ts($this->_to_contact_last_name), TRUE);
- $this->add('text', 'first_name', ts('To First Name'), ts($this->_to_contact_first_name), TRUE);
+ // use entityRef select field for contact when this form is used by staff/admin user
+ if ($this->isBackoffice) {
+ $this->addEntityRef("contact_id", ts('Select Contact'), array('create' => TRUE), TRUE);
+ }
+ // for front-end user show and use the basic three fields used to create a contact
+ else {
+ $this->add('text', 'email', ts('To Email'), ts($this->_contact_email), TRUE);
+ $this->add('text', 'last_name', ts('To Last Name'), ts($this->_to_contact_last_name), TRUE);
+ $this->add('text', 'first_name', ts('To First Name'), ts($this->_to_contact_first_name), TRUE);
+ }
+
$this->addButtons(array(
array(
'type' => 'submit',
@@ -234,10 +250,15 @@ class CRM_Event_Form_SelfSvcTransfer extends CRM_Core_Form {
*/
public static function formRule($fields, $files, $self) {
$errors = array();
- //check that either an email or firstname+lastname is included in the form(CRM-9587)
- $to_contact_id = self::checkProfileComplete($fields, $errors, $self);
+ if (!empty($fields['contact_id'])) {
+ $to_contact_id = $fields['contact_id'];
+ }
+ else {
+ //check that either an email or firstname+lastname is included in the form(CRM-9587)
+ $to_contact_id = self::checkProfileComplete($fields, $errors, $self);
+ }
//To check if the user is already registered for the event(CRM-2426)
- if ($to_contact_id) {
+ if (!empty($to_contact_id)) {
self::checkRegistration($fields, $self, $to_contact_id, $errors);
}
//return parent::formrule($fields, $files, $self);
@@ -311,11 +332,16 @@ class CRM_Event_Form_SelfSvcTransfer extends CRM_Core_Form {
public function postProcess() {
//For transfer, process form to allow selection of transferree
$params = $this->controller->exportValues($this->_name);
- //cancel 'from' participant row
- $query = "select contact_id from civicrm_email where email = '" . $params['email'] . "'";
- $dao = CRM_Core_DAO::executeQuery($query);
- while ($dao->fetch()) {
- $contact_id = $dao->contact_id;
+ if (!empty($params['contact_id'])) {
+ $contact_id = $params['contact_id'];
+ }
+ else {
+ //cancel 'from' participant row
+ $query = "select contact_id from civicrm_email where email = '" . $params['email'] . "'";
+ $dao = CRM_Core_DAO::executeQuery($query);
+ while ($dao->fetch()) {
+ $contact_id = $dao->contact_id;
+ }
}
$from_participant = $params = array();
$query = "select role_id, source, fee_level, is_test, is_pay_later, fee_amount, discount_id, fee_currency,campaign_id, discount_amount from civicrm_participant where id = " . $this->_from_participant_id;
@@ -364,6 +390,9 @@ class CRM_Event_Form_SelfSvcTransfer extends CRM_Core_Form {
$statusMsg = ts('Event registration information for %1 has been updated.', array(1 => $displayName));
$statusMsg .= ' ' . ts('A confirmation email has been sent to %1.', array(1 => $email));
CRM_Core_Session::setStatus($statusMsg, ts('Registration Transferred'), 'success');
+ if ($this->isBackoffice) {
+ return;
+ }
$url = CRM_Utils_System::url('civicrm/event/info', "reset=1&id={$this->_event_id}");
CRM_Utils_System::redirect($url);
}
diff --git a/civicrm/CRM/Event/Form/SelfSvcUpdate.php b/civicrm/CRM/Event/Form/SelfSvcUpdate.php
index 72a1374cb25b9430cc74a6f339038ae3ea11c61e..cb42b301a0201d330624dfa62801e46f9bdb420d 100644
--- a/civicrm/CRM/Event/Form/SelfSvcUpdate.php
+++ b/civicrm/CRM/Event/Form/SelfSvcUpdate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -107,6 +107,12 @@ class CRM_Event_Form_SelfSvcUpdate extends CRM_Core_Form {
* @var array
*/
protected $_details = array();
+ /**
+ * Is backoffice form?
+ *
+ * @array bool
+ */
+ protected $isBackoffice = FALSE;
/**
* Set variables up before form is built based on participant ID from URL
*
@@ -119,6 +125,7 @@ class CRM_Event_Form_SelfSvcUpdate extends CRM_Core_Form {
$participant = $values = array();
$this->_participant_id = CRM_Utils_Request::retrieve('pid', 'Positive', $this, FALSE, NULL, 'REQUEST');
$this->_userChecksum = CRM_Utils_Request::retrieve('cs', 'String', $this, FALSE, NULL, 'REQUEST');
+ $this->isBackoffice = CRM_Utils_Request::retrieve('is_backoffice', 'String', $this, FALSE, NULL, 'REQUEST');
$params = array('id' => $this->_participant_id);
$this->_participant = CRM_Event_BAO_Participant::getValues($params, $values, $participant);
$this->_part_values = $values[$this->_participant_id];
@@ -159,7 +166,7 @@ class CRM_Event_Form_SelfSvcUpdate extends CRM_Core_Form {
while ($dao->fetch()) {
$details['status'] = $dao->status;
$details['role'] = $dao->role;
- $details['fee_level'] = $dao->fee_level;
+ $details['fee_level'] = trim($dao->fee_level, CRM_Core_DAO::VALUE_SEPARATOR);
$details['fee_amount'] = $dao->fee_amount;
$details['register_date'] = $dao->register_date;
$details['event_start_date'] = $dao->start_date;
@@ -178,11 +185,11 @@ class CRM_Event_Form_SelfSvcUpdate extends CRM_Core_Form {
}
$start_time = new Datetime($start_date);
$timenow = new Datetime();
- if (!empty($start_time) && $start_time < $timenow) {
+ if (!$this->isBackoffice && !empty($start_time) && $start_time < $timenow) {
$status = ts("Registration for this event cannot be cancelled or transferred once the event has begun. Contact the event organizer if you have questions.");
CRM_Core_Error::statusBounce($status, $url, ts('Sorry'));
}
- if (!empty($time_limit) && $time_limit > 0) {
+ if (!$this->isBackoffice && !empty($time_limit) && $time_limit > 0) {
$interval = $timenow->diff($start_time);
$days = $interval->format('%d');
$hours = $interval->format('%h');
@@ -274,11 +281,16 @@ class CRM_Event_Form_SelfSvcUpdate extends CRM_Core_Form {
* return @void
*/
public function transferParticipant($params) {
- $transferUrl = 'civicrm/event/form/selfsvctransfer';
- $url = CRM_Utils_System::url('civicrm/event/selfsvctransfer', 'reset=1&action=add&pid=' . $this->_participant_id . '&cs=' . $this->_userChecksum);
- $this->controller->setDestination($url);
- $session = CRM_Core_Session::singleton();
- $session->replaceUserContext($url);
+ $isBackOfficeArg = $this->isBackoffice ? '&is_backoffice=1' : '';
+ CRM_Utils_System::redirect(CRM_Utils_System::url(
+ 'civicrm/event/selfsvctransfer',
+ array(
+ 'reset' => 1,
+ 'action' => 'add',
+ 'pid' => $this->_participant_id,
+ 'cs' => $this->_userChecksum,
+ )
+ ));
}
/**
@@ -358,6 +370,9 @@ class CRM_Event_Form_SelfSvcUpdate extends CRM_Core_Form {
$statusMsg = ts('Event registration information for %1 has been updated.', array(1 => $this->_contact_name));
$statusMsg .= ' ' . ts('A cancellation email has been sent to %1.', array(1 => $this->_contact_email));
CRM_Core_Session::setStatus($statusMsg, ts('Thanks'), 'success');
+ if (!empty($this->isBackoffice)) {
+ return;
+ }
$url = CRM_Utils_System::url('civicrm/event/info', "reset=1&id={$this->_event_id}&noFullMsg=true");
CRM_Utils_System::redirect($url);
}
diff --git a/civicrm/CRM/Event/Form/Task.php b/civicrm/CRM/Event/Form/Task.php
index 5c5eb7aa4a330bbb9fa5c347f5f8a591b1bc37ba..263a644cba8cf6e2151b74bda96cc8f5c35a938c 100644
--- a/civicrm/CRM/Event/Form/Task.php
+++ b/civicrm/CRM/Event/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/AddToGroup.php b/civicrm/CRM/Event/Form/Task/AddToGroup.php
index 55e9cde4645693b0762e5d391efc85745d842704..d8dc522de45a36129f5d0415de45e57d046eda66 100644
--- a/civicrm/CRM/Event/Form/Task/AddToGroup.php
+++ b/civicrm/CRM/Event/Form/Task/AddToGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/Badge.php b/civicrm/CRM/Event/Form/Task/Badge.php
index f803648a4cdb3368a5ea69172598f36948c2ce0f..b9ba3977c545f1e1214e78ccacd2b6a0d06c47a2 100644
--- a/civicrm/CRM/Event/Form/Task/Badge.php
+++ b/civicrm/CRM/Event/Form/Task/Badge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/Batch.php b/civicrm/CRM/Event/Form/Task/Batch.php
index 15ef815a84bce6c65d6b17eefe4bedddb2f7b9ac..718212524234b990684d0254cef13f6e2991188b 100644
--- a/civicrm/CRM/Event/Form/Task/Batch.php
+++ b/civicrm/CRM/Event/Form/Task/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -29,12 +29,10 @@
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2018
- * $Id$
- *
*/
/**
- * This class provides the functionality for batch profile update for events
+ * This class provides the functionality for batch profile update for events.
*/
class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
@@ -273,63 +271,7 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
*/
public function postProcess() {
$params = $this->exportValues();
- $statusClasses = CRM_Event_PseudoConstant::participantStatusClass();
- if (isset($params['field'])) {
- foreach ($params['field'] as $key => $value) {
-
- //check for custom data
- $value['custom'] = CRM_Core_BAO_CustomField::postProcess($value,
- $key,
- 'Participant'
- );
-
- $value['id'] = $key;
-
- if (!empty($value['participant_role'])) {
- if (is_array($value['participant_role'])) {
- $value['role_id'] = implode(CRM_Core_DAO::VALUE_SEPARATOR, array_keys($value['participant_role']));
- }
- else {
- $value['role_id'] = $value['participant_role'];
- }
- }
-
- //need to send mail when status change
- $statusChange = FALSE;
- $relatedStatusChange = FALSE;
- if (!empty($value['participant_status'])) {
- $value['status_id'] = $value['participant_status'];
- $fromStatusId = CRM_Utils_Array::value($key, $this->_fromStatusIds);
- if (!$fromStatusId) {
- $fromStatusId = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant', $key, 'status_id');
- }
-
- if ($fromStatusId != $value['status_id']) {
- $relatedStatusChange = TRUE;
- }
- if ($statusClasses[$fromStatusId] != $statusClasses[$value['status_id']]) {
- $statusChange = TRUE;
- }
- }
-
- unset($value['participant_status']);
-
- civicrm_api3('Participant', 'create', $value);
-
- //need to trigger mails when we change status
- if ($statusChange) {
- CRM_Event_BAO_Participant::transitionParticipants(array($key), $value['status_id'], $fromStatusId);
- }
- if ($relatedStatusChange) {
- //update related contribution status, CRM-4395
- self::updatePendingOnlineContribution($key, $value['status_id']);
- }
- }
- CRM_Core_Session::setStatus(ts('The updates have been saved.'), ts('Saved'), 'success');
- }
- else {
- CRM_Core_Session::setStatus(ts('No updates have been saved.'), ts('Not Saved'), 'alert');
- }
+ $this->submit($params);
}
/**
@@ -519,4 +461,77 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
}
}
+ /**
+ * @param $params
+ */
+ public function submit($params) {
+ $statusClasses = CRM_Event_PseudoConstant::participantStatusClass();
+ if (isset($params['field'])) {
+ foreach ($params['field'] as $key => $value) {
+
+ //check for custom data
+ $value['custom'] = CRM_Core_BAO_CustomField::postProcess($value,
+ $key,
+ 'Participant'
+ );
+ foreach (array_keys($value) as $fieldName) {
+ // Unset the original custom field now that it has been formatting to the 'custom'
+ // array as it may not be in the right format for the api as is (notably for
+ // multiple checkbox values).
+ // @todo extract submit functions on other Batch update classes &
+ // extend CRM_Event_Form_Task_BatchTest::testSubmit with a data provider to test them.
+ if (substr($fieldName, 0, 7) === 'custom_') {
+ unset($value[$fieldName]);
+ }
+ }
+
+ $value['id'] = $key;
+
+ if (!empty($value['participant_role'])) {
+ if (is_array($value['participant_role'])) {
+ $value['role_id'] = implode(CRM_Core_DAO::VALUE_SEPARATOR, array_keys($value['participant_role']));
+ }
+ else {
+ $value['role_id'] = $value['participant_role'];
+ }
+ }
+
+ //need to send mail when status change
+ $statusChange = FALSE;
+ $relatedStatusChange = FALSE;
+ if (!empty($value['participant_status'])) {
+ $value['status_id'] = $value['participant_status'];
+ $fromStatusId = CRM_Utils_Array::value($key, $this->_fromStatusIds);
+ if (!$fromStatusId) {
+ $fromStatusId = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant', $key, 'status_id');
+ }
+
+ if ($fromStatusId != $value['status_id']) {
+ $relatedStatusChange = TRUE;
+ }
+ if ($statusClasses[$fromStatusId] != $statusClasses[$value['status_id']]) {
+ $statusChange = TRUE;
+ }
+ }
+
+ unset($value['participant_status']);
+
+ civicrm_api3('Participant', 'create', $value);
+
+ //need to trigger mails when we change status
+ if ($statusChange) {
+ CRM_Event_BAO_Participant::transitionParticipants(array($key), $value['status_id'], $fromStatusId);
+ }
+ if ($relatedStatusChange) {
+ //update related contribution status, CRM-4395
+ self::updatePendingOnlineContribution($key, $value['status_id']);
+ }
+ }
+ CRM_Core_Session::setStatus(ts('The updates have been saved.'), ts('Saved'), 'success');
+ }
+ else {
+ CRM_Core_Session::setStatus(ts('No updates have been saved.'), ts('Not Saved'), 'alert');
+ }
+ }
+
}
diff --git a/civicrm/CRM/Event/Form/Task/Cancel.php b/civicrm/CRM/Event/Form/Task/Cancel.php
index 32347a5994795fc8770cd28be726fee05061712a..024cf3f041b68f56bc9eaec887e41dd73f1ae832 100644
--- a/civicrm/CRM/Event/Form/Task/Cancel.php
+++ b/civicrm/CRM/Event/Form/Task/Cancel.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/Delete.php b/civicrm/CRM/Event/Form/Task/Delete.php
index 92c24ccf437e07d6d9b1d0a13a1683194b020cde..79da52df05a3f754f091c17a52e8ba154aaa3a94 100644
--- a/civicrm/CRM/Event/Form/Task/Delete.php
+++ b/civicrm/CRM/Event/Form/Task/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/Email.php b/civicrm/CRM/Event/Form/Task/Email.php
index 47d6c093b8f54a5d43636cfaef35dea65b47ccb9..7b796f7678ca8803852331a60d8a2eb94b13c0fc 100644
--- a/civicrm/CRM/Event/Form/Task/Email.php
+++ b/civicrm/CRM/Event/Form/Task/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/PDF.php b/civicrm/CRM/Event/Form/Task/PDF.php
index cf29285e24f91ac29399ea475a69b21400b8e7d0..084882f80aa1fb174ddffc56df820411322f20e1 100644
--- a/civicrm/CRM/Event/Form/Task/PDF.php
+++ b/civicrm/CRM/Event/Form/Task/PDF.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/ParticipantStatus.php b/civicrm/CRM/Event/Form/Task/ParticipantStatus.php
index 93606e48000e698846d00718d2dff126179ab602..2ed6cb11ad307cc52512a4d68c4ff47caf8ded23 100644
--- a/civicrm/CRM/Event/Form/Task/ParticipantStatus.php
+++ b/civicrm/CRM/Event/Form/Task/ParticipantStatus.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/PickProfile.php b/civicrm/CRM/Event/Form/Task/PickProfile.php
index 7b53793e8940f0cbb371f37407ce2a139e27ff96..6ee7ecdab8b949f3dfc38bc4bf76133df8ccff08 100644
--- a/civicrm/CRM/Event/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Event/Form/Task/PickProfile.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/Print.php b/civicrm/CRM/Event/Form/Task/Print.php
index a1fee215a3c7e5916d186ae6bacdc7b2d8f966d4..a0d3c7c530a18a78a46d4e5a114f9df9558ecb6c 100644
--- a/civicrm/CRM/Event/Form/Task/Print.php
+++ b/civicrm/CRM/Event/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/Result.php b/civicrm/CRM/Event/Form/Task/Result.php
index 40d724191125d5179c8b8d242bbd6ab8c1bab136..ccce971de71a601d366604dd603f60ed7b7275c5 100644
--- a/civicrm/CRM/Event/Form/Task/Result.php
+++ b/civicrm/CRM/Event/Form/Task/Result.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/SaveSearch.php b/civicrm/CRM/Event/Form/Task/SaveSearch.php
index 7caf2b57b9517f5bc2e52201025678ce64966a50..73e0691c8ff55768dfff696e4882c6a2acc78fe4 100644
--- a/civicrm/CRM/Event/Form/Task/SaveSearch.php
+++ b/civicrm/CRM/Event/Form/Task/SaveSearch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/SaveSearch/Update.php b/civicrm/CRM/Event/Form/Task/SaveSearch/Update.php
index 3ecaf9f49f513ecf102fc4fdf685df1509d8181a..8a87504c5444e866b10d34ad3b94980b855de616 100644
--- a/civicrm/CRM/Event/Form/Task/SaveSearch/Update.php
+++ b/civicrm/CRM/Event/Form/Task/SaveSearch/Update.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Event/Form/Task/SearchTaskHookSample.php
index ae9d0d35cc903ef6ec866245d22b68db5a171b8c..62af41b76d60731c556dee58951d5959acc9ac42 100644
--- a/civicrm/CRM/Event/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Event/Form/Task/SearchTaskHookSample.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Import/Controller.php b/civicrm/CRM/Event/Import/Controller.php
index a792db69f482b5da2d360b380ae64413238e4a82..2cfbb9df694bad552d401ec56d9ae95c4a90ec88 100644
--- a/civicrm/CRM/Event/Import/Controller.php
+++ b/civicrm/CRM/Event/Import/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Import/Field.php b/civicrm/CRM/Event/Import/Field.php
index 3284e466dc75742335b0cd55ca97aa245d02bffb..163ac7cc9111a26e5dce355ba9f8924c3e967fa3 100644
--- a/civicrm/CRM/Event/Import/Field.php
+++ b/civicrm/CRM/Event/Import/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Import/Form/DataSource.php b/civicrm/CRM/Event/Import/Form/DataSource.php
index a6e5332613988fc799ded885b87f36ba536752bc..4e8625b2c92f5ddb206c5f00d4491603fa8e1c85 100644
--- a/civicrm/CRM/Event/Import/Form/DataSource.php
+++ b/civicrm/CRM/Event/Import/Form/DataSource.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Import/Form/MapField.php b/civicrm/CRM/Event/Import/Form/MapField.php
index 6cb388d59692611a6d96dcb7ac9705e7d0ae6af5..fd541826756d7b6e0fa0552eafd8e17771a1b773 100644
--- a/civicrm/CRM/Event/Import/Form/MapField.php
+++ b/civicrm/CRM/Event/Import/Form/MapField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Import/Form/Preview.php b/civicrm/CRM/Event/Import/Form/Preview.php
index 1e97c841ec3c164b62bf52996f78497310acee74..dad95f5ac941fb2eed9544d29405d859614494dd 100644
--- a/civicrm/CRM/Event/Import/Form/Preview.php
+++ b/civicrm/CRM/Event/Import/Form/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Import/Form/Summary.php b/civicrm/CRM/Event/Import/Form/Summary.php
index 9c257f31b5c3fd0b10bcb8cf5315523d61aecdbb..8cb8e2ef9bc7992a9608f70ae029519ae19685b6 100644
--- a/civicrm/CRM/Event/Import/Form/Summary.php
+++ b/civicrm/CRM/Event/Import/Form/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Import/Parser.php b/civicrm/CRM/Event/Import/Parser.php
index 258c29700f9179ff2f5367aa1ec5c799f907e0ff..c800e31d83920a6f9e5a098eea932d25a38ad0cc 100644
--- a/civicrm/CRM/Event/Import/Parser.php
+++ b/civicrm/CRM/Event/Import/Parser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Import/Parser/Participant.php b/civicrm/CRM/Event/Import/Parser/Participant.php
index e7f4fef2a52aa450bfd710f9550e7a51ca8cde6a..e5634f9d2c52f5849fac0064de2ce7552774c787 100644
--- a/civicrm/CRM/Event/Import/Parser/Participant.php
+++ b/civicrm/CRM/Event/Import/Parser/Participant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Info.php b/civicrm/CRM/Event/Info.php
index d60578d2c1533a7e43d26c04b7cb2c40f2dca96b..afd957c157f1c33a2198f9debfc0944b8350dd6d 100644
--- a/civicrm/CRM/Event/Info.php
+++ b/civicrm/CRM/Event/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/AJAX.php b/civicrm/CRM/Event/Page/AJAX.php
index 0bbb25ff418eda4ed954647c92a975ebc35fe9bb..757e0b944401172500ab93ae31ee74c5f201867b 100644
--- a/civicrm/CRM/Event/Page/AJAX.php
+++ b/civicrm/CRM/Event/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/DashBoard.php b/civicrm/CRM/Event/Page/DashBoard.php
index d116fd7d243a35dc9062c94f72447a0a1ad90580..ae38828a885845d491b332d8480c135bc37551f7 100644
--- a/civicrm/CRM/Event/Page/DashBoard.php
+++ b/civicrm/CRM/Event/Page/DashBoard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/EventInfo.php b/civicrm/CRM/Event/Page/EventInfo.php
index 2f79010dc916e254dd3e0a47391ae1b518d49d03..905c978160d2cab5140397b75a1f08a0eef0b9dc 100644
--- a/civicrm/CRM/Event/Page/EventInfo.php
+++ b/civicrm/CRM/Event/Page/EventInfo.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/ICalendar.php b/civicrm/CRM/Event/Page/ICalendar.php
index 70f2aca5a86c418b6e64adfb3a343b6b07aae83c..fb14a33b9fc14f68001ccc247f162cf8991cb1e3 100644
--- a/civicrm/CRM/Event/Page/ICalendar.php
+++ b/civicrm/CRM/Event/Page/ICalendar.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/ManageEvent.php b/civicrm/CRM/Event/Page/ManageEvent.php
index 65f832f0c87c6c9ce690de8262cdf4cee79cf598..97db804ca1e7d6ad6411c151234ac3ecb6ca7814 100644
--- a/civicrm/CRM/Event/Page/ManageEvent.php
+++ b/civicrm/CRM/Event/Page/ManageEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/ParticipantListing.php b/civicrm/CRM/Event/Page/ParticipantListing.php
index 51b630e183510e8027e7edad3e385a10513f30c0..650ea2f5b5f7881e54f2bb9243d3e5f250492e19 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/ParticipantListing/Name.php b/civicrm/CRM/Event/Page/ParticipantListing/Name.php
index 68fd719074cf38cc14c170085782b4db38b5d57b..f647df976ca04e3ad81e68f8693718ce4b376dd4 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing/Name.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing/Name.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/ParticipantListing/NameAndEmail.php b/civicrm/CRM/Event/Page/ParticipantListing/NameAndEmail.php
index dab6f8eb5b9309ca776d4a258089e13dfc67a08c..ad9716e8fe9e65af5cf629677ea758b68404b53a 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing/NameAndEmail.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing/NameAndEmail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php b/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
index e68a20b3b8aadf64ffd9f4f36b634500f36ca3a8..3fdc5796357a200490ba147f0b19f21cc181afbb 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/ParticipantListing/Simple.php b/civicrm/CRM/Event/Page/ParticipantListing/Simple.php
index d384f7e415338d3487c223f373fd6e1af0788071..96611beae329b7184a81d0da9465692443ea6caa 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing/Simple.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing/Simple.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/Tab.php b/civicrm/CRM/Event/Page/Tab.php
index b538a16d53bbc9c9f303f2a67e155033188dbb73..43c898fa9ee8ada49ce5f0d42d3c90ff05f93166 100644
--- a/civicrm/CRM/Event/Page/Tab.php
+++ b/civicrm/CRM/Event/Page/Tab.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Page/UserDashboard.php b/civicrm/CRM/Event/Page/UserDashboard.php
index 7837956ba36fd338f6e44f8b9d8371e20c081415..9432d514b750803dfb6842de3b4d8a636bb55603 100644
--- a/civicrm/CRM/Event/Page/UserDashboard.php
+++ b/civicrm/CRM/Event/Page/UserDashboard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/PseudoConstant.php b/civicrm/CRM/Event/PseudoConstant.php
index 5064ae471c3933b996e20399045875e7ddf26191..f15c43b423dbfcffb4c750014bb1ebea39518a36 100644
--- a/civicrm/CRM/Event/PseudoConstant.php
+++ b/civicrm/CRM/Event/PseudoConstant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Selector/Search.php b/civicrm/CRM/Event/Selector/Search.php
index 015608e563c91bb1bd3ccb16c468823595093072..aae625b24086151c7679f0ae606f626e4c7cce07 100644
--- a/civicrm/CRM/Event/Selector/Search.php
+++ b/civicrm/CRM/Event/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -395,6 +395,20 @@ class CRM_Event_Selector_Search extends CRM_Core_Selector_Base implements CRM_Co
);
}
+ // CRM-20879: Show 'Transfer or Cancel' action only if logged in user
+ // have 'edit event participants' permission and participant status
+ // is not Cancelled or Transferred
+ if (in_array(CRM_Core_Permission::EDIT, $permissions) &&
+ !in_array($statusTypes[$row['participant_status_id']], array('Cancelled', 'Transferred'))
+ ) {
+ $links[] = array(
+ 'name' => ts('Transfer or Cancel'),
+ 'url' => 'civicrm/event/selfsvcupdate',
+ 'qs' => 'reset=1&pid=%%id%%&is_backoffice=1&cs=' . CRM_Contact_BAO_Contact_Utils::generateChecksum($result->contact_id, NULL, 'inf'),
+ 'title' => ts('Transfer or Cancel'),
+ );
+ }
+
$row['action'] = CRM_Core_Action::formLink($links,
$mask,
array(
diff --git a/civicrm/CRM/Event/StateMachine/Registration.php b/civicrm/CRM/Event/StateMachine/Registration.php
index dc9538a90f4b2415d4bb435d58e89930a88454df..033ff07a93c8994424ed47f1cd4a3580aff79310 100644
--- a/civicrm/CRM/Event/StateMachine/Registration.php
+++ b/civicrm/CRM/Event/StateMachine/Registration.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/StateMachine/Search.php b/civicrm/CRM/Event/StateMachine/Search.php
index f2ad1d8e3ba213018a0bc93219d3797cf4d7326a..3cb075d4f6e0c2d6ef2ba0cbe7f04d22e4986a5e 100644
--- a/civicrm/CRM/Event/StateMachine/Search.php
+++ b/civicrm/CRM/Event/StateMachine/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Task.php b/civicrm/CRM/Event/Task.php
index 2aed7336deb07d9d2264a32f4aaffb406fd8831e..666d9895a157d4b975028b7729a46fae3c75b4aa 100644
--- a/civicrm/CRM/Event/Task.php
+++ b/civicrm/CRM/Event/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Event/Tokens.php b/civicrm/CRM/Event/Tokens.php
index c1b68c8b7899ec6b320aabea88e58fd7386f7dc8..7b95b8806236dd5d023452fb91a9f5a88f393972 100644
--- a/civicrm/CRM/Event/Tokens.php
+++ b/civicrm/CRM/Event/Tokens.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Export/BAO/Export.php b/civicrm/CRM/Export/BAO/Export.php
index 3abe80234a4b7d3bb0625ae5d219bc10a368117c..f01ee312607c40060b1794e680e4e8fcf5222525 100644
--- a/civicrm/CRM/Export/BAO/Export.php
+++ b/civicrm/CRM/Export/BAO/Export.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -1909,13 +1909,8 @@ WHERE {$whereClause}";
elseif ($field == 'provider_id') {
$headerRows[] = ts('IM Service Provider');
}
- elseif (substr($field, 0, 5) == 'case_') {
- if ($query->_fields['case'][$field]['title']) {
- $headerRows[] = $query->_fields['case'][$field]['title'];
- }
- elseif ($query->_fields['activity'][$field]['title']) {
- $headerRows[] = $query->_fields['activity'][$field]['title'];
- }
+ elseif (substr($field, 0, 5) == 'case_' && $query->_fields['case'][$field]['title']) {
+ $headerRows[] = $query->_fields['case'][$field]['title'];
}
elseif (array_key_exists($field, $contactRelationshipTypes)) {
foreach ($value as $relationField => $relationValue) {
diff --git a/civicrm/CRM/Export/Controller/Standalone.php b/civicrm/CRM/Export/Controller/Standalone.php
index 4bca9bd46eb8503bf74f43bf1bc8453c6e1662f7..df120c520d3bd1566895c09eb2f38ba470c51fe8 100644
--- a/civicrm/CRM/Export/Controller/Standalone.php
+++ b/civicrm/CRM/Export/Controller/Standalone.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Export/Form/Map.php b/civicrm/CRM/Export/Form/Map.php
index b4428e703e5c47873b584f3e8f38f6e1366fa19b..5dc7de829bb4c79412b279d58e5c161944f01dbb 100644
--- a/civicrm/CRM/Export/Form/Map.php
+++ b/civicrm/CRM/Export/Form/Map.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Export/Form/Select.php b/civicrm/CRM/Export/Form/Select.php
index 30dbe68a838f37c2ee55fccb13bce7c5c53cf7ed..3e36b238ca931b620c43648fa25d868c1e27c802 100644
--- a/civicrm/CRM/Export/Form/Select.php
+++ b/civicrm/CRM/Export/Form/Select.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -157,6 +157,10 @@ class CRM_Export_Form_Select extends CRM_Core_Form {
break;
}
+ if (empty($entityDAOName)) {
+ $entityDAOName = $entityShortname;
+ }
+
if (in_array($entityShortname, $components)) {
$this->_exportMode = constant('CRM_Export_Form_Select::' . strtoupper($entityShortname) . '_EXPORT');
$formTaskClassName = "CRM_{$entityShortname}_Form_Task";
@@ -184,7 +188,7 @@ class CRM_Export_Form_Select extends CRM_Core_Form {
$values = $this->controller->exportValues('Custom');
}
else {
- if (in_array($entityShortname, $components)) {
+ if (in_array($entityShortname, $components) && $entityShortname !== 'Contact') {
$values = $this->controller->exportValues('Search');
}
else {
diff --git a/civicrm/CRM/Export/StateMachine/Standalone.php b/civicrm/CRM/Export/StateMachine/Standalone.php
index 9330c799d2eb2165cdc57687d6dc9aa8723af659..de1b77ca11653452c8ebb36c1a6c9e9b574e9386 100644
--- a/civicrm/CRM/Export/StateMachine/Standalone.php
+++ b/civicrm/CRM/Export/StateMachine/Standalone.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Browser.php b/civicrm/CRM/Extension/Browser.php
index cd82c5f00bbf4d41a9e8805540885cf3e468f38d..96038cec21d75c052c118f18ef78f0b349b8fcec 100644
--- a/civicrm/CRM/Extension/Browser.php
+++ b/civicrm/CRM/Extension/Browser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/ClassLoader.php b/civicrm/CRM/Extension/ClassLoader.php
index cd18e0e0b98195bbd01eb6aba6d28b1475358234..833573849c59be17e8abfd2c5ed7ac972f3523ac 100644
--- a/civicrm/CRM/Extension/ClassLoader.php
+++ b/civicrm/CRM/Extension/ClassLoader.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Container/Basic.php b/civicrm/CRM/Extension/Container/Basic.php
index db230c2772b3698ec053ea05159d790bd95ac83c..e2ff41ee38f404dcd7dacfe81ca8312edc9aeaf3 100644
--- a/civicrm/CRM/Extension/Container/Basic.php
+++ b/civicrm/CRM/Extension/Container/Basic.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Container/Collection.php b/civicrm/CRM/Extension/Container/Collection.php
index abc01cbf600bd0b785a90cc80bf1725bcd6fe608..d9540e9abe35a806de83817ab304776275fbe61f 100644
--- a/civicrm/CRM/Extension/Container/Collection.php
+++ b/civicrm/CRM/Extension/Container/Collection.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Container/Default.php b/civicrm/CRM/Extension/Container/Default.php
index e902b35d00af3e9aa7e26c997a572cb94ba6e9a1..b243ab5f3d8c45dd266f93a05e9f023a7139f25b 100644
--- a/civicrm/CRM/Extension/Container/Default.php
+++ b/civicrm/CRM/Extension/Container/Default.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Container/Interface.php b/civicrm/CRM/Extension/Container/Interface.php
index c4380420d6bd9a274c56e6a7e705fa80e3faa5ea..cd6279842d3cddb50114f206ee8bfba613cbdb3d 100644
--- a/civicrm/CRM/Extension/Container/Interface.php
+++ b/civicrm/CRM/Extension/Container/Interface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Container/Static.php b/civicrm/CRM/Extension/Container/Static.php
index f8557df44b180f0536d564f4bf86fc011c60a814..f7183fd646608b44b5dd356362b20bb07f4b8666 100644
--- a/civicrm/CRM/Extension/Container/Static.php
+++ b/civicrm/CRM/Extension/Container/Static.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Downloader.php b/civicrm/CRM/Extension/Downloader.php
index aaa45877a96c948568ee52a780d39a0f9671db25..d8ff17ab1cca4367bd7e173a8880aceed80a7a3a 100644
--- a/civicrm/CRM/Extension/Downloader.php
+++ b/civicrm/CRM/Extension/Downloader.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Exception.php b/civicrm/CRM/Extension/Exception.php
index 8a69676e292234bb26da16f284cb136ab073030c..cb72febeec4089ffd91b0760280b831a38a9095d 100644
--- a/civicrm/CRM/Extension/Exception.php
+++ b/civicrm/CRM/Extension/Exception.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Exception/DependencyException.php b/civicrm/CRM/Extension/Exception/DependencyException.php
index 43bb6b3d99b3a56b2a6dc4735f904ec625fe2662..c7adacb0a359b832416b5fd657a4e203520f0d7c 100644
--- a/civicrm/CRM/Extension/Exception/DependencyException.php
+++ b/civicrm/CRM/Extension/Exception/DependencyException.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Exception/MissingException.php b/civicrm/CRM/Extension/Exception/MissingException.php
index 640b1354ed8344bfa6da1c6c93367d5388f94f00..73fc78253f46a6af944f9602a58198f6b092012c 100644
--- a/civicrm/CRM/Extension/Exception/MissingException.php
+++ b/civicrm/CRM/Extension/Exception/MissingException.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Exception/ParseException.php b/civicrm/CRM/Extension/Exception/ParseException.php
index d90dc723ad98afb1cbaf74fb4b9a6058417b1e44..5a96a9fa47267e21362fe409be3b2c7ce5e07d37 100644
--- a/civicrm/CRM/Extension/Exception/ParseException.php
+++ b/civicrm/CRM/Extension/Exception/ParseException.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Info.php b/civicrm/CRM/Extension/Info.php
index 3a68dc69a56f48a762430924d0df332c356fb77e..de0ac980e15a54d971b6cfb2d7888b59802d14ec 100644
--- a/civicrm/CRM/Extension/Info.php
+++ b/civicrm/CRM/Extension/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Manager.php b/civicrm/CRM/Extension/Manager.php
index b7e7e3e0c19bf5604419bcea9f0f311a790a5c2c..28c4d2c8b754310e9a11fae29ecaf22541df1b13 100644
--- a/civicrm/CRM/Extension/Manager.php
+++ b/civicrm/CRM/Extension/Manager.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Manager/Base.php b/civicrm/CRM/Extension/Manager/Base.php
index 887cb00b0a2050288eeb11e7339eed9384ae7300..59fcebc0577ec10a0e91ed38c6d7a5596efeeef7 100644
--- a/civicrm/CRM/Extension/Manager/Base.php
+++ b/civicrm/CRM/Extension/Manager/Base.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Manager/Interface.php b/civicrm/CRM/Extension/Manager/Interface.php
index 9488ecca9e57dd15351d2e3b32877875377871b2..47d6ac7e69fdc808b9bdc6799dde288398b4825f 100644
--- a/civicrm/CRM/Extension/Manager/Interface.php
+++ b/civicrm/CRM/Extension/Manager/Interface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Manager/Module.php b/civicrm/CRM/Extension/Manager/Module.php
index abf58bac2e6d1dfe7c083e72f5bea75a9ed0c07e..84dc291c392dbeb7480011204dad78e5c4864425 100644
--- a/civicrm/CRM/Extension/Manager/Module.php
+++ b/civicrm/CRM/Extension/Manager/Module.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Manager/Payment.php b/civicrm/CRM/Extension/Manager/Payment.php
index f67cefc4c662930f9865adc6cf91b767e3df1cfa..f43f5cf7175d55b2cdaa255b51062e1bdbf1873e 100644
--- a/civicrm/CRM/Extension/Manager/Payment.php
+++ b/civicrm/CRM/Extension/Manager/Payment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Manager/Report.php b/civicrm/CRM/Extension/Manager/Report.php
index c862ecdbb8b083b44c137361323f94bb3f1d1af4..f68af4bb90ff2aaab0ca57d2de87db31122c34f1 100644
--- a/civicrm/CRM/Extension/Manager/Report.php
+++ b/civicrm/CRM/Extension/Manager/Report.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Manager/Search.php b/civicrm/CRM/Extension/Manager/Search.php
index 697da77a08f4b02685228339108071be929e5cb9..60c12559264b05078437f1019da4bf6367336134 100644
--- a/civicrm/CRM/Extension/Manager/Search.php
+++ b/civicrm/CRM/Extension/Manager/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Mapper.php b/civicrm/CRM/Extension/Mapper.php
index 20de6eef769a11e0fb91f9069f36059fa8667e02..8615513566bbc5fa9e738fca291139cce5849c39 100644
--- a/civicrm/CRM/Extension/Mapper.php
+++ b/civicrm/CRM/Extension/Mapper.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/System.php b/civicrm/CRM/Extension/System.php
index de312be0130c962e28a4ec102ad2b8962a4ed4b4..53965f2347d336c95bfbd58fb9d5c290ffbb1d23 100644
--- a/civicrm/CRM/Extension/System.php
+++ b/civicrm/CRM/Extension/System.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Extension/Upgrades.php b/civicrm/CRM/Extension/Upgrades.php
index 9ac22074745bb761803d1d31e550b5662e64d4dd..fa0ffb0804d8f8daccbda04d3af6aac80f9987b6 100644
--- a/civicrm/CRM/Extension/Upgrades.php
+++ b/civicrm/CRM/Extension/Upgrades.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/BAO/ExportFormat.php b/civicrm/CRM/Financial/BAO/ExportFormat.php
index 77b66d0bc8f233681737e7940a92eabec6a8df0d..70ca0737c82b758e9742f04cb93d055b9286768d 100644
--- a/civicrm/CRM/Financial/BAO/ExportFormat.php
+++ b/civicrm/CRM/Financial/BAO/ExportFormat.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/BAO/ExportFormat/CSV.php b/civicrm/CRM/Financial/BAO/ExportFormat/CSV.php
index ce9f0b7af6d99e224ea825a3efb8eace24e13eb0..6f3b88b7813ec6142ecca5cbd96e97c52c1ebdb3 100644
--- a/civicrm/CRM/Financial/BAO/ExportFormat/CSV.php
+++ b/civicrm/CRM/Financial/BAO/ExportFormat/CSV.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/BAO/ExportFormat/IIF.php b/civicrm/CRM/Financial/BAO/ExportFormat/IIF.php
index 9b962ad6b3d3b4193b3c8f91caa449af932fc663..9bd18502cee529e7e3a5862e2305e5e2b96bc997 100644
--- a/civicrm/CRM/Financial/BAO/ExportFormat/IIF.php
+++ b/civicrm/CRM/Financial/BAO/ExportFormat/IIF.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/BAO/FinancialAccount.php b/civicrm/CRM/Financial/BAO/FinancialAccount.php
index d439be5498a612b1e6062634b91f3cf45420a8d4..062eef27e1ee908e353d537c6d3e90d95d0b7660 100644
--- a/civicrm/CRM/Financial/BAO/FinancialAccount.php
+++ b/civicrm/CRM/Financial/BAO/FinancialAccount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/BAO/FinancialItem.php b/civicrm/CRM/Financial/BAO/FinancialItem.php
index 0de2cf4d1668682602c1550806a7d3d00bb7671a..63eee63f636f5452b9114e8f0a661f06a6ca27ff 100644
--- a/civicrm/CRM/Financial/BAO/FinancialItem.php
+++ b/civicrm/CRM/Financial/BAO/FinancialItem.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/BAO/FinancialType.php b/civicrm/CRM/Financial/BAO/FinancialType.php
index 78fe35bd30690977d5b90d680b9a16935fdfd0b6..3f5f5efe8d7b138edbbd025f9d05a01c925ac24d 100644
--- a/civicrm/CRM/Financial/BAO/FinancialType.php
+++ b/civicrm/CRM/Financial/BAO/FinancialType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/BAO/FinancialTypeAccount.php b/civicrm/CRM/Financial/BAO/FinancialTypeAccount.php
index ffc641bee094e1381b450f963973e20955eff751..1eeee8990a78ce5f60ec9e11d4b978725b11c270 100644
--- a/civicrm/CRM/Financial/BAO/FinancialTypeAccount.php
+++ b/civicrm/CRM/Financial/BAO/FinancialTypeAccount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/BAO/PaymentProcessor.php b/civicrm/CRM/Financial/BAO/PaymentProcessor.php
index ba90e5ebf814962cf5c6b413f425732cdd8a9ad4..86addccd3e950f3856a6a314d652127c7ffe46bd 100644
--- a/civicrm/CRM/Financial/BAO/PaymentProcessor.php
+++ b/civicrm/CRM/Financial/BAO/PaymentProcessor.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -218,34 +218,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
public static function getPayment($paymentProcessorID, $mode = 'based_on_id') {
$capabilities = ($mode == 'test') ? array('TestMode') : array();
$processors = self::getPaymentProcessors($capabilities, array($paymentProcessorID));
- $processor = $processors[$paymentProcessorID];
- $fields = array(
- 'id',
- 'name',
- 'payment_processor_type_id',
- 'user_name',
- 'password',
- 'signature',
- 'url_site',
- 'url_api',
- 'url_recur',
- 'url_button',
- 'subject',
- 'class_name',
- 'is_recur',
- 'billing_mode',
- 'is_test',
- 'payment_type',
- 'is_default',
- );
- // Just to prevent e-Notices elsewhere we set all fields.
- foreach ($fields as $name) {
- if (!isset($processor)) {
- $processor[$name] = NULL;
- }
- }
- $processor['payment_processor_type'] = CRM_Core_PseudoConstant::paymentProcessorType(FALSE,
- $processor['payment_processor_type_id'], 'name');
return $processors[$paymentProcessorID];
}
@@ -326,7 +298,25 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
$processors = civicrm_api3('payment_processor', 'get', $retrievalParameters);
foreach ($processors['values'] as $processor) {
- $fieldsToProvide = array('user_name', 'password', 'signature', 'subject', 'is_recur');
+ $fieldsToProvide = array(
+ 'id',
+ 'name',
+ 'payment_processor_type_id',
+ 'user_name',
+ 'password',
+ 'signature',
+ 'url_site',
+ 'url_api',
+ 'url_recur',
+ 'url_button',
+ 'subject',
+ 'class_name',
+ 'is_recur',
+ 'billing_mode',
+ 'is_test',
+ 'payment_type',
+ 'is_default',
+ );
foreach ($fieldsToProvide as $field) {
// Prevent e-notices in processor classes when not configured.
if (!isset($processor[$field])) {
@@ -548,7 +538,8 @@ INNER JOIN civicrm_contribution con ON ( mp.contribution_id = con.id )
// The function looks to load the payment processor ID from the contribution page, which
// can support multiple processors.
}
- $paymentProcessor['payment_processor_type'] = CRM_Core_PseudoConstant::paymentProcessorType(FALSE, $paymentProcessor['payment_processor_type_id'], 'name');
+
+ $paymentProcessor['payment_processor_type'] = CRM_Core_PseudoConstant::getName('CRM_Financial_BAO_PaymentProcessor', 'payment_processor_type_id', $paymentProcessor['payment_processor_type_id']);
$result = Civi\Payment\System::singleton()->getByProcessor($paymentProcessor);
}
return $result;
diff --git a/civicrm/CRM/Financial/BAO/PaymentProcessorType.php b/civicrm/CRM/Financial/BAO/PaymentProcessorType.php
index c29cbcbeae94ac067605bfc59c089f18b981f781..6667d8bab7d92f7ade1ab0a013f2c91256ca00fb 100644
--- a/civicrm/CRM/Financial/BAO/PaymentProcessorType.php
+++ b/civicrm/CRM/Financial/BAO/PaymentProcessorType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Form/BatchTransaction.php b/civicrm/CRM/Financial/Form/BatchTransaction.php
index d7ed1d2ddf38194435bf9e7a58539ffbf36a7a44..21bd6201a22a6d2a52dea7a2f17e023e309eedfd 100644
--- a/civicrm/CRM/Financial/Form/BatchTransaction.php
+++ b/civicrm/CRM/Financial/Form/BatchTransaction.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Form/Export.php b/civicrm/CRM/Financial/Form/Export.php
index 639813397bf4c9bfe17b90957f32dadbb37792ad..641541d260dcbddf1ab728cabd82786685491e24 100644
--- a/civicrm/CRM/Financial/Form/Export.php
+++ b/civicrm/CRM/Financial/Form/Export.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Form/FinancialAccount.php b/civicrm/CRM/Financial/Form/FinancialAccount.php
index 91a2aa7db2e660a7fcfa0fd6d3d75e856a3fd312..5b9b8f49c310fa0d3065ededd9f8272081fccf01 100644
--- a/civicrm/CRM/Financial/Form/FinancialAccount.php
+++ b/civicrm/CRM/Financial/Form/FinancialAccount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Form/FinancialBatch.php b/civicrm/CRM/Financial/Form/FinancialBatch.php
index 59b6cc4d361316fa012313d32d88f3d1ecf960ba..9f3bd5e6d4b63df6cae585e0878408b27bbe7030 100644
--- a/civicrm/CRM/Financial/Form/FinancialBatch.php
+++ b/civicrm/CRM/Financial/Form/FinancialBatch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Form/FinancialType.php b/civicrm/CRM/Financial/Form/FinancialType.php
index dcdaa3e9195142d5ceba8cb8400f736311fa800f..10a30c7f2480a13f185b2298f1de9d0e06e43627 100644
--- a/civicrm/CRM/Financial/Form/FinancialType.php
+++ b/civicrm/CRM/Financial/Form/FinancialType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Form/FinancialTypeAccount.php b/civicrm/CRM/Financial/Form/FinancialTypeAccount.php
index a7d68c9f47ee5d5ec60e54e6a8de8b6a086c7f24..8f27ff1a92377bdebd25c896e7d9acf71976d11d 100644
--- a/civicrm/CRM/Financial/Form/FinancialTypeAccount.php
+++ b/civicrm/CRM/Financial/Form/FinancialTypeAccount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Form/Payment.php b/civicrm/CRM/Financial/Form/Payment.php
index 55dd4d783cc1611c69a8cc09078c2e3311c69492..f96398b51d5f990db702f906ec8d82e5308c92a7 100644
--- a/civicrm/CRM/Financial/Form/Payment.php
+++ b/civicrm/CRM/Financial/Form/Payment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Form/PaymentEdit.php b/civicrm/CRM/Financial/Form/PaymentEdit.php
index 1a439aa03b4d0143009c9f7755f6aab9e1e0456c..68d0398c51b8dd81fad07e66692240bf55bbf9d4 100644
--- a/civicrm/CRM/Financial/Form/PaymentEdit.php
+++ b/civicrm/CRM/Financial/Form/PaymentEdit.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Form/Search.php b/civicrm/CRM/Financial/Form/Search.php
index 13df4825427e5fd09d6ea5be5ca3f109478f5aa2..a407cad60ea391f72171138ebf6cee21adbd34a1 100644
--- a/civicrm/CRM/Financial/Form/Search.php
+++ b/civicrm/CRM/Financial/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Page/AJAX.php b/civicrm/CRM/Financial/Page/AJAX.php
index 767bc42fdd27acb7c9fad8d1775903707054969f..6c6bae83050023be5e0521164660efd0d359726d 100644
--- a/civicrm/CRM/Financial/Page/AJAX.php
+++ b/civicrm/CRM/Financial/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Page/Batch.php b/civicrm/CRM/Financial/Page/Batch.php
index 0c78a1cca88bd153d52dc5d83f487eca2fd78721..bbf1dc83cf07bad5467e3ebceab7f2a32beb985a 100644
--- a/civicrm/CRM/Financial/Page/Batch.php
+++ b/civicrm/CRM/Financial/Page/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Page/BatchTransaction.php b/civicrm/CRM/Financial/Page/BatchTransaction.php
index e744d7345507a83872e604dc186f314a187543c7..f6bb29fda3e3775f8f3b22acd4b894412f0b2379 100644
--- a/civicrm/CRM/Financial/Page/BatchTransaction.php
+++ b/civicrm/CRM/Financial/Page/BatchTransaction.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Page/FinancialAccount.php b/civicrm/CRM/Financial/Page/FinancialAccount.php
index 75976c785603bbdebb7bd84ee1973e497ce655a5..bd17805f2bbdedba70cc1af1fb42d6acdf089f66 100644
--- a/civicrm/CRM/Financial/Page/FinancialAccount.php
+++ b/civicrm/CRM/Financial/Page/FinancialAccount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Page/FinancialBatch.php b/civicrm/CRM/Financial/Page/FinancialBatch.php
index 6ea6e657054db407c113324a636d92fb71ac5bbc..27a7783aea4584144eb2c6f0c840dc814c4658cb 100644
--- a/civicrm/CRM/Financial/Page/FinancialBatch.php
+++ b/civicrm/CRM/Financial/Page/FinancialBatch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Page/FinancialType.php b/civicrm/CRM/Financial/Page/FinancialType.php
index b8a5d76eed651ed0a531f0ef60f5eaa83bff35d4..39b07bc237e95350951a37914b0cdee445f75799 100644
--- a/civicrm/CRM/Financial/Page/FinancialType.php
+++ b/civicrm/CRM/Financial/Page/FinancialType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Financial/Page/FinancialTypeAccount.php b/civicrm/CRM/Financial/Page/FinancialTypeAccount.php
index 4f6ca262c46232f5f3f972b79f97d8ce1c4da64e..d3b8e7b8c5f03f060af8269ebb292f1920730a14 100644
--- a/civicrm/CRM/Financial/Page/FinancialTypeAccount.php
+++ b/civicrm/CRM/Financial/Page/FinancialTypeAccount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Friend/BAO/Friend.php b/civicrm/CRM/Friend/BAO/Friend.php
index 57b8de219643fa11a545daf980a944cc4e14d09b..2d650fd8d7e3c5286af9d8a9704a5e373a8d38bd 100644
--- a/civicrm/CRM/Friend/BAO/Friend.php
+++ b/civicrm/CRM/Friend/BAO/Friend.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Friend/Form.php b/civicrm/CRM/Friend/Form.php
index 02ab539bd6500131564a372874d230cd80155117..7f0329ac49a125208a43ed2d654e8e1d126f2d2e 100644
--- a/civicrm/CRM/Friend/Form.php
+++ b/civicrm/CRM/Friend/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Friend/Form/Contribute.php b/civicrm/CRM/Friend/Form/Contribute.php
index f26d83c2ee8f43c00010f101aa83694949f25b00..8234e8ce785bf49851bc07a627609b536a0ffa18 100644
--- a/civicrm/CRM/Friend/Form/Contribute.php
+++ b/civicrm/CRM/Friend/Form/Contribute.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Friend/Form/Event.php b/civicrm/CRM/Friend/Form/Event.php
index 530b61117d10e008afc5b97f34ab9ae82bf7cde7..87e336bad83c288b1230d523cb111f9b8ab61e50 100644
--- a/civicrm/CRM/Friend/Form/Event.php
+++ b/civicrm/CRM/Friend/Form/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/BAO/Grant.php b/civicrm/CRM/Grant/BAO/Grant.php
index 9354c2f7fe219c1d2aee1e7076b0c497dbb6e0f9..d736ca39471bdcce5e5ff78c281fef2cb6ac42d2 100644
--- a/civicrm/CRM/Grant/BAO/Grant.php
+++ b/civicrm/CRM/Grant/BAO/Grant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/BAO/Query.php b/civicrm/CRM/Grant/BAO/Query.php
index 54ed50e608b361ce8a166979de81d03a104bf017..6631c69343206e9a33286a280fda4bab2812b667 100644
--- a/civicrm/CRM/Grant/BAO/Query.php
+++ b/civicrm/CRM/Grant/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -159,7 +159,7 @@ class CRM_Grant_BAO_Query extends CRM_Core_BAO_Query {
case 'grant_due_date_high':
$query->dateQueryBuilder($values, 'civicrm_grant',
'grant_due_date',
- 'grant_due_date', 'Grant Due Date'
+ 'grant_due_date', ts('Grant Due Date')
);
return;
@@ -173,7 +173,7 @@ class CRM_Grant_BAO_Query extends CRM_Core_BAO_Query {
case 'grant_decision_date_high':
$query->dateQueryBuilder($values, 'civicrm_grant',
'grant_decision_date',
- 'decision_date', 'Grant Decision Date'
+ 'decision_date', ts('Grant Decision Date')
);
return;
@@ -190,11 +190,11 @@ class CRM_Grant_BAO_Query extends CRM_Core_BAO_Query {
if (strstr($name, 'type')) {
$name = 'grant_type_id';
- $label = 'Grant Type(s)';
+ $label = ts('Grant Type(s)');
}
else {
$name = 'status_id';
- $label = 'Grant Status(s)';
+ $label = ts('Grant Status(s)');
}
$query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("civicrm_grant.$name", $op, $value, "Integer");
@@ -208,15 +208,15 @@ class CRM_Grant_BAO_Query extends CRM_Core_BAO_Query {
case 'grant_report_received':
if ($value == 1) {
- $yesNo = 'Yes';
+ $yesNo = ts('Yes');
$query->_where[$grouping][] = "civicrm_grant.grant_report_received $op $value";
}
elseif ($value == 0) {
- $yesNo = 'No';
+ $yesNo = ts('No');
$query->_where[$grouping][] = "civicrm_grant.grant_report_received IS NULL";
}
- $query->_qill[$grouping][] = "Grant Report Received = $yesNo ";
+ $query->_qill[$grouping][] = ts('Grant Report Received = %1', array(1 => $yesNo));
$query->_tables['civicrm_grant'] = $query->_whereTables['civicrm_grant'] = 1;
return;
diff --git a/civicrm/CRM/Grant/Controller/Search.php b/civicrm/CRM/Grant/Controller/Search.php
index b823353956fe946ec1f57cb877bb40470bf426ee..17547e6cc9b9eb2583d0d626046ce51c502493a8 100644
--- a/civicrm/CRM/Grant/Controller/Search.php
+++ b/civicrm/CRM/Grant/Controller/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Form/Grant.php b/civicrm/CRM/Grant/Form/Grant.php
index 8912eb98a566b68dfb8996221a1f7c3e0d646249..1c1fb8fd159f05c899f40fe3abadc5f751c503e6 100644
--- a/civicrm/CRM/Grant/Form/Grant.php
+++ b/civicrm/CRM/Grant/Form/Grant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Form/GrantView.php b/civicrm/CRM/Grant/Form/GrantView.php
index 444f9c0d762403eac49920480587a72f753f24e5..d563406317ab6d5200362ec5edfcf5ef7579939b 100644
--- a/civicrm/CRM/Grant/Form/GrantView.php
+++ b/civicrm/CRM/Grant/Form/GrantView.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Form/Search.php b/civicrm/CRM/Grant/Form/Search.php
index 2a7d84beca5e858700206d897616eab4f197c7a0..e75c63469bc9f1065dcbc220051f16abdb2db7c5 100644
--- a/civicrm/CRM/Grant/Form/Search.php
+++ b/civicrm/CRM/Grant/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Form/Task.php b/civicrm/CRM/Grant/Form/Task.php
index 55abfd143bd6af5b92d3e528ddc3bf7f98fb605f..51f505428ee2b13183ec9f0171556f32b5fadb2b 100644
--- a/civicrm/CRM/Grant/Form/Task.php
+++ b/civicrm/CRM/Grant/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Form/Task/Delete.php b/civicrm/CRM/Grant/Form/Task/Delete.php
index 64596522842711c7af1ac63b3055df44186fdfda..11474f31a5248b3075f95e9b82de144a1bf58a14 100644
--- a/civicrm/CRM/Grant/Form/Task/Delete.php
+++ b/civicrm/CRM/Grant/Form/Task/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Form/Task/Print.php b/civicrm/CRM/Grant/Form/Task/Print.php
index 970789ed4389e8b6fe48d52267dd463ecf98f235..6e1694a07fbb99ca98f420853a67f38cb37a0b7f 100644
--- a/civicrm/CRM/Grant/Form/Task/Print.php
+++ b/civicrm/CRM/Grant/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Form/Task/Result.php b/civicrm/CRM/Grant/Form/Task/Result.php
index 8ad55e694000870d72bce53ef92e87c0df954f53..2f0e26ad9f02ee10e5bd79c111f6bd9de885fb95 100644
--- a/civicrm/CRM/Grant/Form/Task/Result.php
+++ b/civicrm/CRM/Grant/Form/Task/Result.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Grant/Form/Task/SearchTaskHookSample.php
index 94a31a3e5d1c384243e8fcc8c59f35e96a69ab2e..73db20fef826f1595e06148fc26ad95b26f7d3eb 100644
--- a/civicrm/CRM/Grant/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Grant/Form/Task/SearchTaskHookSample.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Form/Task/Update.php b/civicrm/CRM/Grant/Form/Task/Update.php
index 59995dcd6d2777e1a248e4ad22d01a79e585386a..625a08861f207049926b9f7b314f8ec8229680d7 100644
--- a/civicrm/CRM/Grant/Form/Task/Update.php
+++ b/civicrm/CRM/Grant/Form/Task/Update.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Info.php b/civicrm/CRM/Grant/Info.php
index 1bd9f8383c55f0edd767b1f29b90da00c61e177e..acd3e20f09c3a1e6702cd909d9a7ff94793b1678 100644
--- a/civicrm/CRM/Grant/Info.php
+++ b/civicrm/CRM/Grant/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Page/DashBoard.php b/civicrm/CRM/Grant/Page/DashBoard.php
index cab30ed85747335c81a9143695991e161f615469..c366e1ce9eabea5f10e051bc0fd859a5627f9ee6 100644
--- a/civicrm/CRM/Grant/Page/DashBoard.php
+++ b/civicrm/CRM/Grant/Page/DashBoard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Page/Tab.php b/civicrm/CRM/Grant/Page/Tab.php
index d0ed428afb117cc8fabad558ceaaa233d5707c70..3f121d138ce645ab7cf34f51ec887ab6b760387f 100644
--- a/civicrm/CRM/Grant/Page/Tab.php
+++ b/civicrm/CRM/Grant/Page/Tab.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Selector/Search.php b/civicrm/CRM/Grant/Selector/Search.php
index dcce3d7c31bc1df4a2bac507aab4b1c72eedd01a..d57e845d8df0fa28d7822106f35ffe72830ddc27 100644
--- a/civicrm/CRM/Grant/Selector/Search.php
+++ b/civicrm/CRM/Grant/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/StateMachine/Search.php b/civicrm/CRM/Grant/StateMachine/Search.php
index f4ecc2418de791c38c739e656b9b091431bd5360..674b4861e1ae3e949bdfb3c5c729e93045ead59f 100644
--- a/civicrm/CRM/Grant/StateMachine/Search.php
+++ b/civicrm/CRM/Grant/StateMachine/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Grant/Task.php b/civicrm/CRM/Grant/Task.php
index bbc1d41dc12ff5ed67ef54dd3242b0bae46ea42b..9bcdaad4497ddc6b004fa917a60753bd6b3afc95 100644
--- a/civicrm/CRM/Grant/Task.php
+++ b/civicrm/CRM/Grant/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Group/Controller.php b/civicrm/CRM/Group/Controller.php
index d18958e99c3fe14fa7880e0515178787735d636f..8ba0285e6983a21e28702710e44b6edc04d50900 100644
--- a/civicrm/CRM/Group/Controller.php
+++ b/civicrm/CRM/Group/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Group/Form/Edit.php b/civicrm/CRM/Group/Form/Edit.php
index 8c286116e9f7673efe79a2f4a3ab10437c250a58..a4d944e18f7be0b96feb45d97b5e2f7eb2d35b93 100644
--- a/civicrm/CRM/Group/Form/Edit.php
+++ b/civicrm/CRM/Group/Form/Edit.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Group/Form/Search.php b/civicrm/CRM/Group/Form/Search.php
index 22696f447717742129d55cac81ea224d79b8b54a..f05dfdcb830dac242da11adde82d29dcac72c9ed 100644
--- a/civicrm/CRM/Group/Form/Search.php
+++ b/civicrm/CRM/Group/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Group/Page/AJAX.php b/civicrm/CRM/Group/Page/AJAX.php
index 69359281d3a8e248517e628f244760bc8f2736aa..a1d9211f9f06bc262b10335fff835ebb03de6d57 100644
--- a/civicrm/CRM/Group/Page/AJAX.php
+++ b/civicrm/CRM/Group/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Group/Page/Group.php b/civicrm/CRM/Group/Page/Group.php
index a1a11da4900e4617bd12cac6395c08ebb605cde5..b11b1b8c342805fcf3263bdeffd28b12bca76f3d 100644
--- a/civicrm/CRM/Group/Page/Group.php
+++ b/civicrm/CRM/Group/Page/Group.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Group/StateMachine.php b/civicrm/CRM/Group/StateMachine.php
index 1155727afa7baa3184763f7006774642fab24406..60f1452946f33a38cde3ebb23f00ee4e60dc718d 100644
--- a/civicrm/CRM/Group/StateMachine.php
+++ b/civicrm/CRM/Group/StateMachine.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Import/DataSource.php b/civicrm/CRM/Import/DataSource.php
index 9fdea4a2b306c5366c68f8d87cb265dd60133004..7075b8b870d5d9b16770970b082ff9c5af92b05b 100644
--- a/civicrm/CRM/Import/DataSource.php
+++ b/civicrm/CRM/Import/DataSource.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Import/DataSource/CSV.php b/civicrm/CRM/Import/DataSource/CSV.php
index 692939763c5b9cab4723e01a15178c00097cf9c1..63ab4ead8ad17755bf64e9da5bf3829054cb428f 100644
--- a/civicrm/CRM/Import/DataSource/CSV.php
+++ b/civicrm/CRM/Import/DataSource/CSV.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Import/DataSource/SQL.php b/civicrm/CRM/Import/DataSource/SQL.php
index b9f552dffcef8ba12f804528cf5588b6a56eb13d..b0ac627fa45a5bd78113e53b69e399ad44ff2fcc 100644
--- a/civicrm/CRM/Import/DataSource/SQL.php
+++ b/civicrm/CRM/Import/DataSource/SQL.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Import/Form/DataSource.php b/civicrm/CRM/Import/Form/DataSource.php
index 7cc19f01425b58461fa5cbcab7e32eeec71f9816..3ac24ca7cc7e88e4281dd1daaa9caa0fbdcf7c22 100644
--- a/civicrm/CRM/Import/Form/DataSource.php
+++ b/civicrm/CRM/Import/Form/DataSource.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Import/Form/MapField.php b/civicrm/CRM/Import/Form/MapField.php
index 9bdbcc6460cefdf876194ab3c7884eeecc6fb1a7..bd2ec07db09bb71c90cc47b92732aa4b01f71830 100644
--- a/civicrm/CRM/Import/Form/MapField.php
+++ b/civicrm/CRM/Import/Form/MapField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Import/Form/Preview.php b/civicrm/CRM/Import/Form/Preview.php
index 2d6f8c159ffc6ca0a19ada18030932e32fedb94e..49ee8d1dd96c0af36cb6a7812e5733e7b672e391 100644
--- a/civicrm/CRM/Import/Form/Preview.php
+++ b/civicrm/CRM/Import/Form/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Import/Form/Summary.php b/civicrm/CRM/Import/Form/Summary.php
index 9490c5416931c17232f57911243adf82ce691215..01958af70b76c878dd33881e05c64961439aed09 100644
--- a/civicrm/CRM/Import/Form/Summary.php
+++ b/civicrm/CRM/Import/Form/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Import/Parser.php b/civicrm/CRM/Import/Parser.php
index cec34cacfa53e772364c872101f471fab33fc34c..669cf70bf6d4b160b3df0e52eacde7b47fa6e3a1 100644
--- a/civicrm/CRM/Import/Parser.php
+++ b/civicrm/CRM/Import/Parser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Import/StateMachine.php b/civicrm/CRM/Import/StateMachine.php
index 5c0a2b8faa944efea9004b84babc4b7070e84303..95633c4ee0a62bd8a519500e04f4e8df75de9fb7 100644
--- a/civicrm/CRM/Import/StateMachine.php
+++ b/civicrm/CRM/Import/StateMachine.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Logging/Differ.php b/civicrm/CRM/Logging/Differ.php
index a57a0447c335375d099321638ed03ab33ff3ae5a..1743f8daf4c7964a0d2bdd2ca0876ac1c700b6ea 100644
--- a/civicrm/CRM/Logging/Differ.php
+++ b/civicrm/CRM/Logging/Differ.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Logging/ReportDetail.php b/civicrm/CRM/Logging/ReportDetail.php
index 7196dd8ce3191e6ccd382a9f61703ab8982dfb72..7c7f16403dccee7fda6ebb08160928d059c88b6a 100644
--- a/civicrm/CRM/Logging/ReportDetail.php
+++ b/civicrm/CRM/Logging/ReportDetail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Logging/ReportSummary.php b/civicrm/CRM/Logging/ReportSummary.php
index 874f9922c7efbe80e9384b38c99029ec8add64e4..47adcef5351e7aec5b067a4945a5209589c7d735 100644
--- a/civicrm/CRM/Logging/ReportSummary.php
+++ b/civicrm/CRM/Logging/ReportSummary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -243,6 +243,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
// temp table to hold all altered contact-ids
$sql = "CREATE TEMPORARY TABLE civicrm_temp_civireport_logsummary ( {$tempColumns} ) ENGINE=HEAP";
CRM_Core_DAO::executeQuery($sql);
+ $this->addToDeveloperTab($sql);
$logTypes = CRM_Utils_Array::value('log_type_value', $this->_params);
unset($this->_params['log_type_value']);
@@ -271,6 +272,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
$sql = str_replace("entity_log_civireport.log_type as", "'{$entity}' as", $sql);
$sql = "INSERT IGNORE INTO civicrm_temp_civireport_logsummary {$sql}";
CRM_Core_DAO::executeQuery($sql);
+ $this->addToDeveloperTab($sql);
}
}
@@ -280,6 +282,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
// alterDisplay() counts sync with pager counts
$sql = "SELECT DISTINCT log_type FROM civicrm_temp_civireport_logsummary";
$dao = CRM_Core_DAO::executeQuery($sql);
+ $this->addToDeveloperTab($sql);
$replaceWith = array();
while ($dao->fetch()) {
$type = $this->getLogType($dao->log_type);
@@ -296,9 +299,11 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
$sql = "ALTER TABLE civicrm_temp_civireport_logsummary ADD COLUMN log_civicrm_entity_log_type_label varchar(64)";
CRM_Core_DAO::executeQuery($sql);
+ $this->addToDeveloperTab($sql);
foreach ($replaceWith as $type => $in) {
$sql = "UPDATE civicrm_temp_civireport_logsummary SET log_civicrm_entity_log_type_label='{$type}', log_date=log_date WHERE log_type IN('$in')";
CRM_Core_DAO::executeQuery($sql);
+ $this->addToDeveloperTab($sql);
}
// note the group by columns are same as that used in alterDisplay as $newRows - $key
@@ -317,6 +322,7 @@ GROUP BY log_civicrm_entity_log_date, log_civicrm_entity_log_type_label, log_civ
'altered_by_contact_civireport.',
), 'entity_log_civireport.', $sql);
$this->buildRows($sql, $rows);
+ $this->addToDeveloperTab($sql);
// format result set.
$this->formatDisplay($rows);
diff --git a/civicrm/CRM/Logging/Reverter.php b/civicrm/CRM/Logging/Reverter.php
index aee980f30867856d91ebd39896b137ebb0794fe0..40ec37e0509b02cbad232bf69ba4c2be37c65c4c 100644
--- a/civicrm/CRM/Logging/Reverter.php
+++ b/civicrm/CRM/Logging/Reverter.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Logging/Schema.php b/civicrm/CRM/Logging/Schema.php
index e9ec1b44ba2cda9d4214443968f7a6cc8aaff288..2bfd97dca744aed300b68bc6fe233a2f485052c2 100644
--- a/civicrm/CRM/Logging/Schema.php
+++ b/civicrm/CRM/Logging/Schema.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/ActionTokens.php b/civicrm/CRM/Mailing/ActionTokens.php
index 37dc78a5970c0f0aaefd731aeb6fc2f882c82eb2..1b504ac402ba9fb699f4d02d25877a01e3e9bfcb 100644
--- a/civicrm/CRM/Mailing/ActionTokens.php
+++ b/civicrm/CRM/Mailing/ActionTokens.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/BAO/BouncePattern.php b/civicrm/CRM/Mailing/BAO/BouncePattern.php
index 03c894fd66e7f050f6cb090dbff1f9ecb1d3c709..74dbad55bfd48a40d94752198af5db749995ca50 100644
--- a/civicrm/CRM/Mailing/BAO/BouncePattern.php
+++ b/civicrm/CRM/Mailing/BAO/BouncePattern.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/BAO/Component.php b/civicrm/CRM/Mailing/BAO/Component.php
index e70de4228c34ec7d0834a2ef54e9c00386e4f186..969d4b57e0471e04e922554ab57c36807030100a 100644
--- a/civicrm/CRM/Mailing/BAO/Component.php
+++ b/civicrm/CRM/Mailing/BAO/Component.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/BAO/Mailing.php b/civicrm/CRM/Mailing/BAO/Mailing.php
index 3790cd540f5b492aee0c47eabec56a7216077043..63a89c456697e065105f10cf14f77384529b74cc 100644
--- a/civicrm/CRM/Mailing/BAO/Mailing.php
+++ b/civicrm/CRM/Mailing/BAO/Mailing.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -166,9 +166,10 @@ class CRM_Mailing_BAO_Mailing extends CRM_Mailing_DAO_Mailing {
if ($groupType == 'Include') {
$includeSmartGroupIDs[] = $groupDAO->id;
}
- else {
+ elseif ($groupType == 'Exclude') {
$excludeSmartGroupIDs[] = $groupDAO->id;
}
+ //NOTE: Do nothing for base
}
}
@@ -1997,12 +1998,16 @@ ORDER BY civicrm_email.is_bulkmail DESC
$row['bounce_rate'] = (100.0 * $mailing->bounce) / $mailing->queue;
$row['unsubscribe_rate'] = (100.0 * $row['unsubscribe']) / $mailing->queue;
$row['optout_rate'] = (100.0 * $row['optout']) / $mailing->queue;
+ $row['opened_rate'] = $mailing->delivered ? (($row['opened'] / $mailing->delivered) * 100.0) : 0;
+ $row['clickthrough_rate'] = $mailing->delivered ? (($mailing->url / $mailing->delivered) * 100.0) : 0;
}
else {
$row['delivered_rate'] = 0;
$row['bounce_rate'] = 0;
$row['unsubscribe_rate'] = 0;
$row['optout_rate'] = 0;
+ $row['opened_rate'] = 0;
+ $row['clickthrough_rate'] = 0;
}
$row['links'] = array(
@@ -2066,12 +2071,16 @@ ORDER BY civicrm_email.is_bulkmail DESC
$report['event_totals']['bounce_rate'] = (100.0 * $report['event_totals']['bounce']) / $report['event_totals']['queue'];
$report['event_totals']['unsubscribe_rate'] = (100.0 * $report['event_totals']['unsubscribe']) / $report['event_totals']['queue'];
$report['event_totals']['optout_rate'] = (100.0 * $report['event_totals']['optout']) / $report['event_totals']['queue'];
+ $report['event_totals']['opened_rate'] = !empty($report['event_totals']['delivered']) ? (($report['event_totals']['opened'] / $report['event_totals']['delivered']) * 100.0) : 0;
+ $report['event_totals']['clickthrough_rate'] = !empty($report['event_totals']['delivered']) ? (($report['event_totals']['url'] / $report['event_totals']['delivered']) * 100.0) : 0;
}
else {
$report['event_totals']['delivered_rate'] = 0;
$report['event_totals']['bounce_rate'] = 0;
$report['event_totals']['unsubscribe_rate'] = 0;
$report['event_totals']['optout_rate'] = 0;
+ $report['event_totals']['opened_rate'] = 0;
+ $report['event_totals']['clickthrough_rate'] = 0;
}
/* Get the click-through totals, grouped by URL */
diff --git a/civicrm/CRM/Mailing/BAO/MailingAB.php b/civicrm/CRM/Mailing/BAO/MailingAB.php
index a16f024f8c012a96bdcf355ad6223b6c568d954b..1ef3ed0c2a2a138d7affb44f4b12f252605d37ea 100644
--- a/civicrm/CRM/Mailing/BAO/MailingAB.php
+++ b/civicrm/CRM/Mailing/BAO/MailingAB.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/BAO/MailingJob.php b/civicrm/CRM/Mailing/BAO/MailingJob.php
index d86815a7a4a4d3a68adffa2d4005eadd9a6cb2f8..0fb50efe7b66f4d2dea3f0ca899f581b35d5a919 100644
--- a/civicrm/CRM/Mailing/BAO/MailingJob.php
+++ b/civicrm/CRM/Mailing/BAO/MailingJob.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/BAO/Query.php b/civicrm/CRM/Mailing/BAO/Query.php
index 4e34541fd2f1682dcc0e6f52199b84213fae2119..d556dd9fd18dd1104c49143aa0647c21069be24c 100644
--- a/civicrm/CRM/Mailing/BAO/Query.php
+++ b/civicrm/CRM/Mailing/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/BAO/Recipients.php b/civicrm/CRM/Mailing/BAO/Recipients.php
index fb38df97638eb745e9a61899627efc88cff52992..4ca5be9cde451b83618b56ba2a3b7de5dfdbaba8 100644
--- a/civicrm/CRM/Mailing/BAO/Recipients.php
+++ b/civicrm/CRM/Mailing/BAO/Recipients.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/BAO/Spool.php b/civicrm/CRM/Mailing/BAO/Spool.php
index 80dce934bf124fcf605bc6cbb399007921e6eee8..e7c9a6ba1021abe7cc4639037ace85f13ccbb54d 100644
--- a/civicrm/CRM/Mailing/BAO/Spool.php
+++ b/civicrm/CRM/Mailing/BAO/Spool.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/BAO/TrackableURL.php b/civicrm/CRM/Mailing/BAO/TrackableURL.php
index 5768674a99390e5dfe1ca7384a0dd223496eaef8..6d563f3ee2469915eeb1b654fb439a992529154b 100644
--- a/civicrm/CRM/Mailing/BAO/TrackableURL.php
+++ b/civicrm/CRM/Mailing/BAO/TrackableURL.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Config.php b/civicrm/CRM/Mailing/Config.php
index 442356d2c126cb8a9f73d421f315b06e2d8cc89f..1a93030ba4d2704c84be5e6fc45e874b7d1019f2 100644
--- a/civicrm/CRM/Mailing/Config.php
+++ b/civicrm/CRM/Mailing/Config.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Controller/Send.php b/civicrm/CRM/Mailing/Controller/Send.php
index 4aca468f32b1a2a300dc569d8f09ffd32a1f2686..d15ce347819de1d97bc60f0b1072988a6a43254f 100644
--- a/civicrm/CRM/Mailing/Controller/Send.php
+++ b/civicrm/CRM/Mailing/Controller/Send.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/Bounce.php b/civicrm/CRM/Mailing/Event/BAO/Bounce.php
index dd9ec4b1e964918482efbd0b76c25e090ce8c2f9..20b6ed1a968f38de43259e7234bdc61d87839dc0 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Bounce.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Bounce.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/Confirm.php b/civicrm/CRM/Mailing/Event/BAO/Confirm.php
index d0dca9fbbedb41f2abc7131cf5b198a7ba0f72ed..f01e188d8abbeec204e2515664c436d6665b3781 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Confirm.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Confirm.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/Delivered.php b/civicrm/CRM/Mailing/Event/BAO/Delivered.php
index 0f1681bc795ad58603e74c1a5ce826c93f177513..b858e518ce9de5dcaa9f0683ad59094a7342e5b2 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Delivered.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Delivered.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/Forward.php b/civicrm/CRM/Mailing/Event/BAO/Forward.php
index fc9be9e198e8398a54c63fc29a500a9f04283109..f0e4ee67dab6142a68f2e959f375258f233c8fe3 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Forward.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Forward.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/Opened.php b/civicrm/CRM/Mailing/Event/BAO/Opened.php
index 5dc1605daba0a33c9da01b3d7dff6cd90d6721d4..8d2adb3114fbdd0413eee7150dd076ac3bc39af2 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Opened.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Opened.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/Queue.php b/civicrm/CRM/Mailing/Event/BAO/Queue.php
index 9657e247f3c7d4e9877311e849cea15e0f1c791d..8a84dcb9751e175d7477e0f8aa7ae8f11fbc2119 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Queue.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Queue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/Reply.php b/civicrm/CRM/Mailing/Event/BAO/Reply.php
index ae116a5f57cae0553f2f44182f3b57f60efb4c33..00d8cd3eac0877e84f70d4ce1911df589bff6928 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Reply.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Reply.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/Resubscribe.php b/civicrm/CRM/Mailing/Event/BAO/Resubscribe.php
index a2c18166d2c8172edf1d78c0b91b88c19af3aad6..483f35641d2d40507fefba4a048524afdf9a0023 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Resubscribe.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Resubscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/Subscribe.php b/civicrm/CRM/Mailing/Event/BAO/Subscribe.php
index 08116ab8e535e799bc3282fce4fe62e65050cddd..d3257557b7597bc677829fbcfa97cbf28b50a68e 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Subscribe.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Subscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Event/BAO/TrackableURLOpen.php b/civicrm/CRM/Mailing/Event/BAO/TrackableURLOpen.php
index 97987f61bd5a2257e15144e37930617dc23a2a3a..6cd04732e6f6b1455cf6ed4dc8c7e4b8d548949f 100644
--- a/civicrm/CRM/Mailing/Event/BAO/TrackableURLOpen.php
+++ b/civicrm/CRM/Mailing/Event/BAO/TrackableURLOpen.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -144,8 +144,12 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track
$mailing = CRM_Mailing_BAO_Mailing::getTableName();
$job = CRM_Mailing_BAO_MailingJob::getTableName();
+ $distinct = NULL;
+ if ($is_distinct) {
+ $distinct = 'DISTINCT ';
+ }
$query = "
- SELECT COUNT($click.id) as opened
+ SELECT COUNT($distinct $click.event_queue_id) as opened
FROM $click
INNER JOIN $queue
ON $click.event_queue_id = $queue.id
@@ -168,10 +172,6 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track
$query .= " AND $click.trackable_url_id = " . CRM_Utils_Type::escape($url_id, 'Integer');
}
- if ($is_distinct) {
- $query .= " GROUP BY $queue.id ";
- }
-
// query was missing
$dao->query($query);
@@ -305,9 +305,16 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track
$query = "
SELECT $contact.display_name as display_name,
$contact.id as contact_id,
- $email.email as email,
- $click.time_stamp as date,
- $url.url as url
+ $email.email as email,";
+
+ if ($is_distinct) {
+ $query .= "MIN($click.time_stamp) as date,";
+ }
+ else {
+ $query .= "$click.time_stamp as date,";
+ }
+
+ $query .= "$url.url as url
FROM $contact
INNER JOIN $queue
ON $queue.contact_id = $contact.id
@@ -337,7 +344,7 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track
}
if ($is_distinct) {
- $query .= " GROUP BY $queue.id, $click.time_stamp, $url.url ";
+ $query .= " GROUP BY $queue.id, $url.url ";
}
$orderBy = "sort_name ASC, {$click}.time_stamp DESC";
diff --git a/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php b/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php
index e59305752dcc01d683888499f48f291a78e1b032..76f3fef7fb6aefa4930e8e87e175926187e0f065 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Approve.php b/civicrm/CRM/Mailing/Form/Approve.php
index 7c68d0f5c762bc4cf32e5538b924ecbed242a4c3..82b8cd15b1e3e1257da622c254fd97fbcd1147ce 100644
--- a/civicrm/CRM/Mailing/Form/Approve.php
+++ b/civicrm/CRM/Mailing/Form/Approve.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Browse.php b/civicrm/CRM/Mailing/Form/Browse.php
index 4eb65919c7ed6a1e872491a6d0c48226869df227..c5db18c6aec6f33784d8455eabbc8c153f729787 100644
--- a/civicrm/CRM/Mailing/Form/Browse.php
+++ b/civicrm/CRM/Mailing/Form/Browse.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Component.php b/civicrm/CRM/Mailing/Form/Component.php
index 2e133450158dbf432a50cae5eccdfd0bf528cf59..35074d30fd4d1b70f8c1202c513d9d76fb8acdce 100644
--- a/civicrm/CRM/Mailing/Form/Component.php
+++ b/civicrm/CRM/Mailing/Form/Component.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/ForwardMailing.php b/civicrm/CRM/Mailing/Form/ForwardMailing.php
index 8d12dbcf831068de329e282869ff137b308364e8..84c224ed742960c2f035621c15e6f1be3ea028b0 100644
--- a/civicrm/CRM/Mailing/Form/ForwardMailing.php
+++ b/civicrm/CRM/Mailing/Form/ForwardMailing.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Optout.php b/civicrm/CRM/Mailing/Form/Optout.php
index d5f1867d65383c17e7a393ab656751a7c3e834fa..c2196fc78f48bca66ae1151285d8e2c5398163c2 100644
--- a/civicrm/CRM/Mailing/Form/Optout.php
+++ b/civicrm/CRM/Mailing/Form/Optout.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Search.php b/civicrm/CRM/Mailing/Form/Search.php
index 9c7a5c0d56b2ea61c357a493c31406fb8c468df4..ce959101007017c55911ea1de990ba466752400e 100644
--- a/civicrm/CRM/Mailing/Form/Search.php
+++ b/civicrm/CRM/Mailing/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Subscribe.php b/civicrm/CRM/Mailing/Form/Subscribe.php
index 221687db700ec34f4b42c7961b41b46a47fc6517..d7f1e30e732b54a76d47d665f9fa0e2f19eb86a7 100644
--- a/civicrm/CRM/Mailing/Form/Subscribe.php
+++ b/civicrm/CRM/Mailing/Form/Subscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Task.php b/civicrm/CRM/Mailing/Form/Task.php
index 638b0873f6bc534e0b5f0d1ee4b32a3f15afcc9e..68ff661c5656152d1d378687f5a6ec1253578f3e 100644
--- a/civicrm/CRM/Mailing/Form/Task.php
+++ b/civicrm/CRM/Mailing/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Task/AdhocMailing.php b/civicrm/CRM/Mailing/Form/Task/AdhocMailing.php
index 6b9734374c559c8df4a4fea1c96c1ef22266eca1..6ff7894e7dcfdd9b9b31bbe34d3c05a8bff39272 100644
--- a/civicrm/CRM/Mailing/Form/Task/AdhocMailing.php
+++ b/civicrm/CRM/Mailing/Form/Task/AdhocMailing.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Task/Print.php b/civicrm/CRM/Mailing/Form/Task/Print.php
index 40d4ee7439fe3d1312fdfe530937568dd635b671..63b5e879bcfe241b5bf3d7918fea339aae551036 100644
--- a/civicrm/CRM/Mailing/Form/Task/Print.php
+++ b/civicrm/CRM/Mailing/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Form/Unsubscribe.php b/civicrm/CRM/Mailing/Form/Unsubscribe.php
index f6fa91c72a061e5abbebdfb42924b8c63b921c90..3c677bfb94b3d03ffa6e8d4c8e636ae21aa9b2b5 100644
--- a/civicrm/CRM/Mailing/Form/Unsubscribe.php
+++ b/civicrm/CRM/Mailing/Form/Unsubscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Info.php b/civicrm/CRM/Mailing/Info.php
index c15d89630635badae9e9d0010f4d3b7e31018576..0a2d8cca868ed38aba99b4286b01b23c5fcefa07 100644
--- a/civicrm/CRM/Mailing/Info.php
+++ b/civicrm/CRM/Mailing/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -138,7 +138,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
'civiMails' => array(),
'campaignEnabled' => in_array('CiviCampaign', $config->enableComponents),
'groupNames' => array(),
- // @todo see if we can remove this by dynamically generating the test group list
+ // @todo this is not used in core. Remove once Mosaico no longer depends on it.
'testGroupNames' => $groupNames['values'],
'headerfooterList' => $headerfooterList['values'],
'mesTemplate' => $mesTemplate['values'],
diff --git a/civicrm/CRM/Mailing/MailStore.php b/civicrm/CRM/Mailing/MailStore.php
index ee9c1bf71d7f621e8ecdb45461c8ba44c0e0a505..f35663ceda6bfb23b81e9cf3b6771ce9981149c0 100644
--- a/civicrm/CRM/Mailing/MailStore.php
+++ b/civicrm/CRM/Mailing/MailStore.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/MailStore/Imap.php b/civicrm/CRM/Mailing/MailStore/Imap.php
index 48c4a79ce1346b4b27b675e410c93c348e5dbd93..ffb6ee2fe5fe4261f040530dfea675c9e01979e2 100644
--- a/civicrm/CRM/Mailing/MailStore/Imap.php
+++ b/civicrm/CRM/Mailing/MailStore/Imap.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/MailStore/Localdir.php b/civicrm/CRM/Mailing/MailStore/Localdir.php
index 5abc4de08a926cd0e2aab6748e0fe8ee7de95561..797cafa0713df0b22bb16edbf9e445b1d9a7bbc8 100644
--- a/civicrm/CRM/Mailing/MailStore/Localdir.php
+++ b/civicrm/CRM/Mailing/MailStore/Localdir.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/MailStore/Maildir.php b/civicrm/CRM/Mailing/MailStore/Maildir.php
index c4f73c1e9c39d827b52a078c307fc61532fafc48..35e0158d5610936aa9ce16b2148c309eb8c0a88f 100644
--- a/civicrm/CRM/Mailing/MailStore/Maildir.php
+++ b/civicrm/CRM/Mailing/MailStore/Maildir.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/MailStore/Mbox.php b/civicrm/CRM/Mailing/MailStore/Mbox.php
index e09e80073a9c818d0c62d93ec738d16062053d6f..830b71bbc948be361ab158731f592395afbf9be2 100644
--- a/civicrm/CRM/Mailing/MailStore/Mbox.php
+++ b/civicrm/CRM/Mailing/MailStore/Mbox.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/MailStore/Pop3.php b/civicrm/CRM/Mailing/MailStore/Pop3.php
index 23ab1c83aae0a7ff2f5f9c334df67a3204182f2e..b43e25e499c3d2d6f7d2aa25832c2079aad31a78 100644
--- a/civicrm/CRM/Mailing/MailStore/Pop3.php
+++ b/civicrm/CRM/Mailing/MailStore/Pop3.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/AJAX.php b/civicrm/CRM/Mailing/Page/AJAX.php
index a62f0e69bd36a9478768f63a5cab111b9688b99c..ba0de954584f12b059d1a5a386ca77a08f5d7470 100644
--- a/civicrm/CRM/Mailing/Page/AJAX.php
+++ b/civicrm/CRM/Mailing/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Browse.php b/civicrm/CRM/Mailing/Page/Browse.php
index f2afb009d5e377944444311f21821caac46fa379..d5e2ac1a514c76b938db3b5346bce0f8fc6d7e6b 100644
--- a/civicrm/CRM/Mailing/Page/Browse.php
+++ b/civicrm/CRM/Mailing/Page/Browse.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Common.php b/civicrm/CRM/Mailing/Page/Common.php
index b71b8e978dba732dd525250648dcce9d48f6ef73..093d8350e95f6e593fb10a60a5d00c74ec83cc26 100644
--- a/civicrm/CRM/Mailing/Page/Common.php
+++ b/civicrm/CRM/Mailing/Page/Common.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Component.php b/civicrm/CRM/Mailing/Page/Component.php
index 9d3787b61a3d181dc6ae6ad6c3c0620bae57150e..d587d15beb3d2eb1896fd52f4622dfbd9abab8da 100644
--- a/civicrm/CRM/Mailing/Page/Component.php
+++ b/civicrm/CRM/Mailing/Page/Component.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Confirm.php b/civicrm/CRM/Mailing/Page/Confirm.php
index 134b141d991bfb436a4de3d97787a0bf07a18d12..47ba071a6bcd467a742a5b53fda25d46149a7943 100644
--- a/civicrm/CRM/Mailing/Page/Confirm.php
+++ b/civicrm/CRM/Mailing/Page/Confirm.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Event.php b/civicrm/CRM/Mailing/Page/Event.php
index a74aa059fa826024b3219f5603fe359023e9cf00..90aef4ec1e9579493bca865b8ef49089d17403ee 100644
--- a/civicrm/CRM/Mailing/Page/Event.php
+++ b/civicrm/CRM/Mailing/Page/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Optout.php b/civicrm/CRM/Mailing/Page/Optout.php
index 08137c832665667ef1cc32beffdb8b49262099ae..45a9a3f34d30255e4143ac873d647499fb4e697e 100644
--- a/civicrm/CRM/Mailing/Page/Optout.php
+++ b/civicrm/CRM/Mailing/Page/Optout.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Preview.php b/civicrm/CRM/Mailing/Page/Preview.php
index 4049125ac42588deaacea590fbf4415e938ffdde..94d537e6901f9e58dff2cfe58f6573b4a3fe010f 100644
--- a/civicrm/CRM/Mailing/Page/Preview.php
+++ b/civicrm/CRM/Mailing/Page/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Report.php b/civicrm/CRM/Mailing/Page/Report.php
index 501bc07d05ac1d29ee06619cf8a06e2ae5c382c4..6d36ee08f4d1eea903a38080cb139520b2c69a04 100644
--- a/civicrm/CRM/Mailing/Page/Report.php
+++ b/civicrm/CRM/Mailing/Page/Report.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Resubscribe.php b/civicrm/CRM/Mailing/Page/Resubscribe.php
index bbd57fff27e5db54f8bd91e7b022cb096ed37c58..ddeeddbb57759a2de9c246a2d5e33f06f572bb34 100644
--- a/civicrm/CRM/Mailing/Page/Resubscribe.php
+++ b/civicrm/CRM/Mailing/Page/Resubscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Tab.php b/civicrm/CRM/Mailing/Page/Tab.php
index 1384e8a361ea62f8bc0c49a9fb638efa84c94be8..76ebcc84964874206ba1553acffd91bb969b81ef 100644
--- a/civicrm/CRM/Mailing/Page/Tab.php
+++ b/civicrm/CRM/Mailing/Page/Tab.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/Unsubscribe.php b/civicrm/CRM/Mailing/Page/Unsubscribe.php
index f86ec5cbe5c2fe09c03a5b6e6aab174859c544d7..af1f2610be55f0c28c990acc376c9531d2c4de13 100644
--- a/civicrm/CRM/Mailing/Page/Unsubscribe.php
+++ b/civicrm/CRM/Mailing/Page/Unsubscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Page/View.php b/civicrm/CRM/Mailing/Page/View.php
index c1436edf84ff87a1972cae44d2b5db145eda4b1d..ef6ab6c816280343b7c93521b913a628b25d685f 100644
--- a/civicrm/CRM/Mailing/Page/View.php
+++ b/civicrm/CRM/Mailing/Page/View.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/PseudoConstant.php b/civicrm/CRM/Mailing/PseudoConstant.php
index 0fcf1dfab53e96cbbd76d31743dd4afe932a20fb..5cb6f7dabf8092a8afe9d54c92621644ed2e4877 100644
--- a/civicrm/CRM/Mailing/PseudoConstant.php
+++ b/civicrm/CRM/Mailing/PseudoConstant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Selector/Browse.php b/civicrm/CRM/Mailing/Selector/Browse.php
index 99eea7f50c3c297d832008435c237d2651836b8c..4668cf2938f4e0fa0eb070ae05c84670a28db225 100644
--- a/civicrm/CRM/Mailing/Selector/Browse.php
+++ b/civicrm/CRM/Mailing/Selector/Browse.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Selector/Event.php b/civicrm/CRM/Mailing/Selector/Event.php
index e7cc88a07410f41b555d80aa6c14d8cc3ec63435..b2c3acd5bda5da652191875b161e33b130365d46 100644
--- a/civicrm/CRM/Mailing/Selector/Event.php
+++ b/civicrm/CRM/Mailing/Selector/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Selector/Search.php b/civicrm/CRM/Mailing/Selector/Search.php
index 2e279a09e136445399c6eb0febaf32e3d1352fdd..5fcf139b644867da99b08f75e8731576d36dafdb 100644
--- a/civicrm/CRM/Mailing/Selector/Search.php
+++ b/civicrm/CRM/Mailing/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Task.php b/civicrm/CRM/Mailing/Task.php
index 0ea28bac63181f0baca15148c51e38c9057ff934..14168e6f463c6b9a9176874d04da842aa2e89f56 100644
--- a/civicrm/CRM/Mailing/Task.php
+++ b/civicrm/CRM/Mailing/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Mailing/Tokens.php b/civicrm/CRM/Mailing/Tokens.php
index febf8fe45bbdcc0e63ba5f57df5b6fc0970684ec..330913b042d0ac7efef8bcdd1e53b73edb8fbe51 100644
--- a/civicrm/CRM/Mailing/Tokens.php
+++ b/civicrm/CRM/Mailing/Tokens.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/ActionMapping.php b/civicrm/CRM/Member/ActionMapping.php
index 88c91348c01715f63c1b6af517786388c6e4a238..59429f80b914f717d40a44f5ad2a5fc1a3a913b7 100644
--- a/civicrm/CRM/Member/ActionMapping.php
+++ b/civicrm/CRM/Member/ActionMapping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/BAO/Membership.php b/civicrm/CRM/Member/BAO/Membership.php
index 8c12469015395e2e026e4e97917fd986cae6e2ba..163dfd0dedc6e1a042d6e19494efd09a0a73c6c2 100644
--- a/civicrm/CRM/Member/BAO/Membership.php
+++ b/civicrm/CRM/Member/BAO/Membership.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/BAO/MembershipBlock.php b/civicrm/CRM/Member/BAO/MembershipBlock.php
index 7614df769ac54d3a123b57b739eddb2eff714100..7900024e126627b3e75ef7bb0e5585acefa7a622 100644
--- a/civicrm/CRM/Member/BAO/MembershipBlock.php
+++ b/civicrm/CRM/Member/BAO/MembershipBlock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/BAO/MembershipLog.php b/civicrm/CRM/Member/BAO/MembershipLog.php
index 7787f0ffa353d2c3f1edb78c04cf05fd1da464c2..d749e561cdf2d61976a15e269ec71d12a6ce649f 100644
--- a/civicrm/CRM/Member/BAO/MembershipLog.php
+++ b/civicrm/CRM/Member/BAO/MembershipLog.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/BAO/MembershipPayment.php b/civicrm/CRM/Member/BAO/MembershipPayment.php
index 9050d3ae74e65c321b9ffe403803684cb37a37e6..2b276303553850683cff79b3a7bc46125b8785c9 100644
--- a/civicrm/CRM/Member/BAO/MembershipPayment.php
+++ b/civicrm/CRM/Member/BAO/MembershipPayment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/BAO/MembershipStatus.php b/civicrm/CRM/Member/BAO/MembershipStatus.php
index c118c7cc29be614d5aa455b82f2a65c1bdee5a5d..2fa7203cc157b07e4c189b567a8047086638aff3 100644
--- a/civicrm/CRM/Member/BAO/MembershipStatus.php
+++ b/civicrm/CRM/Member/BAO/MembershipStatus.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/BAO/MembershipType.php b/civicrm/CRM/Member/BAO/MembershipType.php
index f6fb3d8c7ddda5bea51ac0efc2268d3ab4f941cf..a90adf324a32bc01d259536509d7254dcf981672 100644
--- a/civicrm/CRM/Member/BAO/MembershipType.php
+++ b/civicrm/CRM/Member/BAO/MembershipType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/BAO/Query.php b/civicrm/CRM/Member/BAO/Query.php
index 363281ec0b02c5d8013848f6278167485e7c6e21..4efff5ee56593ada533015cd9662501d8a472e5f 100644
--- a/civicrm/CRM/Member/BAO/Query.php
+++ b/civicrm/CRM/Member/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Controller/Search.php b/civicrm/CRM/Member/Controller/Search.php
index 4e96853a088f14e14f10b576d6e886c0d375d092..0f15bf0ff3cf867564d5ee24ef767b02da8e7afb 100644
--- a/civicrm/CRM/Member/Controller/Search.php
+++ b/civicrm/CRM/Member/Controller/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form.php b/civicrm/CRM/Member/Form.php
index cf109871cd36e3ea93718462424f919b78fc814e..3fad351fffceddedced8ec86301db982b027ae31 100644
--- a/civicrm/CRM/Member/Form.php
+++ b/civicrm/CRM/Member/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Membership.php b/civicrm/CRM/Member/Form/Membership.php
index fa30cf4e67e353a16b446b495c543d597d078007..6c98758924bb2253f955ecf33afacaf10bc67ac3 100644
--- a/civicrm/CRM/Member/Form/Membership.php
+++ b/civicrm/CRM/Member/Form/Membership.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/MembershipBlock.php b/civicrm/CRM/Member/Form/MembershipBlock.php
index 089e8fe17b491f4c8dea2ddb87a87a16038e7c8f..1d9b0815b0bdeb92e9a70d20b3da9e4f016067b8 100644
--- a/civicrm/CRM/Member/Form/MembershipBlock.php
+++ b/civicrm/CRM/Member/Form/MembershipBlock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/MembershipConfig.php b/civicrm/CRM/Member/Form/MembershipConfig.php
index 14473fc1ef2bc425f1460cbb4354c62217622b9f..557023675bd4cec404156b25b58b7b57c876fb56 100644
--- a/civicrm/CRM/Member/Form/MembershipConfig.php
+++ b/civicrm/CRM/Member/Form/MembershipConfig.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/MembershipRenewal.php b/civicrm/CRM/Member/Form/MembershipRenewal.php
index 03c918093531dc60894217fb1b014087ea991061..25c90c49699081035d74b470da92e6f3c26e01f6 100644
--- a/civicrm/CRM/Member/Form/MembershipRenewal.php
+++ b/civicrm/CRM/Member/Form/MembershipRenewal.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/MembershipStatus.php b/civicrm/CRM/Member/Form/MembershipStatus.php
index 918b60a500c2c067ac71b8b27bacba55bc20e4ba..343e09f8b532484721f35fd2cbad03f29d3ca306 100644
--- a/civicrm/CRM/Member/Form/MembershipStatus.php
+++ b/civicrm/CRM/Member/Form/MembershipStatus.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/MembershipType.php b/civicrm/CRM/Member/Form/MembershipType.php
index 20f91d6788202b8d035acd1cd1344102847efe6d..135ebb0449413c249fb29c917b1708ce7f39ab9f 100644
--- a/civicrm/CRM/Member/Form/MembershipType.php
+++ b/civicrm/CRM/Member/Form/MembershipType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/MembershipView.php b/civicrm/CRM/Member/Form/MembershipView.php
index de45ee6cdbc50533d9e7c4effab0db574d151c4a..ac54c6a506c5af4d899ca4504cb73e3988a52b58 100644
--- a/civicrm/CRM/Member/Form/MembershipView.php
+++ b/civicrm/CRM/Member/Form/MembershipView.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Search.php b/civicrm/CRM/Member/Form/Search.php
index 33450a5e7abeee6d72011c84f7b0730bc66d4952..39f338d4115d945b9aac71a67507e45a20af1864 100644
--- a/civicrm/CRM/Member/Form/Search.php
+++ b/civicrm/CRM/Member/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Task.php b/civicrm/CRM/Member/Form/Task.php
index 1e3943ec210ff5f45411100fda5dbf998751793b..009b67f201f7c6914c2850c31b0cf961be068710 100644
--- a/civicrm/CRM/Member/Form/Task.php
+++ b/civicrm/CRM/Member/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Task/Batch.php b/civicrm/CRM/Member/Form/Task/Batch.php
index be22704f44123a7b1b5bccbba639013fd5403953..4e13e6528b542accc69505a6c822e4d6aaa45a0b 100644
--- a/civicrm/CRM/Member/Form/Task/Batch.php
+++ b/civicrm/CRM/Member/Form/Task/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -29,8 +29,6 @@
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2018
- * $Id$
- *
*/
/**
@@ -208,6 +206,9 @@ class CRM_Member_Form_Task_Batch extends CRM_Member_Form_Task {
*/
public function postProcess() {
$params = $this->exportValues();
+ // @todo extract submit functions &
+ // extend CRM_Event_Form_Task_BatchTest::testSubmit with a data provider to test
+ // handling of custom data, specifically checkbox fields.
$dates = array(
'join_date',
'membership_start_date',
diff --git a/civicrm/CRM/Member/Form/Task/Delete.php b/civicrm/CRM/Member/Form/Task/Delete.php
index 334c07b38a610426b88774e2807b8dc8826b9005..0dfc6ce0e61fa656cdcb2bf8843627a61e761557 100644
--- a/civicrm/CRM/Member/Form/Task/Delete.php
+++ b/civicrm/CRM/Member/Form/Task/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Task/Email.php b/civicrm/CRM/Member/Form/Task/Email.php
index fdff9b1c2abcc6470c974731bd32d79ff92d5308..22dc13f14f33ae0166cbb6df6870248690dfad6c 100644
--- a/civicrm/CRM/Member/Form/Task/Email.php
+++ b/civicrm/CRM/Member/Form/Task/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Task/Label.php b/civicrm/CRM/Member/Form/Task/Label.php
index db0c24b94e7e0e5fbe65537d8116e108e5fc2aff..494bfb8cc4222a29ce79f71bed0aabbf8326a565 100644
--- a/civicrm/CRM/Member/Form/Task/Label.php
+++ b/civicrm/CRM/Member/Form/Task/Label.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Task/PDFLetter.php b/civicrm/CRM/Member/Form/Task/PDFLetter.php
index c5c96e6d442aeb8fbe0d818ab7da92d7239e78e7..b82151a179841b5c5ba334734f30fc2102ba878a 100644
--- a/civicrm/CRM/Member/Form/Task/PDFLetter.php
+++ b/civicrm/CRM/Member/Form/Task/PDFLetter.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Task/PickProfile.php b/civicrm/CRM/Member/Form/Task/PickProfile.php
index 063cd9187c16d98de75d3666d0b5df9e23b9eb24..355237a435fdede1a1a039140fcb12e319400cfd 100644
--- a/civicrm/CRM/Member/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Member/Form/Task/PickProfile.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Task/Print.php b/civicrm/CRM/Member/Form/Task/Print.php
index 7d1b1442b044815cd1673e00aa7215ff72ab8af2..f5d03b384ebb9be317ce647f5066d117fb0d5c13 100644
--- a/civicrm/CRM/Member/Form/Task/Print.php
+++ b/civicrm/CRM/Member/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Task/Result.php b/civicrm/CRM/Member/Form/Task/Result.php
index dee1051cad6bfc4733315d52b093b1986c5163e3..4e1d25bfa5545e85cbb391e16ed74298ce50c588 100644
--- a/civicrm/CRM/Member/Form/Task/Result.php
+++ b/civicrm/CRM/Member/Form/Task/Result.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Member/Form/Task/SearchTaskHookSample.php
index ad1536dce00071014771c9da4a08c569b6bfcda9..a1c4021787f9362e7b7d29515ee1c0d6b5d4d129 100644
--- a/civicrm/CRM/Member/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Member/Form/Task/SearchTaskHookSample.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Import/Controller.php b/civicrm/CRM/Member/Import/Controller.php
index 1e84e74d36c41022ba5dac6ee4ebb513e0818595..b6899d04aa2380e14b52ef53a67a219978660575 100644
--- a/civicrm/CRM/Member/Import/Controller.php
+++ b/civicrm/CRM/Member/Import/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Import/Field.php b/civicrm/CRM/Member/Import/Field.php
index 7ca0a33c08f262b5746073d286fc7c4921a52634..1f303d0f747df20b76e7a483c8c405896e3ddb89 100644
--- a/civicrm/CRM/Member/Import/Field.php
+++ b/civicrm/CRM/Member/Import/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Import/Form/DataSource.php b/civicrm/CRM/Member/Import/Form/DataSource.php
index 5aa7eed44764405e7a7b0df6fedd50a2a3ff8e1a..1d983f8c32c1bb3daffb40d852e15ae11797e5b2 100644
--- a/civicrm/CRM/Member/Import/Form/DataSource.php
+++ b/civicrm/CRM/Member/Import/Form/DataSource.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Import/Form/MapField.php b/civicrm/CRM/Member/Import/Form/MapField.php
index f4d4e63415f798282462b82df16ea263fed672a3..08e4f89a07a57171ffd95380d523455b15decaab 100644
--- a/civicrm/CRM/Member/Import/Form/MapField.php
+++ b/civicrm/CRM/Member/Import/Form/MapField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Import/Form/Preview.php b/civicrm/CRM/Member/Import/Form/Preview.php
index 9190ff622500dcb2de49d5fe2c991e8f17cef185..08d1e19a239a8b85352e9c42f9b5498c4d52f275 100644
--- a/civicrm/CRM/Member/Import/Form/Preview.php
+++ b/civicrm/CRM/Member/Import/Form/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Import/Form/Summary.php b/civicrm/CRM/Member/Import/Form/Summary.php
index 8b7970ed24abc9300159d7ac41515b7946a263d2..8bfdb622083e6b3ff04323dfe9bd291891386428 100644
--- a/civicrm/CRM/Member/Import/Form/Summary.php
+++ b/civicrm/CRM/Member/Import/Form/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Import/Parser.php b/civicrm/CRM/Member/Import/Parser.php
index edc0e6db7e684534e1f42775147ad047cd5221f3..1526803e0d21b0072e1b2a20c90cbdd61979445f 100644
--- a/civicrm/CRM/Member/Import/Parser.php
+++ b/civicrm/CRM/Member/Import/Parser.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Import/Parser/Membership.php b/civicrm/CRM/Member/Import/Parser/Membership.php
index df78ef77fcc8498ea401817d7116729ebd492d65..0e03811cb26a6439b141183190d5e2b08358dfd7 100644
--- a/civicrm/CRM/Member/Import/Parser/Membership.php
+++ b/civicrm/CRM/Member/Import/Parser/Membership.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Info.php b/civicrm/CRM/Member/Info.php
index a718b547461d853b129a798d20ab36619ae6e715..504c51d0a6f087371ca5975e0cf056ecb22e9bee 100644
--- a/civicrm/CRM/Member/Info.php
+++ b/civicrm/CRM/Member/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Page/AJAX.php b/civicrm/CRM/Member/Page/AJAX.php
index 655f4e70330a92a5e33782c7f197ac695aa5a59c..2ebddf909ad4979b31db37373af1bb3656fcc6d6 100644
--- a/civicrm/CRM/Member/Page/AJAX.php
+++ b/civicrm/CRM/Member/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Page/DashBoard.php b/civicrm/CRM/Member/Page/DashBoard.php
index 1a2423ae7071c7a9320761aa9edd56cb5d83a3d9..a0a6e4bb033d5e017a96e4489ca26de6e563fa63 100644
--- a/civicrm/CRM/Member/Page/DashBoard.php
+++ b/civicrm/CRM/Member/Page/DashBoard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Page/MembershipStatus.php b/civicrm/CRM/Member/Page/MembershipStatus.php
index 29a3555f18bb5a271bafd9e40e73e13726c00bea..a426ca5216dd4e93696c1336069c16915a724b38 100644
--- a/civicrm/CRM/Member/Page/MembershipStatus.php
+++ b/civicrm/CRM/Member/Page/MembershipStatus.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Page/MembershipType.php b/civicrm/CRM/Member/Page/MembershipType.php
index 16bb1e80db7f14e5a90950a031c0e9210f1e5844..7298a06ccaabef4745fe766f7d620a2e3598cf50 100644
--- a/civicrm/CRM/Member/Page/MembershipType.php
+++ b/civicrm/CRM/Member/Page/MembershipType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Page/Tab.php b/civicrm/CRM/Member/Page/Tab.php
index 8bfeacacf7842e5b0d858a05bee1aede33fb4175..17c778bb21f95471764d2af94e08b5474ccf9931 100644
--- a/civicrm/CRM/Member/Page/Tab.php
+++ b/civicrm/CRM/Member/Page/Tab.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Page/UserDashboard.php b/civicrm/CRM/Member/Page/UserDashboard.php
index 76dbf3fdf5486d4fc448255f6beb5dc5920b96af..605cf5a77cdd1e3b8d0f785765d1464c7416cf1c 100644
--- a/civicrm/CRM/Member/Page/UserDashboard.php
+++ b/civicrm/CRM/Member/Page/UserDashboard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/PseudoConstant.php b/civicrm/CRM/Member/PseudoConstant.php
index b346b3e1ac2350684c9c3526b0c55e700d0daa2d..5d94876895b6855ef35c52f1922c6d97c3b1fbc4 100644
--- a/civicrm/CRM/Member/PseudoConstant.php
+++ b/civicrm/CRM/Member/PseudoConstant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Selector/Search.php b/civicrm/CRM/Member/Selector/Search.php
index a59bae27e90bbb2bf56a1a824f8b80a6b915dd10..82db3720670e6b82ff25230ab19c0405f677aa59 100644
--- a/civicrm/CRM/Member/Selector/Search.php
+++ b/civicrm/CRM/Member/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/StateMachine/Search.php b/civicrm/CRM/Member/StateMachine/Search.php
index 9e4e8a2f5574944be5c185120a8e538daf24aca0..88f285e2dc7f758fde620a71d8d41b0d6b9ffbc7 100644
--- a/civicrm/CRM/Member/StateMachine/Search.php
+++ b/civicrm/CRM/Member/StateMachine/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/StatusOverrideTypes.php b/civicrm/CRM/Member/StatusOverrideTypes.php
index 4b47ee4f16df6b470543ce39ad3d38e78973f7c1..b820247e4cabf72b901f6c16d5675019812f0e1c 100644
--- a/civicrm/CRM/Member/StatusOverrideTypes.php
+++ b/civicrm/CRM/Member/StatusOverrideTypes.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Task.php b/civicrm/CRM/Member/Task.php
index d93726a3a8b3f4b25a23ee0283defbcd730306e4..a8843f6e6c91202149766a9a28b75f890d91fb12 100644
--- a/civicrm/CRM/Member/Task.php
+++ b/civicrm/CRM/Member/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Member/Tokens.php b/civicrm/CRM/Member/Tokens.php
index f7392bce1aaa2ece279334532ad3acd8f912a147..ae603efb516a75f7d84dadebc809a3864fd2ac50 100644
--- a/civicrm/CRM/Member/Tokens.php
+++ b/civicrm/CRM/Member/Tokens.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Note/Form/Note.php b/civicrm/CRM/Note/Form/Note.php
index be7d803456215025e3298f6415bcecee6cdab232..f66cd0fb3bb737459be880d503f35a8adda0dff7 100644
--- a/civicrm/CRM/Note/Form/Note.php
+++ b/civicrm/CRM/Note/Form/Note.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/PCP/BAO/PCP.php b/civicrm/CRM/PCP/BAO/PCP.php
index f2ebbe8b5f26f63fe9f7343da7c316fb4e5ec7c6..215ac06c459314775ef030ba3b197cb8ecd076c5 100644
--- a/civicrm/CRM/PCP/BAO/PCP.php
+++ b/civicrm/CRM/PCP/BAO/PCP.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -412,7 +412,7 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0";
* Add PCP form elements to a form.
*
* @param int $pcpId
- * @param CRM_Core_Page $page
+ * @param CRM_Core_Form $page
* @param null $elements
*/
public static function buildPcp($pcpId, &$page, &$elements = NULL) {
@@ -453,7 +453,7 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0";
$page->_defaults['pcp_is_anonymous'] = 0;
$page->add('text', 'pcp_roll_nickname', ts('Name'), array('maxlength' => 30));
- $page->add('textarea', "pcp_personal_note", ts('Personal Note'), array('style' => 'height: 3em; width: 40em;'));
+ $page->addField('pcp_personal_note', array('entity' => 'ContributionSoft', 'context' => 'create', 'style' => 'height: 3em; width: 40em;'));
}
else {
$page->assign('is_honor_roll', FALSE);
@@ -477,8 +477,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0";
return FALSE;
}
- $approvedId = CRM_Core_OptionGroup::getValue('pcp_status', 'Approved', 'name');
-
$pcpStatus = CRM_Core_OptionGroup::values("pcp_status");
$params = array('id' => $pcpId);
@@ -507,12 +505,13 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0";
// define redirect url back to contrib page or event if needed
$url = CRM_Utils_System::url($urlBase, "reset=1&id={$pcpBlock['entity_id']}", FALSE, NULL, FALSE, TRUE);
+ $currentPCPStatus = CRM_Core_PseudoConstant::getName('CRM_PCP_BAO_PCP', 'status_id', $pcpInfo['status_id']);
if ($pcpBlock['target_entity_id'] != $entity['id']) {
$statusMessage = ts('This page is not related to the Personal Campaign Page you have just visited. However you can still make a contribution here.');
CRM_Core_Error::statusBounce($statusMessage, $url);
}
- elseif ($pcpInfo['status_id'] != $approvedId) {
+ elseif ($currentPCPStatus !== 'Approved') {
$statusMessage = ts('The Personal Campaign Page you have just visited is currently %1. However you can still support the campaign here.', array(1 => $pcpStatus[$pcpInfo['status_id']]));
CRM_Core_Error::statusBounce($statusMessage, $url);
}
diff --git a/civicrm/CRM/PCP/BAO/PCPBlock.php b/civicrm/CRM/PCP/BAO/PCPBlock.php
index e9d53855fd433755e0146d69c7d5d58e6d2325e8..94c00881d435184e1c78f5e6ce7db78e156d63e4 100644
--- a/civicrm/CRM/PCP/BAO/PCPBlock.php
+++ b/civicrm/CRM/PCP/BAO/PCPBlock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/PCP/Controller/PCP.php b/civicrm/CRM/PCP/Controller/PCP.php
index 8f456dae90723c64c5b37a92e6293fa98ac075f7..57fb659f0cbed314fa66fd3e64dbcb0054e88564 100644
--- a/civicrm/CRM/PCP/Controller/PCP.php
+++ b/civicrm/CRM/PCP/Controller/PCP.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/PCP/Form/Campaign.php b/civicrm/CRM/PCP/Form/Campaign.php
index efeb41b332650b42e5d2b60d081a23c1514d49ab..ffaa85a5db44ae56e8f5dc883cbd2e7d9aa48c82 100644
--- a/civicrm/CRM/PCP/Form/Campaign.php
+++ b/civicrm/CRM/PCP/Form/Campaign.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -140,7 +140,7 @@ class CRM_PCP_Form_Campaign extends CRM_Core_Form {
else {
$owner_notification_option = CRM_PCP_BAO_PCP::getOwnerNotificationId($this->controller->get('component_page_id'), $this->_component ? $this->_component : 'contribute');
}
- if ($owner_notification_option == CRM_Core_OptionGroup::getValue('pcp_owner_notify', 'owner_chooses', 'name')) {
+ if ($owner_notification_option == CRM_Core_PseudoConstant::getKey('CRM_PCP_BAO_PCPBlock', 'owner_notify_id', 'owner_chooses')) {
$this->assign('owner_notification_option', TRUE);
$this->addElement('checkbox', 'is_notify', ts('Notify me via email when someone donates to my page'), NULL);
}
diff --git a/civicrm/CRM/PCP/Form/Contribute.php b/civicrm/CRM/PCP/Form/Contribute.php
index 09d8e501c2bccf2e8132a4aa575709566ad152f6..db24d4dcd507c164d535a6febb0f514546cd9dba 100644
--- a/civicrm/CRM/PCP/Form/Contribute.php
+++ b/civicrm/CRM/PCP/Form/Contribute.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/PCP/Form/Event.php b/civicrm/CRM/PCP/Form/Event.php
index 330f584417db267d876d794118ae1f7295057a5c..74ae82e4919e5a9a6fadc3dcfbe714cd6650d381 100644
--- a/civicrm/CRM/PCP/Form/Event.php
+++ b/civicrm/CRM/PCP/Form/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/PCP/Form/PCP.php b/civicrm/CRM/PCP/Form/PCP.php
index a8a80e0f069e5c607e373ecc575a7c4e91143fc3..187949ee82490b10cb2ef2c3d5fd67ef14e6ced9 100644
--- a/civicrm/CRM/PCP/Form/PCP.php
+++ b/civicrm/CRM/PCP/Form/PCP.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/PCP/Form/PCPAccount.php b/civicrm/CRM/PCP/Form/PCPAccount.php
index 087052418524fefeaf42706b0d62672f18b8a310..1a98aade731b36b993efcef4a1cfc0aed5943545 100644
--- a/civicrm/CRM/PCP/Form/PCPAccount.php
+++ b/civicrm/CRM/PCP/Form/PCPAccount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/PCP/Page/PCP.php b/civicrm/CRM/PCP/Page/PCP.php
index 03da83870b82558a37187c33ad528265f8dc0df2..6822b59f466b380d18479c32947375e76369348f 100644
--- a/civicrm/CRM/PCP/Page/PCP.php
+++ b/civicrm/CRM/PCP/Page/PCP.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/PCP/Page/PCPInfo.php b/civicrm/CRM/PCP/Page/PCPInfo.php
index aa1790f06581d30c92b91b054e08ba5530244566..db32123a94cc0d046ee62d06ea731dfc0917ff8b 100644
--- a/civicrm/CRM/PCP/Page/PCPInfo.php
+++ b/civicrm/CRM/PCP/Page/PCPInfo.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -77,7 +77,7 @@ class CRM_PCP_Page_PCPInfo extends CRM_Core_Page {
$this->assign('pcp', $pcpInfo);
$pcpStatus = CRM_Core_OptionGroup::values("pcp_status");
- $approvedId = CRM_Core_OptionGroup::getValue('pcp_status', 'Approved', 'name');
+ $approvedId = CRM_Core_PseudoConstant::getKey('CRM_PCP_BAO_PCP', 'status_id', 'Approved');
// check if PCP is created by anonymous user
$anonymousPCP = CRM_Utils_Request::retrieve('ap', 'Boolean', $this);
diff --git a/civicrm/CRM/PCP/StateMachine/PCP.php b/civicrm/CRM/PCP/StateMachine/PCP.php
index 1feb8b4bdcb11c0a18ec24f68999fe771fd468cc..94471f3906927a342c471eec110ecbc988971069 100644
--- a/civicrm/CRM/PCP/StateMachine/PCP.php
+++ b/civicrm/CRM/PCP/StateMachine/PCP.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/BAO/Pledge.php b/civicrm/CRM/Pledge/BAO/Pledge.php
index 346a9d8f20c78e4f28e8fe39acff25d46d7de2e4..633cbea65ece76c0951c5ae42407d95087e442b0 100644
--- a/civicrm/CRM/Pledge/BAO/Pledge.php
+++ b/civicrm/CRM/Pledge/BAO/Pledge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/BAO/PledgeBlock.php b/civicrm/CRM/Pledge/BAO/PledgeBlock.php
index e8ef7d41ab778a99529fa5b9ed5345e8c53d108c..263788146e3e29e463f2d878b779ecdc62bd4db0 100644
--- a/civicrm/CRM/Pledge/BAO/PledgeBlock.php
+++ b/civicrm/CRM/Pledge/BAO/PledgeBlock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/BAO/PledgePayment.php b/civicrm/CRM/Pledge/BAO/PledgePayment.php
index efb1e96bb9856036ff403d9c2f871c65b5b1346b..31a68c636cc21520c660b4d07f0147e19b2e4d0b 100644
--- a/civicrm/CRM/Pledge/BAO/PledgePayment.php
+++ b/civicrm/CRM/Pledge/BAO/PledgePayment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/BAO/Query.php b/civicrm/CRM/Pledge/BAO/Query.php
index c16e1b2a20c683e12dee9585dda4d7fc8e0d620c..37830ff42d5b9b35463abeb6c93e8971be7aca2c 100644
--- a/civicrm/CRM/Pledge/BAO/Query.php
+++ b/civicrm/CRM/Pledge/BAO/Query.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Controller/Search.php b/civicrm/CRM/Pledge/Controller/Search.php
index f7b252f395de21974dd913ab288147b24674f362..943346cc46e2113759d0d67f37b1437964546995 100644
--- a/civicrm/CRM/Pledge/Controller/Search.php
+++ b/civicrm/CRM/Pledge/Controller/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Form/Payment.php b/civicrm/CRM/Pledge/Form/Payment.php
index c8959cf3d0ed1697d26cf0b9ea79e127d247edfb..29df48a524044cb94b369aa15e8bf304974f787f 100644
--- a/civicrm/CRM/Pledge/Form/Payment.php
+++ b/civicrm/CRM/Pledge/Form/Payment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Form/Pledge.php b/civicrm/CRM/Pledge/Form/Pledge.php
index 33774f6b42c850f77155cefcde8bdf500b9a527a..0543883fe1f9569bf2fcf136886ed03219da1f4d 100644
--- a/civicrm/CRM/Pledge/Form/Pledge.php
+++ b/civicrm/CRM/Pledge/Form/Pledge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Form/PledgeView.php b/civicrm/CRM/Pledge/Form/PledgeView.php
index 2ef336bb3d1e182910e8263cac6529d6c95921cd..ce6c9146f3d19a485751e2b6136b082aa700841f 100644
--- a/civicrm/CRM/Pledge/Form/PledgeView.php
+++ b/civicrm/CRM/Pledge/Form/PledgeView.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Form/Search.php b/civicrm/CRM/Pledge/Form/Search.php
index e3aeb072e3db595e58a77da6610c978ef62f5d1b..65a6027c4de819acbb899ccee62f77012d51bd03 100644
--- a/civicrm/CRM/Pledge/Form/Search.php
+++ b/civicrm/CRM/Pledge/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Form/Task.php b/civicrm/CRM/Pledge/Form/Task.php
index d3dd096983f8f9ba3cc54a8eecc040d055ef048d..092fece3a3e03124f9c934b41ea47eb0f5a5ca4b 100644
--- a/civicrm/CRM/Pledge/Form/Task.php
+++ b/civicrm/CRM/Pledge/Form/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Form/Task/Delete.php b/civicrm/CRM/Pledge/Form/Task/Delete.php
index 626cb9573ff895fc66f2a9979677e5a1118eba54..2f35f625acf6dcd2ec619d1f82140b9d704b3bff 100644
--- a/civicrm/CRM/Pledge/Form/Task/Delete.php
+++ b/civicrm/CRM/Pledge/Form/Task/Delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Form/Task/Print.php b/civicrm/CRM/Pledge/Form/Task/Print.php
index d57c70b27d74a9f26f7e03acbcb789c5b2a80d79..40f2f14912bf6642dbaf519fcc1f42e31671ce23 100644
--- a/civicrm/CRM/Pledge/Form/Task/Print.php
+++ b/civicrm/CRM/Pledge/Form/Task/Print.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Form/Task/Result.php b/civicrm/CRM/Pledge/Form/Task/Result.php
index cde64bed6fc52eee39d1e5a0a6d939a8b662d733..29924440624b423180f34cea4e03b791386a4880 100644
--- a/civicrm/CRM/Pledge/Form/Task/Result.php
+++ b/civicrm/CRM/Pledge/Form/Task/Result.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Pledge/Form/Task/SearchTaskHookSample.php
index caf9fb30a80440ce3f70b70d0170579d5777324c..9f3c6f48e8e30c2856799d78f3e980e2113cd2a3 100644
--- a/civicrm/CRM/Pledge/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Pledge/Form/Task/SearchTaskHookSample.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Info.php b/civicrm/CRM/Pledge/Info.php
index 24fac097166c43cdbb03cbda57cc36cc6fe133e9..475b85fe27bd569cc5965dfb40f2656fafb38995 100644
--- a/civicrm/CRM/Pledge/Info.php
+++ b/civicrm/CRM/Pledge/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Page/AJAX.php b/civicrm/CRM/Pledge/Page/AJAX.php
index 4e827d02f130ee18ef4f8cd5a39402e5f04787f2..dbde62f2908cc35130e8ee24b59edf78abab4a4b 100644
--- a/civicrm/CRM/Pledge/Page/AJAX.php
+++ b/civicrm/CRM/Pledge/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Page/DashBoard.php b/civicrm/CRM/Pledge/Page/DashBoard.php
index 71296b2020e7c76e7010fb179e849afca7aa0070..b5560cb651508987bc552ada7a6c701136df8adc 100644
--- a/civicrm/CRM/Pledge/Page/DashBoard.php
+++ b/civicrm/CRM/Pledge/Page/DashBoard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Page/Payment.php b/civicrm/CRM/Pledge/Page/Payment.php
index 07de09ecc4fac8bad674390ca0f79741cf93a0c1..36fcc526b9b02df4bb48fcc104ad1cedf92386c7 100644
--- a/civicrm/CRM/Pledge/Page/Payment.php
+++ b/civicrm/CRM/Pledge/Page/Payment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Page/Tab.php b/civicrm/CRM/Pledge/Page/Tab.php
index 955fbac05757f764f559bc8ae2bca3fb7bd18f77..5f6a30592c6821f60ae4dd6a0f5dfacc66accf75 100644
--- a/civicrm/CRM/Pledge/Page/Tab.php
+++ b/civicrm/CRM/Pledge/Page/Tab.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Page/UserDashboard.php b/civicrm/CRM/Pledge/Page/UserDashboard.php
index 8f81fa9e818304bb236eed990532e7fc5abb29e1..1f012da05e04a7a40f6533aa67018b97eff83cd8 100644
--- a/civicrm/CRM/Pledge/Page/UserDashboard.php
+++ b/civicrm/CRM/Pledge/Page/UserDashboard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Selector/Search.php b/civicrm/CRM/Pledge/Selector/Search.php
index c20f9a178eff28643b249bd1e9ac9275fbb5a578..f4dfc6dd8e3804c96ee971da14b3df0b7b3f7462 100644
--- a/civicrm/CRM/Pledge/Selector/Search.php
+++ b/civicrm/CRM/Pledge/Selector/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/StateMachine/Search.php b/civicrm/CRM/Pledge/StateMachine/Search.php
index bf1d347b6c8f3268c80a755a31ae79a6d72c442e..bdb9814ea00725609c84cd8dae25d13749bcaca8 100644
--- a/civicrm/CRM/Pledge/StateMachine/Search.php
+++ b/civicrm/CRM/Pledge/StateMachine/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Pledge/Task.php b/civicrm/CRM/Pledge/Task.php
index e620845db7f7ae30517c13df7eb2092c61cedd69..20f57bfc9956d78d69c56980d1cd4efcb49ccc74 100644
--- a/civicrm/CRM/Pledge/Task.php
+++ b/civicrm/CRM/Pledge/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/BAO/LineItem.php b/civicrm/CRM/Price/BAO/LineItem.php
index 303e384d44bc6da4d89a6b12d2b9f2d80aee06c4..35dd44c831c351f61a92a35d6c0041ff914e04ba 100644
--- a/civicrm/CRM/Price/BAO/LineItem.php
+++ b/civicrm/CRM/Price/BAO/LineItem.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/BAO/PriceField.php b/civicrm/CRM/Price/BAO/PriceField.php
index 4b884abccf76fcbe57406e36a766b7e5357febd7..d7dc961434445faa5a5cb29d04f19ccc6f2d184c 100644
--- a/civicrm/CRM/Price/BAO/PriceField.php
+++ b/civicrm/CRM/Price/BAO/PriceField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/BAO/PriceFieldValue.php b/civicrm/CRM/Price/BAO/PriceFieldValue.php
index 4411bf0436148ae2502fd530a4a195c63075e321..b309facc0816caddf6b97f2fbacafee3ec99cff5 100644
--- a/civicrm/CRM/Price/BAO/PriceFieldValue.php
+++ b/civicrm/CRM/Price/BAO/PriceFieldValue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/BAO/PriceSet.php b/civicrm/CRM/Price/BAO/PriceSet.php
index e913d3604f442bafe61b769ca3a43727b7e2879d..1f8d2fe79bf6acf189714a2e22e9b6c26c5550d4 100644
--- a/civicrm/CRM/Price/BAO/PriceSet.php
+++ b/civicrm/CRM/Price/BAO/PriceSet.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/Form/DeleteField.php b/civicrm/CRM/Price/Form/DeleteField.php
index bdee3216f9383de12c5d8a487af9502c11b4b998..6abb3580e8ba2283aa24775ddaf19eec8b5d35b3 100644
--- a/civicrm/CRM/Price/Form/DeleteField.php
+++ b/civicrm/CRM/Price/Form/DeleteField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/Form/DeleteSet.php b/civicrm/CRM/Price/Form/DeleteSet.php
index a0ccedf10210d105661505a7c016b7565779e838..fd36f6d6e91ee9ad3d7735767a5a63efc536e143 100644
--- a/civicrm/CRM/Price/Form/DeleteSet.php
+++ b/civicrm/CRM/Price/Form/DeleteSet.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/Form/Field.php b/civicrm/CRM/Price/Form/Field.php
index dfa148634f28deef60ab59a9cf899041e994e077..08b36bf6a887ac50563ab1f556459dd58834bae4 100644
--- a/civicrm/CRM/Price/Form/Field.php
+++ b/civicrm/CRM/Price/Form/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/Form/Option.php b/civicrm/CRM/Price/Form/Option.php
index 1159864c7e6236d7cc160f55aa3e947a4a62a42a..b57665a6ace99094a58a9383ddb6f2ceee4e6b99 100644
--- a/civicrm/CRM/Price/Form/Option.php
+++ b/civicrm/CRM/Price/Form/Option.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/Form/Preview.php b/civicrm/CRM/Price/Form/Preview.php
index f564b0918ed6a3eddaa906c4fd27e98bf126c21d..04b943bba4242c2f0695d9b2e6d624de9503258f 100644
--- a/civicrm/CRM/Price/Form/Preview.php
+++ b/civicrm/CRM/Price/Form/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/Form/Set.php b/civicrm/CRM/Price/Form/Set.php
index e78d58dddf063a5a425ca43d1c08691815de984b..060b6072a6d7b188e59b0d9201b65706f597f6ba 100644
--- a/civicrm/CRM/Price/Form/Set.php
+++ b/civicrm/CRM/Price/Form/Set.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/Page/Field.php b/civicrm/CRM/Price/Page/Field.php
index 80c662e10ba5d4453af30fe8e16b85ce5eed0982..954b6668315dfa94235e41e7416986920216e7cf 100644
--- a/civicrm/CRM/Price/Page/Field.php
+++ b/civicrm/CRM/Price/Page/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/Page/Option.php b/civicrm/CRM/Price/Page/Option.php
index 7685321fe8bc30bae2d00d5494a008015520c795..b7c692599f8998317b78d92872a442ba0bb64ed5 100644
--- a/civicrm/CRM/Price/Page/Option.php
+++ b/civicrm/CRM/Price/Page/Option.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Price/Page/Set.php b/civicrm/CRM/Price/Page/Set.php
index 53dd8af7f134a5235974742ef7e45954e5cbb27a..d15f19305e9b4084da145f6ec53867c38f4e17bd 100644
--- a/civicrm/CRM/Price/Page/Set.php
+++ b/civicrm/CRM/Price/Page/Set.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -294,7 +294,7 @@ class CRM_Price_Page_Set extends CRM_Core_Page {
$actionLinks = self::actionLinks();
//CRM-10117
if ($dao->is_reserved) {
- $actionLinks[CRM_Core_Action::BROWSE]['name'] = 'View Price Fields';
+ $actionLinks[CRM_Core_Action::BROWSE]['name'] = ts('View Price Fields');
}
$priceSet[$dao->id]['action'] = CRM_Core_Action::formLink($actionLinks, $action,
array('sid' => $dao->id),
diff --git a/civicrm/CRM/Profile/Form.php b/civicrm/CRM/Profile/Form.php
index 050bca6d1038d91373cb6e9c890f18b5676bcbe6..09479b1e7405c165bc759299f28fdc20c7ec0b48 100644
--- a/civicrm/CRM/Profile/Form.php
+++ b/civicrm/CRM/Profile/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -849,7 +849,7 @@ class CRM_Profile_Form extends CRM_Core_Form {
public static function validateContactActivityProfile($activityId, $contactId, $gid) {
$errors = array();
if (!$activityId) {
- $errors[] = 'Profile is using one or more activity fields, and is missing the activity Id (aid) in the URL.';
+ $errors[] = ts('Profile is using one or more activity fields, and is missing the activity Id (aid) in the URL.');
return $errors;
}
@@ -858,7 +858,7 @@ class CRM_Profile_Form extends CRM_Core_Form {
CRM_Activity_BAO_Activity::retrieve($activityParams, $activityDetails);
if (empty($activityDetails)) {
- $errors[] = 'Invalid Activity Id (aid).';
+ $errors[] = ts('Invalid Activity Id (aid).');
return $errors;
}
@@ -871,7 +871,7 @@ class CRM_Profile_Form extends CRM_Core_Form {
!in_array($contactId, $activityDetails['target_contact'])
)
) {
- $errors[] = 'This activity cannot be edited or viewed via this profile.';
+ $errors[] = ts('This activity cannot be edited or viewed via this profile.');
}
return $errors;
diff --git a/civicrm/CRM/Profile/Form/Dynamic.php b/civicrm/CRM/Profile/Form/Dynamic.php
index 5488d6d87c045c0ca0e072fb3fb7ebf55c9f64b4..6f89238be2408d23039689ecc0374eb05b1cf3a4 100644
--- a/civicrm/CRM/Profile/Form/Dynamic.php
+++ b/civicrm/CRM/Profile/Form/Dynamic.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Profile/Form/Edit.php b/civicrm/CRM/Profile/Form/Edit.php
index ffa004a62956ec4d4748659fad776e4f72b0635b..99348457ff5531773fcbf3583f7aa1202a1e5952 100644
--- a/civicrm/CRM/Profile/Form/Edit.php
+++ b/civicrm/CRM/Profile/Form/Edit.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Profile/Form/Search.php b/civicrm/CRM/Profile/Form/Search.php
index d00fb5966c867d6287eb4ee317f44b0a7bd025e6..44ecd746a9169f128fc56457da4d7db4b6abb8c9 100644
--- a/civicrm/CRM/Profile/Form/Search.php
+++ b/civicrm/CRM/Profile/Form/Search.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Profile/Page/Dynamic.php b/civicrm/CRM/Profile/Page/Dynamic.php
index 20e760a7ca20ed3a044203a3c975cd1c9b90ec72..0416a882e08cf451bb90e59dbf73012c9f4e56e1 100644
--- a/civicrm/CRM/Profile/Page/Dynamic.php
+++ b/civicrm/CRM/Profile/Page/Dynamic.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Profile/Page/Listings.php b/civicrm/CRM/Profile/Page/Listings.php
index 0f22e0f7e6aab05e354adb26b8d8703232a8e31b..4552ad1bd0bf0bb904152a24492f1850d3967ae7 100644
--- a/civicrm/CRM/Profile/Page/Listings.php
+++ b/civicrm/CRM/Profile/Page/Listings.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php b/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
index d50543595cd163488e5840a38e0f33fed10bec7e..9bff1a8a159a3b717756e4234a3960aa17d47557 100644
--- a/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
+++ b/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Profile/Page/Router.php b/civicrm/CRM/Profile/Page/Router.php
index 8dfd9bcf31673a6e761a9454a9afcbf884ea9299..8e118868cfdf0a9561827a86af083e20fdd6c95a 100644
--- a/civicrm/CRM/Profile/Page/Router.php
+++ b/civicrm/CRM/Profile/Page/Router.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Profile/Page/View.php b/civicrm/CRM/Profile/Page/View.php
index 3212e0d692b9bb0159c737c89984e6483f495633..9224c2ab89f4949a9c5efc4d3a341448896d9674 100644
--- a/civicrm/CRM/Profile/Page/View.php
+++ b/civicrm/CRM/Profile/Page/View.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Profile/Selector/Listings.php b/civicrm/CRM/Profile/Selector/Listings.php
index 3be2a7801d2669dffee8dcdcab976bb6e51cf5b7..a116bd02eefabb4984c0ca652bbdec7d960b7daf 100644
--- a/civicrm/CRM/Profile/Selector/Listings.php
+++ b/civicrm/CRM/Profile/Selector/Listings.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/BAO/QueueItem.php b/civicrm/CRM/Queue/BAO/QueueItem.php
index 03cdc0df7d792a56cf9aa0214418e82f7d6b5606..b3fd715dac48b970096792adf5a72bdc47a2d878 100644
--- a/civicrm/CRM/Queue/BAO/QueueItem.php
+++ b/civicrm/CRM/Queue/BAO/QueueItem.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/ErrorPolicy.php b/civicrm/CRM/Queue/ErrorPolicy.php
index e5e5ace1ea35d6055d0551951d33f6d123927d80..606dcc3cab9dd715fff621e0db4d9585c85e9b96 100644
--- a/civicrm/CRM/Queue/ErrorPolicy.php
+++ b/civicrm/CRM/Queue/ErrorPolicy.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/Menu.php b/civicrm/CRM/Queue/Menu.php
index db57c88c25c8a5aedeaf891a34da2f9f44de1e9c..980cfe74f7b15cd94d386b6f31a44698f6ac7506 100644
--- a/civicrm/CRM/Queue/Menu.php
+++ b/civicrm/CRM/Queue/Menu.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/Page/AJAX.php b/civicrm/CRM/Queue/Page/AJAX.php
index 1998b0c6d68179c72cffa4383a23a51056124655..96413b15f8651d549ed36470dab0877ae854f3e8 100644
--- a/civicrm/CRM/Queue/Page/AJAX.php
+++ b/civicrm/CRM/Queue/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/Page/Runner.php b/civicrm/CRM/Queue/Page/Runner.php
index 616cbbbf716dcc99442abbc672607832c59074c8..ab507c52ee81c9105b843f1e5dc99c9129a3f089 100644
--- a/civicrm/CRM/Queue/Page/Runner.php
+++ b/civicrm/CRM/Queue/Page/Runner.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/Queue.php b/civicrm/CRM/Queue/Queue.php
index 116a3b52ef28052a6fad1ac791da839995d7ac4b..ef971b534f7c8524e5a29e70657dee59fa76ba6f 100644
--- a/civicrm/CRM/Queue/Queue.php
+++ b/civicrm/CRM/Queue/Queue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/Queue/Memory.php b/civicrm/CRM/Queue/Queue/Memory.php
index ce487eeadbd63ec6681c253594633c29c11fbb06..14d8107ab18dfa45a0aabaa9dce879ac130f1722 100644
--- a/civicrm/CRM/Queue/Queue/Memory.php
+++ b/civicrm/CRM/Queue/Queue/Memory.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/Queue/Sql.php b/civicrm/CRM/Queue/Queue/Sql.php
index 331e42e72048f74e08a398c51e9d03c628f1f4ba..914c6608d34e80a54eb34cda9809854e7bf0ae45 100644
--- a/civicrm/CRM/Queue/Queue/Sql.php
+++ b/civicrm/CRM/Queue/Queue/Sql.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/Runner.php b/civicrm/CRM/Queue/Runner.php
index cd246fa448dd3548640c8bf9895e289bf185ff6a..b19ab39dad680a04267051bc4e215e179b02f5f1 100644
--- a/civicrm/CRM/Queue/Runner.php
+++ b/civicrm/CRM/Queue/Runner.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/Service.php b/civicrm/CRM/Queue/Service.php
index 04fa6b8ff407f8cc1c8081f69fc4322f31bf6410..93fe0dcfdbd58956fe0c109ff03c14e0284aacb5 100644
--- a/civicrm/CRM/Queue/Service.php
+++ b/civicrm/CRM/Queue/Service.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/Task.php b/civicrm/CRM/Queue/Task.php
index 527cf7cc2531ddf714c0ba08e3f5f621556bc356..71be6086d4cf053900c6c9fe8af504cd549ee2c3 100644
--- a/civicrm/CRM/Queue/Task.php
+++ b/civicrm/CRM/Queue/Task.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Queue/TaskContext.php b/civicrm/CRM/Queue/TaskContext.php
index 4d3114e50125838e431d6671c237d3de3a31b457..74ecbe2a5837c6ac49a8d0fbedf7316ed691e289 100644
--- a/civicrm/CRM/Queue/TaskContext.php
+++ b/civicrm/CRM/Queue/TaskContext.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/BAO/Hook.php b/civicrm/CRM/Report/BAO/Hook.php
index a49123a32ba80f69b05360eb03d1455ab338a7e3..95c0a9c7a490b64eaaaf17c5199f1decdb8ef578 100644
--- a/civicrm/CRM/Report/BAO/Hook.php
+++ b/civicrm/CRM/Report/BAO/Hook.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/BAO/HookInterface.php b/civicrm/CRM/Report/BAO/HookInterface.php
index 6bc730b5439f46a74075abc0e3914908a67150e9..c7d546054d0bf635527845823220457f5a2469ef 100644
--- a/civicrm/CRM/Report/BAO/HookInterface.php
+++ b/civicrm/CRM/Report/BAO/HookInterface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/BAO/ReportInstance.php b/civicrm/CRM/Report/BAO/ReportInstance.php
index 6e382e3b3c6897ea7d229ecace785855bb64df9c..0b254ee73cb239b696ff3f0aeb6fd57d2fff7402 100644
--- a/civicrm/CRM/Report/BAO/ReportInstance.php
+++ b/civicrm/CRM/Report/BAO/ReportInstance.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form.php b/civicrm/CRM/Report/Form.php
index 7d323eba387e52034878b668e26b6961033dddfc..672593d8e4941f7fc78976a8f28f33c8f2f1465b 100644
--- a/civicrm/CRM/Report/Form.php
+++ b/civicrm/CRM/Report/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -203,6 +203,10 @@ class CRM_Report_Form extends CRM_Core_Form {
*/
protected $addPaging = TRUE;
+ protected $isForceGroupBy = FALSE;
+
+ protected $groupConcatTested = FALSE;
+
/**
* An attribute for checkbox/radio form field layout
*
@@ -462,6 +466,18 @@ class CRM_Report_Form extends CRM_Core_Form {
protected $sql;
+ /**
+ * An instruction not to add a Group By.
+ *
+ * This is relevant where the group by might be otherwise added after the code that determines the group by array.
+ *
+ * e.g. where stat fields are being added but other settings cause it to not be desirable to add a group by
+ * such as in pivot charts when no row header is set
+ *
+ * @var bool
+ */
+ protected $noGroupBy = FALSE;
+
/**
* SQL being run in this report as an array.
*
@@ -471,6 +487,12 @@ class CRM_Report_Form extends CRM_Core_Form {
*/
protected $sqlArray;
+
+ /**
+ * Can this report use the sql mode ONLY_FULL_GROUP_BY.
+ * @var bool
+ */
+ public $optimisedForOnlyFullGroupBy = TRUE;
/**
* Class constructor.
*/
@@ -762,6 +784,10 @@ class CRM_Report_Form extends CRM_Core_Form {
$this->_columns[$tableName][$fieldGrp][$fieldName]['name'] = $name;
}
+ if (!isset($this->_columns[$tableName][$fieldGrp][$fieldName]['table_name'])) {
+ $this->_columns[$tableName][$fieldGrp][$fieldName]['table_name'] = $tableName;
+ }
+
// set dbAlias = alias.name, unless already set
if (!isset($this->_columns[$tableName][$fieldGrp][$fieldName]['dbAlias'])) {
$this->_columns[$tableName][$fieldGrp][$fieldName]['dbAlias']
@@ -817,6 +843,9 @@ class CRM_Report_Form extends CRM_Core_Form {
if (!isset($this->_columns[$tableName]['metadata'][$fieldName])) {
$this->_columns[$tableName]['metadata'][$fieldName] = $this->_columns[$tableName][$fieldGrp][$fieldName];
}
+ else {
+ $this->_columns[$tableName]['metadata'][$fieldName] = array_merge($this->_columns[$tableName][$fieldGrp][$fieldName], $this->_columns[$tableName]['metadata'][$fieldName]);
+ }
}
}
}
@@ -2036,6 +2065,8 @@ class CRM_Report_Form extends CRM_Core_Form {
/**
* Get values for from and to for date ranges.
*
+ * @deprecated
+ *
* @param bool $relative
* @param string $from
* @param string $to
@@ -2046,19 +2077,12 @@ class CRM_Report_Form extends CRM_Core_Form {
*/
public function getFromTo($relative, $from, $to, $fromTime = NULL, $toTime = NULL) {
if (empty($toTime)) {
+ // odd legacy behaviour to treat NULL as 'end of the day'
+ // recommend updating reports to call CRM_Utils_Date::getFromTo
+ //directly (default on the function is the actual default there).
$toTime = '235959';
}
- //FIX ME not working for relative
- if ($relative) {
- list($term, $unit) = CRM_Utils_System::explode('.', $relative, 2);
- $dateRange = CRM_Utils_Date::relativeToAbsolute($term, $unit);
- $from = substr($dateRange['from'], 0, 8);
- //Take only Date Part, Sometime Time part is also present in 'to'
- $to = substr($dateRange['to'], 0, 8);
- }
- $from = CRM_Utils_Date::processDate($from, $fromTime);
- $to = CRM_Utils_Date::processDate($to, $toTime);
- return array($from, $to);
+ return CRM_Utils_Date::getFromTo($relative, $from, $to, $fromTime, $toTime);
}
/**
@@ -2258,6 +2282,42 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
// process grand-total row
$this->grandTotal($rows);
+ // Find alter display functions.
+ $firstRow = reset($rows);
+ if ($firstRow) {
+ $selectedFields = array_keys($firstRow);
+ $alterFunctions = $alterMap = $alterSpecs = array();
+ foreach ($this->_columns as $tableName => $table) {
+ if (array_key_exists('metadata', $table)) {
+ foreach ($table['metadata'] as $field => $specs) {
+ if (in_array($tableName . '_' . $field, $selectedFields)) {
+ if (array_key_exists('alter_display', $specs)) {
+ $alterFunctions[$tableName . '_' . $field] = $specs['alter_display'];
+ $alterMap[$tableName . '_' . $field] = $field;
+ $alterSpecs[$tableName . '_' . $field] = NULL;
+ }
+ // Add any alters that can be intuited from the field specs.
+ // So far only boolean but a lot more could be.
+ if (empty($alterSpecs[$tableName . '_' . $field]) && isset($specs['type']) && $specs['type'] == CRM_Utils_Type::T_BOOLEAN) {
+ $alterFunctions[$tableName . '_' . $field] = 'alterBoolean';
+ $alterMap[$tableName . '_' . $field] = $field;
+ $alterSpecs[$tableName . '_' . $field] = NULL;
+ }
+ }
+ }
+ }
+ }
+
+ // Run the alter display functions
+ foreach ($rows as $index => & $row) {
+ foreach ($row as $selectedField => $value) {
+ if (array_key_exists($selectedField, $alterFunctions)) {
+ $rows[$index][$selectedField] = $this->{$alterFunctions[$selectedField]}($value, $row, $selectedField, $alterMap[$selectedField], $alterSpecs[$selectedField]);
+ }
+ }
+ }
+ }
+
// use this method for formatting rows for display purpose.
$this->alterDisplay($rows);
CRM_Utils_Hook::alterReportVar('rows', $rows, $this);
@@ -2266,6 +2326,120 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
$this->alterCustomDataDisplay($rows);
}
+ /**
+ * @param $value
+ * @param $row
+ * @param $selectedfield
+ * @param $criteriaFieldName
+ *
+ * @return array
+ */
+ protected function alterStateProvinceID($value, &$row, $selectedfield, $criteriaFieldName) {
+ $url = CRM_Utils_System::url(CRM_Utils_System::currentPath(), "reset=1&force=1&{$criteriaFieldName}_op=in&{$criteriaFieldName}_value={$value}", $this->_absoluteUrl);
+ $row[$selectedfield . '_link'] = $url;
+ $row[$selectedfield . '_hover'] = ts("%1 for this state.", array(
+ 1 => $value,
+ ));
+
+ $states = CRM_Core_PseudoConstant::stateProvince($value, FALSE);
+ if (!is_array($states)) {
+ return $states;
+ }
+ }
+
+ /**
+ * @param $value
+ * @param $row
+ * @param $selectedField
+ * @param $criteriaFieldName
+ *
+ * @return array
+ */
+ protected function alterCountryID($value, &$row, $selectedField, $criteriaFieldName) {
+ $url = CRM_Utils_System::url(CRM_Utils_System::currentPath(), "reset=1&force=1&{$criteriaFieldName}_op=in&{$criteriaFieldName}_value={$value}", $this->_absoluteUrl);
+ $row[$selectedField . '_link'] = $url;
+ $row[$selectedField . '_hover'] = ts("%1 for this country.", array(
+ 1 => $value,
+ ));
+ $countries = CRM_Core_PseudoConstant::country($value, FALSE);
+ if (!is_array($countries)) {
+ return $countries;
+ }
+ }
+
+ /**
+ * @param $value
+ * @param $row
+ * @param $selectedfield
+ * @param $criteriaFieldName
+ *
+ * @return array
+ */
+ protected function alterCountyID($value, &$row, $selectedfield, $criteriaFieldName) {
+ $url = CRM_Utils_System::url(CRM_Utils_System::currentPath(), "reset=1&force=1&{$criteriaFieldName}_op=in&{$criteriaFieldName}_value={$value}", $this->_absoluteUrl);
+ $row[$selectedfield . '_link'] = $url;
+ $row[$selectedfield . '_hover'] = ts("%1 for this county.", array(
+ 1 => $value,
+ ));
+ $counties = CRM_Core_PseudoConstant::county($value, FALSE);
+ if (!is_array($counties)) {
+ return $counties;
+ }
+ }
+
+ /**
+ * @param $value
+ * @param $row
+ * @param $selectedfield
+ * @param $criteriaFieldName
+ *
+ * @return mixed
+ */
+ protected function alterLocationTypeID($value, &$row, $selectedfield, $criteriaFieldName) {
+ $values = $this->getLocationTypeOptions();
+ return CRM_Utils_Array::value($value, $values);
+ }
+
+ /**
+ * @param $value
+ * @param $row
+ * @param $fieldname
+ *
+ * @return mixed
+ */
+ protected function alterContactID($value, &$row, $fieldname) {
+ $nameField = substr($fieldname, 0, -2) . 'name';
+ static $first = TRUE;
+ static $viewContactList = FALSE;
+ if ($first) {
+ $viewContactList = CRM_Core_Permission::check('access CiviCRM');
+ $first = FALSE;
+ }
+ if (!$viewContactList) {
+ return $value;
+ }
+ if (array_key_exists($nameField, $row)) {
+ $row[$nameField . '_link'] = CRM_Utils_System::url("civicrm/contact/view", 'reset=1&cid=' . $value, $this->_absoluteUrl);
+ }
+ else {
+ $row[$fieldname . '_link'] = CRM_Utils_System::url("civicrm/contact/view", 'reset=1&cid=' . $value, $this->_absoluteUrl);
+ }
+ return $value;
+ }
+
+ /**
+ * @param $value
+ *
+ * @return mixed
+ */
+ protected function alterBoolean($value) {
+ $options = array(0 => ts('No'), 1 => ts('Yes'));
+ if (isset($options[$value])) {
+ return $options[$value];
+ }
+ return $value;
+ }
+
/**
* Build chart.
*
@@ -2319,7 +2493,14 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
$select = $this->addStatisticsToSelect($field, $tableName, $fieldName, $select);
}
else {
- $select = $this->addBasicFieldToSelect($tableName, $fieldName, $field, $select);
+
+ $selectClause = $this->getSelectClauseWithGroupConcatIfNotGroupedBy($tableName, $fieldName, $field);
+ if ($selectClause) {
+ $select[] = $selectClause;
+ }
+ else {
+ $select = $this->addBasicFieldToSelect($tableName, $fieldName, $field, $select);
+ }
}
}
}
@@ -2420,6 +2601,14 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
* @return bool
*/
public function selectClause(&$tableName, $tableKey, &$fieldName, &$field) {
+ if (!empty($field['pseudofield'])) {
+ $alias = "{$tableName}_{$fieldName}";
+ $this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = CRM_Utils_Array::value('title', $field);
+ $this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] = CRM_Utils_Array::value('type', $field);
+ $this->_columnHeaders["{$tableName}_{$fieldName}"]['dbAlias'] = CRM_Utils_Array::value('dbAlias', $field);
+ $this->_selectAliases[] = $alias;
+ return ' 1 as ' . $alias;
+ }
return FALSE;
}
@@ -2629,10 +2818,12 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
$this->groupBy();
$this->orderBy();
- // order_by columns not selected for display need to be included in SELECT
- $unselectedSectionColumns = $this->unselectedSectionColumns();
- foreach ($unselectedSectionColumns as $alias => $section) {
- $this->_select .= ", {$section['dbAlias']} as {$alias}";
+ foreach ($this->unselectedOrderByColumns() as $alias => $field) {
+ $clause = $this->getSelectClauseWithGroupConcatIfNotGroupedBy($field['table_name'], $field['name'], $field);
+ if (!$clause) {
+ $clause = "{$field['dbAlias']} as {$alias}";
+ }
+ $this->_select .= ", $clause ";
}
if ($applyLimit && empty($this->_params['charts'])) {
@@ -2712,7 +2903,16 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
if (!empty($orderByField)) {
$this->_orderByFields[$orderByField['tplField']] = $orderByField;
- $orderBys[] = "{$orderByField['dbAlias']} {$orderBy['order']}";
+ if ($this->groupConcatTested) {
+ $orderBys[$orderByField['tplField']] = "{$orderByField['tplField']} {$orderBy['order']}";
+ }
+ else {
+ // Not sure when this is preferable to using tplField (which has
+ // definitely been tested to work in cases then this does not.
+ // in caution not switching unless report has been tested for
+ // group concat functionality.
+ $orderBys[$orderByField['tplField']] = "{$orderByField['dbAlias']} {$orderBy['order']}";
+ }
// Record any section headers for assignment to the template
if (!empty($orderBy['section'])) {
@@ -2728,6 +2928,15 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
$this->assign('sections', $this->_sections);
}
+ /**
+ * Determine unselected columns.
+ *
+ * @return array
+ */
+ public function unselectedOrderByColumns() {
+ return array_diff_key($this->_orderByFields, $this->getSelectColumns());
+ }
+
/**
* Determine unselected columns.
*
@@ -2749,6 +2958,9 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
* @param array $rows
*/
public function buildRows($sql, &$rows) {
+ if (!$this->optimisedForOnlyFullGroupBy) {
+ CRM_Core_DAO::disableFullGroupByMode();
+ }
$dao = CRM_Core_DAO::executeQuery($sql);
if (stristr($this->_select, 'SQL_CALC_FOUND_ROWS')) {
$this->_rowsFound = CRM_Core_DAO::singleValueQuery('SELECT FOUND_ROWS()');
@@ -4484,33 +4696,6 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
return $fields;
}
- /**
- * Get address columns to add to array.
- *
- * @param array $options
- * - prefix Prefix to add to table (in case of more than one instance of the table)
- * - prefix_label Label to give columns from this address table instance
- *
- * @return array
- * address columns definition
- */
- public function getAddressColumns($options = array()) {
- $options += array(
- 'prefix' => '',
- 'prefix_label' => '',
- 'group_by' => TRUE,
- 'order_by' => TRUE,
- 'filters' => TRUE,
- 'defaults' => array(),
- );
- return $this->addAddressFields(
- $options['group_by'],
- $options['order_by'],
- $options['filters'],
- $options['defaults']
- );
- }
-
/**
* Get a standard set of contact fields.
*
@@ -5220,6 +5405,182 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
return $this->buildColumns($spec, $options['prefix'] . 'civicrm_contact', 'CRM_Contact_DAO_Contact', $tableAlias, $this->getDefaultsFromOptions($options), $options);
}
+ /**
+ * Get address columns to add to array.
+ *
+ * @param array $options
+ * - prefix Prefix to add to table (in case of more than one instance of the table)
+ * - prefix_label Label to give columns from this address table instance
+ * - group_bys enable these fields for group by - default false
+ * - order_bys enable these fields for order by
+ * - filters enable these fields for filtering
+ *
+ * @return array address columns definition
+ */
+ protected function getAddressColumns($options = array()) {
+ $defaultOptions = array(
+ 'prefix' => '',
+ 'prefix_label' => '',
+ 'fields' => TRUE,
+ 'group_bys' => FALSE,
+ 'order_bys' => TRUE,
+ 'filters' => TRUE,
+ 'join_filters' => FALSE,
+ 'fields_defaults' => array(),
+ 'filters_defaults' => array(),
+ 'group_bys_defaults' => array(),
+ 'order_bys_defaults' => array(),
+ );
+
+ $options = array_merge($defaultOptions, $options);
+ $defaults = $this->getDefaultsFromOptions($options);
+ $tableAlias = $options['prefix'] . 'address';
+
+ $spec = array(
+ $options['prefix'] . 'name' => array(
+ 'title' => ts($options['prefix_label'] . 'Address Name'),
+ 'name' => 'name',
+ 'is_fields' => TRUE,
+ ),
+ $options['prefix'] . 'street_number' => array(
+ 'name' => 'street_number',
+ 'title' => ts($options['prefix_label'] . 'Street Number'),
+ 'type' => 1,
+ 'is_fields' => TRUE,
+ ),
+ $options['prefix'] . 'street_name' => array(
+ 'name' => 'street_name',
+ 'title' => ts($options['prefix_label'] . 'Street Name'),
+ 'type' => 1,
+ 'is_fields' => TRUE,
+ 'is_filters' => TRUE,
+ 'operator' => 'like',
+ 'is_order_bys' => TRUE,
+ ),
+ $options['prefix'] . 'street_address' => array(
+ 'title' => ts($options['prefix_label'] . 'Street Address'),
+ 'name' => 'street_address',
+ 'is_fields' => TRUE,
+ 'is_filters' => TRUE,
+ 'is_group_bys' => TRUE,
+ ),
+ $options['prefix'] . 'supplemental_address_1' => array(
+ 'title' => ts($options['prefix_label'] . 'Supplementary Address Field 1'),
+ 'name' => 'supplemental_address_1',
+ 'is_fields' => TRUE,
+ ),
+ $options['prefix'] . 'supplemental_address_2' => array(
+ 'title' => ts($options['prefix_label'] . 'Supplementary Address Field 2'),
+ 'name' => 'supplemental_address_2',
+ 'is_fields' => TRUE,
+ ),
+ $options['prefix'] . 'supplemental_address_3' => array(
+ 'title' => ts($options['prefix_label'] . 'Supplementary Address Field 3'),
+ 'name' => 'supplemental_address_3',
+ 'is_fields' => TRUE,
+ ),
+ $options['prefix'] . 'street_number' => array(
+ 'name' => 'street_number',
+ 'title' => ts($options['prefix_label'] . 'Street Number'),
+ 'type' => 1,
+ 'is_order_bys' => TRUE,
+ 'is_filters' => TRUE,
+ 'is_fields' => TRUE,
+ ),
+ $options['prefix'] . 'street_name' => array(
+ 'name' => 'street_name',
+ 'title' => ts($options['prefix_label'] . 'Street Name'),
+ 'type' => 1,
+ 'is_fields' => TRUE,
+ ),
+ $options['prefix'] . 'street_unit' => array(
+ 'name' => 'street_unit',
+ 'title' => ts($options['prefix_label'] . 'Street Unit'),
+ 'type' => 1,
+ 'is_fields' => TRUE,
+ ),
+ $options['prefix'] . 'city' => array(
+ 'title' => ts($options['prefix_label'] . 'City'),
+ 'name' => 'city',
+ 'operator' => 'like',
+ 'is_fields' => TRUE,
+ 'is_filters' => TRUE,
+ 'is_group_bys' => TRUE,
+ 'is_order_bys' => TRUE,
+ ),
+ $options['prefix'] . 'postal_code' => array(
+ 'title' => ts($options['prefix_label'] . 'Postal Code'),
+ 'name' => 'postal_code',
+ 'type' => 1,
+ 'is_fields' => TRUE,
+ 'is_filters' => TRUE,
+ 'is_group_bys' => TRUE,
+ 'is_order_bys' => TRUE,
+ ),
+ $options['prefix'] . 'postal_code_suffix' => array(
+ 'title' => ts($options['prefix_label'] . 'Postal Code Suffix'),
+ 'name' => 'postal_code',
+ 'type' => 1,
+ 'is_fields' => TRUE,
+ 'is_filters' => TRUE,
+ 'is_group_bys' => TRUE,
+ 'is_order_bys' => TRUE,
+ ),
+ $options['prefix'] . 'county_id' => array(
+ 'title' => ts($options['prefix_label'] . 'County'),
+ 'alter_display' => 'alterCountyID',
+ 'name' => 'county_id',
+ 'type' => CRM_Utils_Type::T_INT,
+ 'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+ 'options' => CRM_Core_PseudoConstant::county(),
+ 'is_fields' => TRUE,
+ 'is_filters' => TRUE,
+ 'is_group_bys' => TRUE,
+ ),
+ $options['prefix'] . 'state_province_id' => array(
+ 'title' => ts($options['prefix_label'] . 'State/Province'),
+ 'alter_display' => 'alterStateProvinceID',
+ 'name' => 'state_province_id',
+ 'type' => CRM_Utils_Type::T_INT,
+ 'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+ 'options' => CRM_Core_PseudoConstant::stateProvince(),
+ 'is_fields' => TRUE,
+ 'is_filters' => TRUE,
+ 'is_group_bys' => TRUE,
+ ),
+ $options['prefix'] . 'country_id' => array(
+ 'title' => ts($options['prefix_label'] . 'Country'),
+ 'alter_display' => 'alterCountryID',
+ 'name' => 'country_id',
+ 'is_fields' => TRUE,
+ 'is_filters' => TRUE,
+ 'is_group_bys' => TRUE,
+ 'type' => CRM_Utils_Type::T_INT,
+ 'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+ 'options' => CRM_Core_PseudoConstant::country(),
+ ),
+ $options['prefix'] . 'location_type_id' => array(
+ 'name' => 'is_primary',
+ 'title' => ts($options['prefix_label'] . 'Location Type'),
+ 'type' => CRM_Utils_Type::T_INT,
+ 'is_fields' => TRUE,
+ 'alter_display' => 'alterLocationTypeID',
+ ),
+ $options['prefix'] . 'id' => array(
+ 'title' => ts($options['prefix_label'] . 'ID'),
+ 'name' => 'id',
+ 'is_fields' => TRUE,
+ ),
+ $options['prefix'] . 'is_primary' => array(
+ 'name' => 'is_primary',
+ 'title' => ts($options['prefix_label'] . 'Primary Address?'),
+ 'type' => CRM_Utils_Type::T_BOOLEAN,
+ 'is_fields' => TRUE,
+ ),
+ );
+ return $this->buildColumns($spec, $options['prefix'] . 'civicrm_address', 'CRM_Core_DAO_Address', $tableAlias, $defaults, $options);
+ }
+
/**
* Build the columns.
*
@@ -5353,4 +5714,31 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
return $defaults;
}
+ /**
+ * Get the select clause for a field, wrapping in GROUP_CONCAT if appropriate.
+ *
+ * Full group by mode dictates that a field must either be in the group by function or
+ * wrapped in a aggregate function. Here we wrap the field in GROUP_CONCAT if it is not in the
+ * group concat.
+ *
+ * @param string $tableName
+ * @param string $fieldName
+ * @param string $field
+ * @return string
+ */
+ protected function getSelectClauseWithGroupConcatIfNotGroupedBy($tableName, &$fieldName, &$field) {
+ if ($this->groupConcatTested && (!empty($this->_groupByArray) || $this->isForceGroupBy)) {
+ if ((empty($field['statistics']) || in_array('GROUP_CONCAT', $field['statistics']))) {
+ $label = CRM_Utils_Array::value('title', $field);
+ $alias = "{$tableName}_{$fieldName}";
+ $this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = $label;
+ $this->_selectAliases[] = $alias;
+ if (empty($this->_groupByArray[$tableName . '_' . $fieldName])) {
+ return "GROUP_CONCAT(DISTINCT {$field['dbAlias']}) as $alias";
+ }
+ return "({$field['dbAlias']}) as $alias";
+ }
+ }
+ }
+
}
diff --git a/civicrm/CRM/Report/Form/Activity.php b/civicrm/CRM/Report/Form/Activity.php
index 8532ae97171b70143cbe544022e502e871ac9af7..9f2680e06f614151b6bafb447fcbddeb7ed745be 100644
--- a/civicrm/CRM/Report/Form/Activity.php
+++ b/civicrm/CRM/Report/Form/Activity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/ActivitySummary.php b/civicrm/CRM/Report/Form/ActivitySummary.php
index 29960096afe151200e63b90485acd99fc3f0ac79..f394734d06f50ff8437bfa3730beeafd652ce8d3 100644
--- a/civicrm/CRM/Report/Form/ActivitySummary.php
+++ b/civicrm/CRM/Report/Form/ActivitySummary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Campaign/SurveyDetails.php b/civicrm/CRM/Report/Form/Campaign/SurveyDetails.php
index 1f43b85dd30458d011261c7562754323a4666eb5..52dcba984830eed0c32bccc15510843f4651f1f6 100644
--- a/civicrm/CRM/Report/Form/Campaign/SurveyDetails.php
+++ b/civicrm/CRM/Report/Form/Campaign/SurveyDetails.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Case/Demographics.php b/civicrm/CRM/Report/Form/Case/Demographics.php
index b015af1e13924ba6d1485e679504a7c74c635b20..8349f909ad7e0052baae7bb24db5f1210b01635d 100644
--- a/civicrm/CRM/Report/Form/Case/Demographics.php
+++ b/civicrm/CRM/Report/Form/Case/Demographics.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Case/Detail.php b/civicrm/CRM/Report/Form/Case/Detail.php
index 8b846131639486fbd2a44fb480d55e2befe3c461..34572e2da5b0e7709ad6ea7d74b36913844147e9 100644
--- a/civicrm/CRM/Report/Form/Case/Detail.php
+++ b/civicrm/CRM/Report/Form/Case/Detail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Case/Summary.php b/civicrm/CRM/Report/Form/Case/Summary.php
index f15117f9fc3aa3f73e17d4b4a5a0201a7ac0d2dc..51d632e27514ca2edadb0e5db82d53e49cd55783 100644
--- a/civicrm/CRM/Report/Form/Case/Summary.php
+++ b/civicrm/CRM/Report/Form/Case/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Case/TimeSpent.php b/civicrm/CRM/Report/Form/Case/TimeSpent.php
index 3766329482676bceb86413f4e4582de80d2f1217..a7d610b989ca12e561560a897484c0984aa663dc 100644
--- a/civicrm/CRM/Report/Form/Case/TimeSpent.php
+++ b/civicrm/CRM/Report/Form/Case/TimeSpent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contact/CurrentEmployer.php b/civicrm/CRM/Report/Form/Contact/CurrentEmployer.php
index ab75475c3db65e8306ba7d3eac43d992421ab0b0..aef934e7fa2770eadc95b060fd254a5f9ba39a8c 100644
--- a/civicrm/CRM/Report/Form/Contact/CurrentEmployer.php
+++ b/civicrm/CRM/Report/Form/Contact/CurrentEmployer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contact/Detail.php b/civicrm/CRM/Report/Form/Contact/Detail.php
index c16977d5c7841045f9b3e42f7b4c525b054affc7..238bffa09b8cc7af6039c23b45d7335ce0571d81 100644
--- a/civicrm/CRM/Report/Form/Contact/Detail.php
+++ b/civicrm/CRM/Report/Form/Contact/Detail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contact/Log.php b/civicrm/CRM/Report/Form/Contact/Log.php
index 4a60d96b86f22c9d00771b1727c0f299ed715a14..aad48a4ccfd8b12cbce4010b0b7614a9ec8ecafa 100644
--- a/civicrm/CRM/Report/Form/Contact/Log.php
+++ b/civicrm/CRM/Report/Form/Contact/Log.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contact/LoggingDetail.php b/civicrm/CRM/Report/Form/Contact/LoggingDetail.php
index 3b3d9ffdc75670de33af27e9b89d16ebf3461839..4645fe76aa94ca2c0fab7a61805fb49763ed69d5 100644
--- a/civicrm/CRM/Report/Form/Contact/LoggingDetail.php
+++ b/civicrm/CRM/Report/Form/Contact/LoggingDetail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contact/LoggingSummary.php b/civicrm/CRM/Report/Form/Contact/LoggingSummary.php
index 07e42abfa54843edd4ccc217bb14464b3329e75b..857c767bb25efdf514a389f50413cd2aa7f51747 100644
--- a/civicrm/CRM/Report/Form/Contact/LoggingSummary.php
+++ b/civicrm/CRM/Report/Form/Contact/LoggingSummary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -352,4 +352,11 @@ LEFT JOIN civicrm_contact altered_by_contact_civireport
return $row;
}
+ /**
+ * Calculate section totals.
+ *
+ * Override to do nothing as this does not work / make sense on this report.
+ */
+ public function sectionTotals() {}
+
}
diff --git a/civicrm/CRM/Report/Form/Contact/Relationship.php b/civicrm/CRM/Report/Form/Contact/Relationship.php
index 000b073f55f3bda4d94341887fbfed976336a4e2..dd20fba0ea833491e8b6f716e4cff44bbba8f041 100644
--- a/civicrm/CRM/Report/Form/Contact/Relationship.php
+++ b/civicrm/CRM/Report/Form/Contact/Relationship.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -590,10 +590,10 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form {
$isStatusFilter = FALSE;
$relStatus = NULL;
if (CRM_Utils_Array::value('is_active_value', $this->_params) == '1') {
- $relStatus = 'Is equal to Active';
+ $relStatus = ts('Is equal to Active');
}
elseif (CRM_Utils_Array::value('is_active_value', $this->_params) == '0') {
- $relStatus = 'Is equal to Inactive';
+ $relStatus = ts('Is equal to Inactive');
}
if (!empty($statistics['filters'])) {
foreach ($statistics['filters'] as $id => $value) {
diff --git a/civicrm/CRM/Report/Form/Contact/Summary.php b/civicrm/CRM/Report/Form/Contact/Summary.php
index 706d992981e52f120090e9a79d064a5a987d5f4f..66d187c1abdcf5456627ca9d48698e2a63725220 100644
--- a/civicrm/CRM/Report/Form/Contact/Summary.php
+++ b/civicrm/CRM/Report/Form/Contact/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -131,7 +131,7 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form {
),
'grouping' => 'contact-fields',
),
- ) + $this->getAddressColumns(array('group_by' => FALSE));
+ ) + $this->getAddressColumns(array('group_bys' => FALSE));
$this->_groupFilter = TRUE;
$this->_tagFilter = TRUE;
@@ -142,29 +142,6 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form {
parent::preProcess();
}
- public function select() {
- $select = array();
- $this->_columnHeaders = array();
- foreach ($this->_columns as $tableName => $table) {
- if (array_key_exists('fields', $table)) {
- foreach ($table['fields'] as $fieldName => $field) {
- if (!empty($field['required']) ||
- !empty($this->_params['fields'][$fieldName])
- ) {
-
- $alias = "{$tableName}_{$fieldName}";
- $select[] = "{$field['dbAlias']} as {$alias}";
- $this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] = CRM_Utils_Array::value('type', $field);
- $this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = $field['title'];
- $this->_selectAliases[] = $alias;
- }
- }
- }
- }
-
- $this->_select = "SELECT " . implode(', ', $select) . " ";
- }
-
/**
* @param $fields
* @param $files
@@ -179,10 +156,8 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form {
public function from() {
$this->_from = "
- FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
- LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
- ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
- {$this->_aliases['civicrm_address']}.is_primary = 1 ) ";
+ FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom} ";
+ $this->joinAddressFromContact();
$this->joinPhoneFromContact();
$this->joinEmailFromContact();
$this->joinCountryFromAddress();
@@ -232,20 +207,6 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form {
$entryFound = TRUE;
}
- if (array_key_exists('civicrm_address_state_province_id', $row)) {
- if ($value = $row['civicrm_address_state_province_id']) {
- $rows[$rowNum]['civicrm_address_state_province_id'] = CRM_Core_PseudoConstant::stateProvince($value, FALSE);
- }
- $entryFound = TRUE;
- }
-
- if (array_key_exists('civicrm_address_country_id', $row)) {
- if ($value = $row['civicrm_address_country_id']) {
- $rows[$rowNum]['civicrm_address_country_id'] = CRM_Core_PseudoConstant::country($value, FALSE);
- }
- $entryFound = TRUE;
- }
-
// Handle ID to label conversion for contact fields
$entryFound = $this->alterDisplayContactFields($row, $rows, $rowNum, 'contact/summary', 'View Contact Summary') ? TRUE : $entryFound;
diff --git a/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php b/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php
index 0280a6ee0c9eec1789479e7c7a932dccfe1df67c..088e2d730e85975ef1e7305e83e25915982953e4 100644
--- a/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -291,9 +291,12 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
'default' => TRUE,
),
'invoice_id' => array(
- 'title' => ts('Invoice ID'),
+ 'title' => ts('Invoice Reference'),
'default' => TRUE,
),
+ 'invoice_number' => array(
+ 'title' => ts('Invoice Number'),
+ ),
'contribution_status_id' => array(
'title' => ts('Contribution Status'),
'default' => TRUE,
diff --git a/civicrm/CRM/Report/Form/Contribute/DeferredRevenue.php b/civicrm/CRM/Report/Form/Contribute/DeferredRevenue.php
index 1e06f6d9aa3c967a8e2fc8effd7aa0b269164c33..45c30b6c6dad775d4fd24c5f6c9822262fdbe1bd 100644
--- a/civicrm/CRM/Report/Form/Contribute/DeferredRevenue.php
+++ b/civicrm/CRM/Report/Form/Contribute/DeferredRevenue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contribute/Detail.php b/civicrm/CRM/Report/Form/Contribute/Detail.php
index b64e45f58a5369d6f2d22e569e24affe512c891e..8ce9d48a69f21fa6f6dd239ce4d206108c25312f 100644
--- a/civicrm/CRM/Report/Form/Contribute/Detail.php
+++ b/civicrm/CRM/Report/Form/Contribute/Detail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -44,6 +44,8 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
'Contribution',
);
+ protected $groupConcatTested = TRUE;
+
/**
* This report has been optimised for group filtering.
*
@@ -221,6 +223,13 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
'payment_instrument_id' => array('title' => ts('Payment Method')),
'receive_date' => array('title' => ts('Date Received')),
),
+ 'group_bys' => array(
+ 'contribution_id' => array(
+ 'name' => 'id',
+ 'required' => TRUE,
+ 'title' => ts('Contribution'),
+ ),
+ ),
'grouping' => 'contri-fields',
),
'civicrm_contribution_soft' => array(
@@ -243,7 +252,6 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
'fields' => array(
'card_type_id' => array(
'title' => ts('Credit Card Type'),
- 'dbAlias' => 'GROUP_CONCAT(financial_trxn_civireport.card_type_id SEPARATOR ",")',
),
),
'filters' => array(
@@ -332,30 +340,6 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
parent::__construct();
}
- public function preProcess() {
- parent::preProcess();
- }
-
- public function select() {
- $this->_columnHeaders = array();
-
- parent::select();
- }
-
- public function orderBy() {
- parent::orderBy();
-
- // please note this will just add the order-by columns to select query, and not display in column-headers.
- // This is a solution to not throw fatal errors when there is a column in order-by, not present in select/display columns.
- foreach ($this->_orderByFields as $orderBy) {
- if (!array_key_exists($orderBy['name'], $this->_params['fields']) &&
- empty($orderBy['section']) && (strpos($this->_select, $orderBy['dbAlias']) === FALSE)
- ) {
- $this->_select .= ", {$orderBy['dbAlias']} as {$orderBy['tplField']}";
- }
- }
- }
-
/**
* Set the FROM clause for the report.
*/
@@ -381,11 +365,6 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
$this->appendAdditionalFromJoins();
}
- public function groupBy() {
- $groupBy = array("{$this->_aliases['civicrm_contact']}.id", "{$this->_aliases['civicrm_contribution']}.id");
- $this->_groupBy = CRM_Contact_BAO_Query::getGroupByFromSelectColumns($this->_selectClauses, $groupBy);
- }
-
/**
* @param $rows
*
@@ -584,34 +563,9 @@ UNION ALL
$this->addToDeveloperTab($sql);
CRM_Core_DAO::executeQuery($sql);
- // 5. Re-construct order-by to make sense for final query on temp3 table
- $orderBy = '';
- if (!empty($this->_orderByArray)) {
- $aliases = array_flip($this->_aliases);
- $orderClause = array();
- foreach ($this->_orderByArray as $clause) {
- list($alias, $rest) = explode('.', $clause);
- // CRM-17280 -- In case, we are ordering by custom fields
- // modify $rest to match the alias used for them in temp3 table
- $grp = new CRM_Core_DAO_CustomGroup();
- $grp->table_name = $aliases[$alias];
- if ($grp->find()) {
- list($fld, $order) = explode(' ', $rest);
- foreach ($this->_columns[$aliases[$alias]]['fields'] as $fldName => $value) {
- if ($value['name'] == $fld) {
- $fld = $fldName;
- }
- }
- $rest = "{$fld} {$order}";
- }
- $orderClause[] = $aliases[$alias] . "_" . $rest;
- }
- $orderBy = (!empty($orderClause)) ? "ORDER BY " . implode(', ', $orderClause) : '';
- }
-
// 6. show result set from temp table 3
$rows = array();
- $sql = "SELECT * FROM civireport_contribution_detail_temp3 {$orderBy}";
+ $sql = "SELECT * FROM civireport_contribution_detail_temp3 $this->_orderBy";
$this->buildRows($sql, $rows);
// format result set.
diff --git a/civicrm/CRM/Report/Form/Contribute/History.php b/civicrm/CRM/Report/Form/Contribute/History.php
index 9764c84bd0199347661b758db636ae33560dde05..117ece48366bc7606b11834112bc1dd3aaed0f96 100644
--- a/civicrm/CRM/Report/Form/Contribute/History.php
+++ b/civicrm/CRM/Report/Form/Contribute/History.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contribute/HouseholdSummary.php b/civicrm/CRM/Report/Form/Contribute/HouseholdSummary.php
index cb0225bf5d9abad7dab31ba9ac6185b70f9781f8..17f425fbc80b547c78fd8044ce1f38f3016aa6d2 100644
--- a/civicrm/CRM/Report/Form/Contribute/HouseholdSummary.php
+++ b/civicrm/CRM/Report/Form/Contribute/HouseholdSummary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contribute/Lybunt.php b/civicrm/CRM/Report/Form/Contribute/Lybunt.php
index 9b040c3b50af6c7b2298004dbf9b099f4dc6e495..0fb7f093a5d8ec4e0e09cb1981322d15687e3ad7 100644
--- a/civicrm/CRM/Report/Form/Contribute/Lybunt.php
+++ b/civicrm/CRM/Report/Form/Contribute/Lybunt.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -77,6 +77,7 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form {
* Class constructor.
*/
public function __construct() {
+ $this->optimisedForOnlyFullGroupBy = FALSE;
$this->_rollup = 'WITH ROLLUP';
$this->_autoIncludeIndexedFieldsAsOrderBys = 1;
$yearsInPast = 10;
diff --git a/civicrm/CRM/Report/Form/Contribute/OrganizationSummary.php b/civicrm/CRM/Report/Form/Contribute/OrganizationSummary.php
index e3565a80cb537471eb55f570b279c7f0e574d338..4532a39fd0bb73b9c5f8cf17fcf4b75e92129d7f 100644
--- a/civicrm/CRM/Report/Form/Contribute/OrganizationSummary.php
+++ b/civicrm/CRM/Report/Form/Contribute/OrganizationSummary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contribute/PCP.php b/civicrm/CRM/Report/Form/Contribute/PCP.php
index 4e4b683d32833d62edbe7c4fbca71aa846765400..d2246b38de704b87a446c03a31775f2810aff79f 100644
--- a/civicrm/CRM/Report/Form/Contribute/PCP.php
+++ b/civicrm/CRM/Report/Form/Contribute/PCP.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contribute/Recur.php b/civicrm/CRM/Report/Form/Contribute/Recur.php
index fd44c88bb87c296269f1e244fa44b6c7dceb849c..a5bd2f0f14907043ae7592c79c1dcf7ca729a511 100644
--- a/civicrm/CRM/Report/Form/Contribute/Recur.php
+++ b/civicrm/CRM/Report/Form/Contribute/Recur.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contribute/RecurSummary.php b/civicrm/CRM/Report/Form/Contribute/RecurSummary.php
index d6641be7cb87c0b39ba1504996dab4f55a819dd9..ea18650ebc158c3aa957aef74d569f1fb2209baa 100644
--- a/civicrm/CRM/Report/Form/Contribute/RecurSummary.php
+++ b/civicrm/CRM/Report/Form/Contribute/RecurSummary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contribute/Repeat.php b/civicrm/CRM/Report/Form/Contribute/Repeat.php
index 898b7914c6e5b62b247620896bd10edc1cfdaae5..6b87d4ebfdb642ed667fc67bdca04a3e33d410e3 100644
--- a/civicrm/CRM/Report/Form/Contribute/Repeat.php
+++ b/civicrm/CRM/Report/Form/Contribute/Repeat.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Contribute/SoftCredit.php b/civicrm/CRM/Report/Form/Contribute/SoftCredit.php
index b347fd9d1fe36f8baa8b15212f738d5c5e370dac..4bb31c9704bc4510ba0cff503f00a9a2d9ac0019 100644
--- a/civicrm/CRM/Report/Form/Contribute/SoftCredit.php
+++ b/civicrm/CRM/Report/Form/Contribute/SoftCredit.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -68,7 +68,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form {
/**
*/
public function __construct() {
-
+ $this->optimisedForOnlyFullGroupBy = FALSE;
// Check if CiviCampaign is a) enabled and b) has active campaigns
$config = CRM_Core_Config::singleton();
$campaignEnabled = in_array("CiviCampaign", $config->enableComponents);
diff --git a/civicrm/CRM/Report/Form/Contribute/Summary.php b/civicrm/CRM/Report/Form/Contribute/Summary.php
index 4cc74ef432dacaab7ee4847c238eac8368f4de46..2ef86cd5ceb26d690b3ba9a87fa97c446e22e0d2 100644
--- a/civicrm/CRM/Report/Form/Contribute/Summary.php
+++ b/civicrm/CRM/Report/Form/Contribute/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -856,7 +856,7 @@ ROUND(AVG({$this->_aliases['civicrm_contribution_soft']}.amount), 2) as civicrm_
// build the chart.
$config = CRM_Core_Config::Singleton();
$graphRows['xname'] = $this->_interval;
- $graphRows['yname'] = "Amount ({$config->defaultCurrency})";
+ $graphRows['yname'] = ts('Amount (%1)', array(1 => $config->defaultCurrency));
CRM_Utils_OpenFlashChart::chart($graphRows, $this->_params['charts'], $this->_interval);
$this->assign('chartType', $this->_params['charts']);
}
diff --git a/civicrm/CRM/Report/Form/Contribute/Sybunt.php b/civicrm/CRM/Report/Form/Contribute/Sybunt.php
index f5c3073464970cdeeb7745c5f4844f60fd6d9acc..120a4d80ce58c215fdeaa2481ce6fbf4f0d363b4 100644
--- a/civicrm/CRM/Report/Form/Contribute/Sybunt.php
+++ b/civicrm/CRM/Report/Form/Contribute/Sybunt.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -560,9 +560,9 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form {
$graphRows['value'] = $display;
$config = CRM_Core_Config::Singleton();
$chartInfo = array(
- 'legend' => 'Sybunt Report',
- 'xname' => 'Year',
- 'yname' => "Amount ({$config->defaultCurrency})",
+ 'legend' => ts('Sybunt Report'),
+ 'xname' => ts('Year'),
+ 'yname' => ts('Amount (%1)', array(1 => $config->defaultCurrency)),
);
if ($this->_params['charts']) {
// build the chart.
diff --git a/civicrm/CRM/Report/Form/Contribute/TopDonor.php b/civicrm/CRM/Report/Form/Contribute/TopDonor.php
index 36a97fe44800b82aa22bf9e335c0494d36cbebda..50d0a1e8f0be3f0b3f6b5956df82df9a19fcbfbb 100644
--- a/civicrm/CRM/Report/Form/Contribute/TopDonor.php
+++ b/civicrm/CRM/Report/Form/Contribute/TopDonor.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Event.php b/civicrm/CRM/Report/Form/Event.php
index 70518e8192ac8a3874799ab47468132f3dbc1784..00a143e9cde1eda52124bab4f8fd84e2aa18d5a6 100644
--- a/civicrm/CRM/Report/Form/Event.php
+++ b/civicrm/CRM/Report/Form/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Event/Income.php b/civicrm/CRM/Report/Form/Event/Income.php
index c61915a606cdf8c24eac7116602225fbb9717623..aa662f7fca98012b90262978cedc4dcdf5e2b273 100644
--- a/civicrm/CRM/Report/Form/Event/Income.php
+++ b/civicrm/CRM/Report/Form/Event/Income.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Event/IncomeCountSummary.php b/civicrm/CRM/Report/Form/Event/IncomeCountSummary.php
index 8a53052569e75636f9a090cc2b60d86d4b184a4c..0623207e8518ff5a11c6fae31ac756d8a1235e38 100644
--- a/civicrm/CRM/Report/Form/Event/IncomeCountSummary.php
+++ b/civicrm/CRM/Report/Form/Event/IncomeCountSummary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -386,16 +386,16 @@ class CRM_Report_Form_Event_IncomeCountSummary extends CRM_Report_Form_Event {
if ((!empty($rows)) && $countEvent != 1) {
$chartInfo = array(
- 'legend' => 'Participants Summary',
- 'xname' => 'Event',
- 'yname' => 'Total Participants',
+ 'legend' => ts('Participants Summary'),
+ 'xname' => ts('Event'),
+ 'yname' => ts('Total Participants'),
);
if (!empty($graphRows)) {
foreach ($graphRows[$this->_interval] as $key => $val) {
$graph[$val] = $graphRows['value'][$key];
}
$chartInfo['values'] = $graph;
- $chartInfo['tip'] = 'Participants : #val#';
+ $chartInfo['tip'] = ts('Participants : %1', array(1 => '#val#'));
$chartInfo['xLabelAngle'] = 20;
// build the chart.
diff --git a/civicrm/CRM/Report/Form/Event/ParticipantListCount.php b/civicrm/CRM/Report/Form/Event/ParticipantListCount.php
index bc15afc4996c4127b6c25a52b0eafda1685ea61b..f9df73f11c9c88a72d9d48b634e0ae31f4824016 100644
--- a/civicrm/CRM/Report/Form/Event/ParticipantListCount.php
+++ b/civicrm/CRM/Report/Form/Event/ParticipantListCount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Event/ParticipantListing.php b/civicrm/CRM/Report/Form/Event/ParticipantListing.php
index a5269d8807a68cdde80909055893be6018650f6d..29ee945c1d7a739b0e3511e68e106ff8c3bd5e61 100644
--- a/civicrm/CRM/Report/Form/Event/ParticipantListing.php
+++ b/civicrm/CRM/Report/Form/Event/ParticipantListing.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Event/Summary.php b/civicrm/CRM/Report/Form/Event/Summary.php
index 33f769af19be5f09cde2345bdcfe67f6a05e5e1a..c68a9e0d14f405a9613455e4ce6f903c09a1b976 100644
--- a/civicrm/CRM/Report/Form/Event/Summary.php
+++ b/civicrm/CRM/Report/Form/Event/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -356,9 +356,9 @@ class CRM_Report_Form_Event_Summary extends CRM_Report_Form_Event {
if ((!empty($rows)) && $countEvent != 1) {
$config = CRM_Core_Config::Singleton();
$chartInfo = array(
- 'legend' => 'Event Summary',
- 'xname' => 'Event',
- 'yname' => "Total Amount ({$config->defaultCurrency})",
+ 'legend' => ts('Event Summary'),
+ 'xname' => ts('Event'),
+ 'yname' => ts('Total Amount (%1)', array(1 => $config->defaultCurrency)),
);
if (!empty($graphRows)) {
foreach ($graphRows[$this->_interval] as $key => $val) {
diff --git a/civicrm/CRM/Report/Form/Extended.php b/civicrm/CRM/Report/Form/Extended.php
index 43792c7fbafbfd1c5a02531ef17ff5fdb5e2af9e..171fb271f3f84097c43c675f3baa661641c872ed 100644
--- a/civicrm/CRM/Report/Form/Extended.php
+++ b/civicrm/CRM/Report/Form/Extended.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Grant/Detail.php b/civicrm/CRM/Report/Form/Grant/Detail.php
index cf1563bef6d56f1e64bf1aadf11997378ea791d9..e52ee0966f893816ebd1a6868e3fc3e85c9ffe11 100644
--- a/civicrm/CRM/Report/Form/Grant/Detail.php
+++ b/civicrm/CRM/Report/Form/Grant/Detail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Grant/Statistics.php b/civicrm/CRM/Report/Form/Grant/Statistics.php
index b44f3b56489b079456e832380b77bc39288b9eaf..f46bfaa5fd7562e207e7bd0bb842786fd8f51415 100644
--- a/civicrm/CRM/Report/Form/Grant/Statistics.php
+++ b/civicrm/CRM/Report/Form/Grant/Statistics.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Instance.php b/civicrm/CRM/Report/Form/Instance.php
index c3de435dcb56d007fa257da62c3b8e82ce61206f..37cd4b590a993958dbd2275bfe3a6918f24d68f6 100644
--- a/civicrm/CRM/Report/Form/Instance.php
+++ b/civicrm/CRM/Report/Form/Instance.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Mailing/Bounce.php b/civicrm/CRM/Report/Form/Mailing/Bounce.php
index 9d438b72a2818eb2d27852ce7b0ee19e6a47fd04..1588b1796a9c0b7552d4e1a68b811fbdc9ec3b96 100644
--- a/civicrm/CRM/Report/Form/Mailing/Bounce.php
+++ b/civicrm/CRM/Report/Form/Mailing/Bounce.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -470,7 +470,7 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
// If the email address has been deleted
if (array_key_exists('civicrm_email_email', $row)) {
if (empty($rows[$rowNum]['civicrm_email_email'])) {
- $rows[$rowNum]['civicrm_email_email'] = '<del>Email address deleted</del>';
+ $rows[$rowNum]['civicrm_email_email'] = '<del>' . ts('Email address deleted.') . '</del>';
}
$entryFound = TRUE;
}
diff --git a/civicrm/CRM/Report/Form/Mailing/Clicks.php b/civicrm/CRM/Report/Form/Mailing/Clicks.php
index 4bfa795ac8dad1d854716ee602940f2aa12091d9..84cb8f1cf2b711f401c8238873597984cfedef24 100644
--- a/civicrm/CRM/Report/Form/Mailing/Clicks.php
+++ b/civicrm/CRM/Report/Form/Mailing/Clicks.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -369,7 +369,7 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form {
// If the email address has been deleted
if (array_key_exists('civicrm_email_email', $row)) {
if (empty($rows[$rowNum]['civicrm_email_email'])) {
- $rows[$rowNum]['civicrm_email_email'] = '<del>Email address deleted</del>';
+ $rows[$rowNum]['civicrm_email_email'] = '<del>' . ts('Email address deleted.') . '</del>';
}
$entryFound = TRUE;
}
diff --git a/civicrm/CRM/Report/Form/Mailing/Detail.php b/civicrm/CRM/Report/Form/Mailing/Detail.php
index 7a55a5c034ff342a38a8e0e210228ebdd1e0875f..1e1ffaa129c90b027b9981d636850e14c5c4eb18 100644
--- a/civicrm/CRM/Report/Form/Mailing/Detail.php
+++ b/civicrm/CRM/Report/Form/Mailing/Detail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -484,7 +484,7 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form {
// If the email address has been deleted
if (array_key_exists('civicrm_email_email', $row)) {
if (empty($rows[$rowNum]['civicrm_email_email'])) {
- $rows[$rowNum]['civicrm_email_email'] = '<del>Email address deleted</del>';
+ $rows[$rowNum]['civicrm_email_email'] = '<del>' . ts('Email address deleted.') . '</del>';
}
$entryFound = TRUE;
}
diff --git a/civicrm/CRM/Report/Form/Mailing/Opened.php b/civicrm/CRM/Report/Form/Mailing/Opened.php
index 5a48f9e56fda765f7a1bda883447ff8993721028..e893b75fc86adb05c710e6f314f830725e22658e 100644
--- a/civicrm/CRM/Report/Form/Mailing/Opened.php
+++ b/civicrm/CRM/Report/Form/Mailing/Opened.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -68,6 +68,7 @@ class CRM_Report_Form_Mailing_Opened extends CRM_Report_Form {
* Class constructor.
*/
public function __construct() {
+ $this->optimisedForOnlyFullGroupBy = FALSE;
$this->_columns = array();
$this->_columns['civicrm_contact'] = array(
diff --git a/civicrm/CRM/Report/Form/Mailing/Summary.php b/civicrm/CRM/Report/Form/Mailing/Summary.php
index edc50a7987c083951ea77dc761775837009b6228..7ff12e70dbe8a141b5127370f87a7ed50f1ed814 100644
--- a/civicrm/CRM/Report/Form/Mailing/Summary.php
+++ b/civicrm/CRM/Report/Form/Mailing/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Member/ContributionDetail.php b/civicrm/CRM/Report/Form/Member/ContributionDetail.php
index 0f8a0c01b907ccfa06ba4e7bc64c87427d92ee1e..db166f8165ff000a0eca005449f2cc378bc74a00 100644
--- a/civicrm/CRM/Report/Form/Member/ContributionDetail.php
+++ b/civicrm/CRM/Report/Form/Member/ContributionDetail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Member/Detail.php b/civicrm/CRM/Report/Form/Member/Detail.php
index 6afc920894eb15c45feaf7b1560cdb02ecc676a3..9430c6fb600b97c64f271ef4f151d65d1239aefe 100644
--- a/civicrm/CRM/Report/Form/Member/Detail.php
+++ b/civicrm/CRM/Report/Form/Member/Detail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Member/Lapse.php b/civicrm/CRM/Report/Form/Member/Lapse.php
index f354302a017f85adf2b2f4aec52e70ea079c866c..0b7dd45cf03b5f5da84d011db8230fbdbde76b0e 100644
--- a/civicrm/CRM/Report/Form/Member/Lapse.php
+++ b/civicrm/CRM/Report/Form/Member/Lapse.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Member/Summary.php b/civicrm/CRM/Report/Form/Member/Summary.php
index e72f15fd565e8a3d72f61c35612a5020c78a5360..7fab4c93a0e10340a944d230369303f75fb94cc6 100644
--- a/civicrm/CRM/Report/Form/Member/Summary.php
+++ b/civicrm/CRM/Report/Form/Member/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -526,9 +526,9 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency
if ($isMembershipType) {
$graphRows['value'] = $display;
$chartInfo = array(
- 'legend' => 'Membership Summary',
- 'xname' => 'Member Since / Member Type',
- 'yname' => 'Fees',
+ 'legend' => ts('Membership Summary'),
+ 'xname' => ts('Member Since / Member Type'),
+ 'yname' => ts('Fees'),
);
CRM_Utils_OpenFlashChart::reportChart($graphRows, $this->_params['charts'], $interval, $chartInfo);
}
diff --git a/civicrm/CRM/Report/Form/Membership/Summary.php b/civicrm/CRM/Report/Form/Membership/Summary.php
index ba497f4ff7f999b3fe7e37d08e891d401b286f82..daf03f9ff69db9b990095427d2f6ca4660ccb768 100644
--- a/civicrm/CRM/Report/Form/Membership/Summary.php
+++ b/civicrm/CRM/Report/Form/Membership/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Pledge/Detail.php b/civicrm/CRM/Report/Form/Pledge/Detail.php
index 7c2c1da2a56a794d671acb3639872274aa3bfb44..d6d77a7d29b5c469b8017cb5474fc30152aa40ae 100644
--- a/civicrm/CRM/Report/Form/Pledge/Detail.php
+++ b/civicrm/CRM/Report/Form/Pledge/Detail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Pledge/Pbnp.php b/civicrm/CRM/Report/Form/Pledge/Pbnp.php
index 01294d59c62836a9845b945187129f4388d69f41..6658257a278ba2b1fb99ca4c9977a7c1c34a6981 100644
--- a/civicrm/CRM/Report/Form/Pledge/Pbnp.php
+++ b/civicrm/CRM/Report/Form/Pledge/Pbnp.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Pledge/Summary.php b/civicrm/CRM/Report/Form/Pledge/Summary.php
index b5905c5c8dfe539e03ccc9843a907dd4b475de85..4aaee50e1effeefa712932948496646a79b7e6fd 100644
--- a/civicrm/CRM/Report/Form/Pledge/Summary.php
+++ b/civicrm/CRM/Report/Form/Pledge/Summary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Register.php b/civicrm/CRM/Report/Form/Register.php
index fcb84b1301b76398ed9f3ce5ea35397e04a2f02e..ac43b1bc9b50bd7130c55150e7c8a698455352eb 100644
--- a/civicrm/CRM/Report/Form/Register.php
+++ b/civicrm/CRM/Report/Form/Register.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Form/Walklist/Walklist.php b/civicrm/CRM/Report/Form/Walklist/Walklist.php
index 25e92d7027bbbe08a9330185c9c0ab688b98c107..04644112776594490706ef4fbf228d95b4c40c20 100644
--- a/civicrm/CRM/Report/Form/Walklist/Walklist.php
+++ b/civicrm/CRM/Report/Form/Walklist/Walklist.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Info.php b/civicrm/CRM/Report/Info.php
index 23cc9a837badf468fcc1c0174cb89ba709fb7500..83cc3bbbe5d5c4e14f20970ca94843a4bfdcb76b 100644
--- a/civicrm/CRM/Report/Info.php
+++ b/civicrm/CRM/Report/Info.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Interface.php b/civicrm/CRM/Report/Interface.php
index f86bd8013f77bf5a4eb624da7b293d7a29fccb33..ea55184f08b736356868b25d71c909a4162d5961 100644
--- a/civicrm/CRM/Report/Interface.php
+++ b/civicrm/CRM/Report/Interface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Page/Instance.php b/civicrm/CRM/Report/Page/Instance.php
index 9d210b2395e684aa6d900ff0f0bc755aa6a2fdfd..18108a4bb2dc7774e27228ae0562b2c04ca0d0b1 100644
--- a/civicrm/CRM/Report/Page/Instance.php
+++ b/civicrm/CRM/Report/Page/Instance.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Page/InstanceList.php b/civicrm/CRM/Report/Page/InstanceList.php
index fa858f34c6ba6d18bf675db3997091798430b4a7..8a7686d4f345b831bce8936b9300153bc26c701c 100644
--- a/civicrm/CRM/Report/Page/InstanceList.php
+++ b/civicrm/CRM/Report/Page/InstanceList.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Page/Options.php b/civicrm/CRM/Report/Page/Options.php
index cb48958ff496e1fef15d21e2b5e48e52f7d3718f..949e0236dc368afe0e481321114afbfef99dca2c 100644
--- a/civicrm/CRM/Report/Page/Options.php
+++ b/civicrm/CRM/Report/Page/Options.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Page/Report.php b/civicrm/CRM/Report/Page/Report.php
index 6c3255c1fa9bac6c690013deaced197182bdf916..395055d42cb30a06af78cd16ff0626ae941093ad 100644
--- a/civicrm/CRM/Report/Page/Report.php
+++ b/civicrm/CRM/Report/Page/Report.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Page/TemplateList.php b/civicrm/CRM/Report/Page/TemplateList.php
index 9ae552130aabf1f86220d5cb3076dcc1775374f4..3cff431c83ff063995a1b58f2894d41ca1afa968 100644
--- a/civicrm/CRM/Report/Page/TemplateList.php
+++ b/civicrm/CRM/Report/Page/TemplateList.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Utils/Get.php b/civicrm/CRM/Report/Utils/Get.php
index 146bb5266b2bbb6c0c26bfd44303aefe4adf1cfa..91c36515c571b43189d186a87e53ba0dcd20aa99 100644
--- a/civicrm/CRM/Report/Utils/Get.php
+++ b/civicrm/CRM/Report/Utils/Get.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Report/Utils/Report.php b/civicrm/CRM/Report/Utils/Report.php
index 74e1c6308ac2a4845d90680a7ff452e92d65ab4d..9bd425d709027e8f9718b4f38d0bae0cb6a2cc77 100644
--- a/civicrm/CRM/Report/Utils/Report.php
+++ b/civicrm/CRM/Report/Utils/Report.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/BAO/Provider.php b/civicrm/CRM/SMS/BAO/Provider.php
index 228196fa2098a65e5387f352850fa6d6796be004..15341c40560069567f00ab3ffe51326148b55453 100644
--- a/civicrm/CRM/SMS/BAO/Provider.php
+++ b/civicrm/CRM/SMS/BAO/Provider.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/Controller/Send.php b/civicrm/CRM/SMS/Controller/Send.php
index 9c7de6ce962fb0b664d01fa5d9a227128c21f410..51b0e4ac6fd91827dfaeb36e8838160ce26d7890 100644
--- a/civicrm/CRM/SMS/Controller/Send.php
+++ b/civicrm/CRM/SMS/Controller/Send.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/Form/Group.php b/civicrm/CRM/SMS/Form/Group.php
index fd0cd32a1eaf67a162504ede350e0b5eb14f3fd8..2e6816b7d4a8b1fd1763e84ab28bafa391c4fa5e 100644
--- a/civicrm/CRM/SMS/Form/Group.php
+++ b/civicrm/CRM/SMS/Form/Group.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/Form/Provider.php b/civicrm/CRM/SMS/Form/Provider.php
index 8fb3ffde3ba829917366351f5cdcc25d1fb8fb4c..c5496c2b5710da75bc83e1e47beefe1c013fcfb5 100644
--- a/civicrm/CRM/SMS/Form/Provider.php
+++ b/civicrm/CRM/SMS/Form/Provider.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/Form/Schedule.php b/civicrm/CRM/SMS/Form/Schedule.php
index a4635a7e8f14edaaceb75c49f0362057c71f88f0..64bf752d6f2958b60adb8c8412479211371c6ebb 100644
--- a/civicrm/CRM/SMS/Form/Schedule.php
+++ b/civicrm/CRM/SMS/Form/Schedule.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/Form/Upload.php b/civicrm/CRM/SMS/Form/Upload.php
index 8c8fd974f4dd2d3c015483c1dcca205df6c15999..f4924bb648bc2cc6ddc9dc737d3d8887a67543db 100644
--- a/civicrm/CRM/SMS/Form/Upload.php
+++ b/civicrm/CRM/SMS/Form/Upload.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/Message.php b/civicrm/CRM/SMS/Message.php
index 6892dde8723eb526b74192e58090fd8226d2d366..41c64c0f9f4aacbb205274b193abce34018cc3d2 100644
--- a/civicrm/CRM/SMS/Message.php
+++ b/civicrm/CRM/SMS/Message.php
@@ -2,7 +2,7 @@
/**
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/Page/Callback.php b/civicrm/CRM/SMS/Page/Callback.php
index 3d013263df7e07d4046da48615c681862016dd95..e6b5d16a43e7c7f2ecc8060687dc636d9aca98d3 100644
--- a/civicrm/CRM/SMS/Page/Callback.php
+++ b/civicrm/CRM/SMS/Page/Callback.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/Page/Provider.php b/civicrm/CRM/SMS/Page/Provider.php
index 61a47bdbca401ce9419f7385f32412f5cc000448..00cc2467b905ceab60d6a3e12130e580e4b23aaa 100644
--- a/civicrm/CRM/SMS/Page/Provider.php
+++ b/civicrm/CRM/SMS/Page/Provider.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/SMS/Provider.php b/civicrm/CRM/SMS/Provider.php
index 3ce50e90628052f176350420ade9854c8f8a8653..6b59be6f98a4cab31a58f9d6f25de8e31b495964 100644
--- a/civicrm/CRM/SMS/Provider.php
+++ b/civicrm/CRM/SMS/Provider.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -72,14 +72,18 @@ abstract class CRM_SMS_Provider {
if (!isset(self::$_singleton[$cacheKey]) || $force) {
$ext = CRM_Extension_System::singleton()->getMapper();
if ($ext->isExtensionKey($providerName)) {
- $paymentClass = $ext->keyToClass($providerName);
- require_once "{$paymentClass}.php";
+ $providerClass = $ext->keyToClass($providerName);
+ require_once "{$providerClass}.php";
}
else {
- CRM_Core_Error::fatal("Could not locate extension for {$providerName}.");
+ // If we are running unit tests we simulate an SMS provider with the name "CiviTestSMSProvider"
+ if ($providerName !== 'CiviTestSMSProvider') {
+ CRM_Core_Error::fatal("Could not locate extension for {$providerName}.");
+ }
+ $providerClass = 'CiviTestSMSProvider';
}
- self::$_singleton[$cacheKey] = $paymentClass::singleton($providerParams, $force);
+ self::$_singleton[$cacheKey] = $providerClass::singleton($providerParams, $force);
}
return self::$_singleton[$cacheKey];
}
@@ -158,12 +162,11 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1";
return FALSE;
}
- $activityTypeID = CRM_Core_OptionGroup::getValue('activity_type', 'SMS delivery', 'name');
// note: lets not pass status here, assuming status will be updated by callback
$activityParams = array(
'source_contact_id' => $sourceContactID,
'target_contact_id' => $headers['contact_id'],
- 'activity_type_id' => $activityTypeID,
+ 'activity_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'SMS delivery'),
'activity_date_time' => date('YmdHis'),
'details' => $message,
'result' => $apiMsgID,
@@ -186,7 +189,7 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1";
FALSE, $default, $location
);
if ($abort && $value === NULL) {
- CRM_Core_Error::debug_log_message("Could not find an entry for $name in $location");
+ Civi::log()->warning("Could not find an entry for $name in $location");
echo "Failure: Missing Parameter<p>";
exit();
}
@@ -259,16 +262,13 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1";
}
if ($message->fromContactID) {
- $actStatusIDs = array_flip(CRM_Core_OptionGroup::values('activity_status'));
- $activityTypeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Inbound SMS');
-
// note: lets not pass status here, assuming status will be updated by callback
$activityParams = array(
'source_contact_id' => $message->toContactID,
'target_contact_id' => $message->fromContactID,
- 'activity_type_id' => $activityTypeID,
+ 'activity_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Inbound SMS'),
'activity_date_time' => date('YmdHis'),
- 'status_id' => $actStatusIDs['Completed'],
+ 'status_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_status_id', 'Completed'),
'details' => $message->body,
'phone_number' => $message->from,
);
@@ -277,7 +277,7 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1";
}
$result = CRM_Activity_BAO_Activity::create($activityParams);
- CRM_Core_Error::debug_log_message("Inbound SMS recorded for cid={$message->fromContactID}.");
+ Civi::log()->info("Inbound SMS recorded for cid={$message->fromContactID}.");
return $result;
}
}
diff --git a/civicrm/CRM/SMS/StateMachine/Send.php b/civicrm/CRM/SMS/StateMachine/Send.php
index 87b625c7d0c10ec1eb6612211c0733c82b3089c8..d038fc3957ad103d9a76fed63c253b745d727f81 100644
--- a/civicrm/CRM/SMS/StateMachine/Send.php
+++ b/civicrm/CRM/SMS/StateMachine/Send.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Tag/Form/Edit.php b/civicrm/CRM/Tag/Form/Edit.php
index b7854eeb336d41f5fc9f76015c44a91c30c200f2..c5a7fa91dcc9c2a5572ff873b9da07e21aadcc85 100644
--- a/civicrm/CRM/Tag/Form/Edit.php
+++ b/civicrm/CRM/Tag/Form/Edit.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Tag/Form/Merge.php b/civicrm/CRM/Tag/Form/Merge.php
index 065c6576e5d5ccfb93c9897392e0e896cf33e872..b595455461a165a5056086298a97c0ee4d625b8d 100644
--- a/civicrm/CRM/Tag/Form/Merge.php
+++ b/civicrm/CRM/Tag/Form/Merge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Tag/Form/Tag.php b/civicrm/CRM/Tag/Form/Tag.php
index 209a0c12efa12277f869fac6651e7ca43e369630..ed75c7017c333f3f5d46d025ac6ac3069ec9a833 100644
--- a/civicrm/CRM/Tag/Form/Tag.php
+++ b/civicrm/CRM/Tag/Form/Tag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Tag/Page/Tag.php b/civicrm/CRM/Tag/Page/Tag.php
index d4534a30998f4d1e68ebaaee5201c6b90fc58243..48e845b99ba68573f97a0e8d00680a2056014f50 100644
--- a/civicrm/CRM/Tag/Page/Tag.php
+++ b/civicrm/CRM/Tag/Page/Tag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Form/AbstractPreview.php b/civicrm/CRM/UF/Form/AbstractPreview.php
index 26afc138a196498f85dc47412ec3183d5d89a6d7..80d1e0cee10f9a2f66ac9a2a6e7decf07f5ce5ac 100644
--- a/civicrm/CRM/UF/Form/AbstractPreview.php
+++ b/civicrm/CRM/UF/Form/AbstractPreview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Form/AdvanceSetting.php b/civicrm/CRM/UF/Form/AdvanceSetting.php
index 38f5824729ef1a8ba2c5ad9f229bc7d3594a9070..617940127f9838243cb041060a7634fb81d084d4 100644
--- a/civicrm/CRM/UF/Form/AdvanceSetting.php
+++ b/civicrm/CRM/UF/Form/AdvanceSetting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Form/Field.php b/civicrm/CRM/UF/Form/Field.php
index 11fd0d1ce7d093847d979435b96c43dc24a412b1..82c96c68032d4666ff195717958b5191a25d86c9 100644
--- a/civicrm/CRM/UF/Form/Field.php
+++ b/civicrm/CRM/UF/Form/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Form/Group.php b/civicrm/CRM/UF/Form/Group.php
index ae37ce6a634e31fad211ba90a54db865ca1154e6..9adc2485035fe0ff34bf0f0604e581e00ddf5ba7 100644
--- a/civicrm/CRM/UF/Form/Group.php
+++ b/civicrm/CRM/UF/Form/Group.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Form/Inline/Preview.php b/civicrm/CRM/UF/Form/Inline/Preview.php
index 1ceb32c51f898993108ad1162afa4418be1b99be..2caefabbdf3147d4c6a4fbfbd86572a66ce1fb8b 100644
--- a/civicrm/CRM/UF/Form/Inline/Preview.php
+++ b/civicrm/CRM/UF/Form/Inline/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Form/Inline/PreviewById.php b/civicrm/CRM/UF/Form/Inline/PreviewById.php
index 2d5b2602dc79bcf1bf6c63f858359f9f095257cd..88afab9fd951aa327935f2ba2aa742fc8f420f33 100644
--- a/civicrm/CRM/UF/Form/Inline/PreviewById.php
+++ b/civicrm/CRM/UF/Form/Inline/PreviewById.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Form/Preview.php b/civicrm/CRM/UF/Form/Preview.php
index dbebc602cdd83380eac6989c2ffb62fec9faec73..82107ef636704c23038555fca3b777dd14cb7e54 100644
--- a/civicrm/CRM/UF/Form/Preview.php
+++ b/civicrm/CRM/UF/Form/Preview.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Page/AJAX.php b/civicrm/CRM/UF/Page/AJAX.php
index 0fd38514438f619ac8d3f6feaa7a4481824b25f9..c3e35685c2e1195664c546d284c8bfb4421fe39d 100644
--- a/civicrm/CRM/UF/Page/AJAX.php
+++ b/civicrm/CRM/UF/Page/AJAX.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Page/Field.php b/civicrm/CRM/UF/Page/Field.php
index 5b773fa049bc6c276f44f07cc2b8d8c059bf84e2..690f6a3e25158bbcc9a5f08852a155f6dd7e5c3b 100644
--- a/civicrm/CRM/UF/Page/Field.php
+++ b/civicrm/CRM/UF/Page/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/UF/Page/Group.php b/civicrm/CRM/UF/Page/Group.php
index f123551d9fad5e05d64a737dcda549459754ba48..c737632a41042f42611b3b23ebd3b7ee28418d0c 100644
--- a/civicrm/CRM/UF/Page/Group.php
+++ b/civicrm/CRM/UF/Page/Group.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Controller.php b/civicrm/CRM/Upgrade/Controller.php
index 8381353fc89ddd560adb10e01df36649998b8164..2edeb5daf70958e34c0c5b5e6633e36a1529a632 100644
--- a/civicrm/CRM/Upgrade/Controller.php
+++ b/civicrm/CRM/Upgrade/Controller.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Form.php b/civicrm/CRM/Upgrade/Form.php
index c6a3cca9a96a6fadbf26723d9a490b93fdffb63d..b2b09f08f2a61e32c7c0726c311d8c98491e47c4 100644
--- a/civicrm/CRM/Upgrade/Form.php
+++ b/civicrm/CRM/Upgrade/Form.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Headless.php b/civicrm/CRM/Upgrade/Headless.php
index 363e1d0691054a872a635112fe152c1aa33a932c..1c0d4394aa0488106bbd4b81ac0464d731a3313b 100644
--- a/civicrm/CRM/Upgrade/Headless.php
+++ b/civicrm/CRM/Upgrade/Headless.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/Base.php b/civicrm/CRM/Upgrade/Incremental/Base.php
index 253fcbd284bf60512ac621169e9067d9ebc4293e..1cbf1cc3f57c23a3652ec220dce7550e209d0c36 100644
--- a/civicrm/CRM/Upgrade/Incremental/Base.php
+++ b/civicrm/CRM/Upgrade/Incremental/Base.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7.alpha1 |
+ | CiviCRM version 5 .alpha1 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/General.php b/civicrm/CRM/Upgrade/Incremental/General.php
index 132f902098ec39492d5c2bf7ad8a07c79ffcf9a8..9f0ebe39c922aebc2a7d378ce973dc5834924125 100644
--- a/civicrm/CRM/Upgrade/Incremental/General.php
+++ b/civicrm/CRM/Upgrade/Incremental/General.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveOne.php b/civicrm/CRM/Upgrade/Incremental/php/FiveOne.php
index cb3d6f92d8a29325b922b1dfc20d8c38e6790da2..d97a2b6233fbf32fadc0fca0d67fb1bf8dbcf660 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FiveOne.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FiveOne.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveTwo.php b/civicrm/CRM/Upgrade/Incremental/php/FiveTwo.php
new file mode 100644
index 0000000000000000000000000000000000000000..9d74ea2b2c9655ed70d6ee776f943bbb23f1fbeb
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/php/FiveTwo.php
@@ -0,0 +1,87 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5 |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2017 |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM. |
+ | |
+ | CiviCRM is free software; you can copy, modify, and distribute it |
+ | under the terms of the GNU Affero General Public License |
+ | Version 3, 19 November 2007. |
+ | |
+ | CiviCRM is distributed in the hope that it will be useful, but |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
+ | See the GNU Affero General Public License for more details. |
+ | |
+ | You should have received a copy of the GNU Affero General Public |
+ | License along with this program; if not, contact CiviCRM LLC |
+ | at info[AT]civicrm[DOT]org. If you have questions about the |
+ | GNU Affero General Public License or the licensing of CiviCRM, |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Upgrade logic for FiveTwo */
+class CRM_Upgrade_Incremental_php_FiveTwo extends CRM_Upgrade_Incremental_Base {
+
+ /**
+ * Compute any messages which should be displayed beforeupgrade.
+ *
+ * Note: This function is called iteratively for each upcoming
+ * revision to the database.
+ *
+ * @param string $preUpgradeMessage
+ * @param string $rev
+ * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'.
+ * @param null $currentVer
+ */
+ public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
+ // Example: Generate a pre-upgrade message.
+ // if ($rev == '5.12.34') {
+ // $preUpgradeMessage .= '<p>' . ts('A new permission has been added called %1 This Permission is now used to control access to the Manage Tags screen', array(1 => 'manage tags')) . '</p>';
+ // }
+ }
+
+ /**
+ * Compute any messages which should be displayed after upgrade.
+ *
+ * @param string $postUpgradeMessage
+ * alterable.
+ * @param string $rev
+ * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs.
+ */
+ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
+ // Example: Generate a post-upgrade message.
+ // if ($rev == '5.12.34') {
+ // $postUpgradeMessage .= '<br /><br />' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'.");
+ // }
+ }
+
+ /*
+ * Important! All upgrade functions MUST add a 'runSql' task.
+ * Uncomment and use the following template for a new upgrade version
+ * (change the x in the function name):
+ */
+
+ // /**
+ // * Upgrade function.
+ // *
+ // * @param string $rev
+ // */
+ // public function upgrade_5_0_x($rev) {
+ // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
+ // $this->addTask('Do the foo change', 'taskFoo', ...);
+ // // Additional tasks here...
+ // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex.
+ // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable.
+ // }
+
+ // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) {
+ // return TRUE;
+ // }
+
+}
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FiveZero.php b/civicrm/CRM/Upgrade/Incremental/php/FiveZero.php
index 96c4305d2f4ec5c01af285a522de61af5b21ae98..30551dd604b0884cb95776f77fea4871f7314cfe 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FiveZero.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FiveZero.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourFive.php b/civicrm/CRM/Upgrade/Incremental/php/FourFive.php
index 423d54ef7e24edb2a613ec5dfe2b738dfa287f53..a2d20a1b53e9fa3d7bfda873ddb4403eedb52d64 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourFive.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourFive.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourFour.php b/civicrm/CRM/Upgrade/Incremental/php/FourFour.php
index 7a093423135b057eed7fc5bda775318aa928c92a..0f3cd4084461593a0fbc2ef0488189234eb28836 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourFour.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php b/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php
index 609a2e4465dc79ec464b2b687a84d4004e1b7e59..0f667a7c919ff74bc03008beda9439e66db1ef98 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourSix.php b/civicrm/CRM/Upgrade/Incremental/php/FourSix.php
index 670f030321b32f9bad270f0810d630eac33f4067..87f1284b63b9aa00749a67a07a70661d59743250 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourSix.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourSix.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7.alpha1 |
+ | CiviCRM version 5 .alpha1 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourThree.php b/civicrm/CRM/Upgrade/Incremental/php/FourThree.php
index 2e5fe56eba488dac0b065f2956d1cb5d582c0188..e224cac48a71262f6f5981fc274f000182e38a14 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourThree.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourThree.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourTwo.php b/civicrm/CRM/Upgrade/Incremental/php/FourTwo.php
index 0ac37b31c78dff5d7fd624a4edec66543c2231d5..f7a7b1b8e6c0477b3844b791b2b6eaef871e8c1e 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourTwo.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourTwo.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/php/Template.php b/civicrm/CRM/Upgrade/Incremental/php/Template.php
index fcd9708f3fbf9262065dfc8f5883b78b713e2edc..7fe34e90de7d042d38704a458f6d16861f4cc44b 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/Template.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/Template.php
@@ -6,7 +6,7 @@ echo "<?php\n";
?>
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.1.2.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.1.2.mysql.tpl
deleted file mode 100644
index cd7e235ec3f60c93dd3a4a6ad2b8fa6023afde26..0000000000000000000000000000000000000000
--- a/civicrm/CRM/Upgrade/Incremental/sql/5.1.2.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.1.2 during upgrade *}
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.2.0.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.2.0.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..820372cd751d80852dccdf1d7861b5f9b6613f68
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.2.0.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.2.0 during upgrade *}
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.2.alpha1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.2.alpha1.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..4042e8e434c5e5beed05095e20f1ae7bc65d1381
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.2.alpha1.mysql.tpl
@@ -0,0 +1,10 @@
+{* file to handle db changes in 5.2.alpha1 during upgrade *}
+# CRM-19885 & https://lab.civicrm.org/dev/core/issues/36#note_3509
+UPDATE civicrm_action_schedule SET repetition_frequency_interval = 0 WHERE repetition_frequency_interval IS NULL;
+UPDATE civicrm_action_schedule SET start_action_offset = 0 WHERE start_action_offset IS NULL;
+UPDATE civicrm_action_schedule SET end_frequency_interval = 0 WHERE end_frequency_interval IS NULL;
+
+ALTER TABLE civicrm_action_schedule
+ALTER column repetition_frequency_interval SET DEFAULT 0,
+ALTER column start_action_offset SET DEFAULT 0,
+ALTER column end_frequency_interval SET DEFAULT 0;
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.2.beta1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.2.beta1.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..afee41fbb1a2010a9d5a2783789f84d015a438fa
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.2.beta1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.2.beta1 during upgrade *}
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/README.txt b/civicrm/CRM/Upgrade/Incremental/sql/README.txt
index b3f873e3f41358f409be579653d29d7d7eee4121..581f0486d483449e0f23fd47ef73f23987cddd3f 100644
--- a/civicrm/CRM/Upgrade/Incremental/sql/README.txt
+++ b/civicrm/CRM/Upgrade/Incremental/sql/README.txt
@@ -1,5 +1,5 @@
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Page/Cleanup.php b/civicrm/CRM/Upgrade/Page/Cleanup.php
index 10e428ddfd4d80121daebdd7e6a62dcdeb379d2a..592e0121267c6b88ba35fa2432e8ea8b4dc45210 100644
--- a/civicrm/CRM/Upgrade/Page/Cleanup.php
+++ b/civicrm/CRM/Upgrade/Page/Cleanup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Page/Upgrade.php b/civicrm/CRM/Upgrade/Page/Upgrade.php
index c867fccfe52dd4b19fbc10ee19c6aa2f516f7588..08057025e5fa5722dca21fbb95caa6b004e70e3c 100644
--- a/civicrm/CRM/Upgrade/Page/Upgrade.php
+++ b/civicrm/CRM/Upgrade/Page/Upgrade.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php
index 281c2fb60fa0571cda5aefa81b867e7de1d64437..0abb97f3a7a94a6ffb92fa35b20844517953da6a 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php
index 16f57e934d528f9a4cd53c2c31ac2d57095ab0f4..0bc631b35fdccc69dfecf55c7d1b771e4dfef7c9 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php
index 4295ceefdc3faf749d1a1d5f0e83333848f81511..6491a3f8ccd6686914c7fe5e014ae538bdfa3b00 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php
index c853fced28a339cc87715e4306c8815497dfde33..080524203a1c96e2892f63ec2c0d916aa22e2e4a 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php
index 6cdbbd54480875692e6ab06dc8d13aa2e884031c..8cf0bb8f4edc15ba8577c57a168a137fbb3e3e6b 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php
index a6592a4d43522c0d1bacba510c0dc37186dffb0b..26956bad8c5d255eee84f36edd986891c7e58a3d 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php
index ef3fe54f6f6c45461ca81098285027e1bcec3eb5..e347d41d07b34729a45f3bd7ab9709bb0b50d9b3 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php
index 739d8e3f30a825b3734674e78fcf28794cb0624e..4266e1c76f976d121092ae1f9c49ac9e58094d4c 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php
index 392ee3a8618c47c342bbc4f4529d28a5389e1858..0aa38656cc8ca237a1fdf8edb304a53923a787a7 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Upgrade/StateMachine.php b/civicrm/CRM/Upgrade/StateMachine.php
index 06a397cb862c50ff995f30b29af8a6c3172889f5..99b373c6017ec10213f61ea435d030e2261f560e 100644
--- a/civicrm/CRM/Upgrade/StateMachine.php
+++ b/civicrm/CRM/Upgrade/StateMachine.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/API/AbstractFieldCoder.php b/civicrm/CRM/Utils/API/AbstractFieldCoder.php
index 983331442fb3dfa1888e1e5dab8da91b86a2efe4..b2c843326e5ccccad58f8c67767e77af071d4b88 100644
--- a/civicrm/CRM/Utils/API/AbstractFieldCoder.php
+++ b/civicrm/CRM/Utils/API/AbstractFieldCoder.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/API/HTMLInputCoder.php b/civicrm/CRM/Utils/API/HTMLInputCoder.php
index 3f9d704023763fb3f7ee4429c02f0437f82df1ef..903b2fa5e58af46f3e19bd400d9c14c5e18c75eb 100644
--- a/civicrm/CRM/Utils/API/HTMLInputCoder.php
+++ b/civicrm/CRM/Utils/API/HTMLInputCoder.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/API/MatchOption.php b/civicrm/CRM/Utils/API/MatchOption.php
index 45288ebb4248f56dc1b0e6a042ec595f9ca4e2a6..eff8513172555c94d0ea19148f89c90340ccff09 100644
--- a/civicrm/CRM/Utils/API/MatchOption.php
+++ b/civicrm/CRM/Utils/API/MatchOption.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/API/NullOutputCoder.php b/civicrm/CRM/Utils/API/NullOutputCoder.php
index ba914fceab3affd34cc99591493fcdcfb2508511..9cfeb4533b2da3674e4fcfbdc2e5e3e5e8a437fa 100644
--- a/civicrm/CRM/Utils/API/NullOutputCoder.php
+++ b/civicrm/CRM/Utils/API/NullOutputCoder.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/API/ReloadOption.php b/civicrm/CRM/Utils/API/ReloadOption.php
index b4cd64679115966cddd18e9d8f7cddae6de6648c..eac04f8f524d27e393852aa878364e502b86d006 100644
--- a/civicrm/CRM/Utils/API/ReloadOption.php
+++ b/civicrm/CRM/Utils/API/ReloadOption.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Address.php b/civicrm/CRM/Utils/Address.php
index c5f8985aab4fc07e653d9db1b16c63d2a1ce9601..84ec2f8162ebc5b3092f3fd8e0332950a4c51f94 100644
--- a/civicrm/CRM/Utils/Address.php
+++ b/civicrm/CRM/Utils/Address.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Address/BatchUpdate.php b/civicrm/CRM/Utils/Address/BatchUpdate.php
index 98a45379b819ca9e37bfc21de2fc1b02500b4cb7..37b4b779910874c760c337248328045d7781679a 100644
--- a/civicrm/CRM/Utils/Address/BatchUpdate.php
+++ b/civicrm/CRM/Utils/Address/BatchUpdate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Address/USPS.php b/civicrm/CRM/Utils/Address/USPS.php
index 81041a95fa0501b7381beeea3b7342e8e8deb602..b82fe998bea4d1e8dca75d9682b9ffeab47d9f36 100644
--- a/civicrm/CRM/Utils/Address/USPS.php
+++ b/civicrm/CRM/Utils/Address/USPS.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Array.php b/civicrm/CRM/Utils/Array.php
index 42b355f3d07a31c21f74172369874ad1ed470941..089ab662052e60dc9ffdc2ddb499a3abb061fafb 100644
--- a/civicrm/CRM/Utils/Array.php
+++ b/civicrm/CRM/Utils/Array.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/AutoClean.php b/civicrm/CRM/Utils/AutoClean.php
index 1bca02869e1ec1b9fef5e33cb53e80882a14d8bb..c6cd890074f3c79e6eb4830b6dbbae367d4a49bb 100644
--- a/civicrm/CRM/Utils/AutoClean.php
+++ b/civicrm/CRM/Utils/AutoClean.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache.php b/civicrm/CRM/Utils/Cache.php
index 4c6cf0e38692d2aa6e578086bb459c96fafbda33..00a92888fc8b7eaec46a99a0e5508f9f6854e6c6 100644
--- a/civicrm/CRM/Utils/Cache.php
+++ b/civicrm/CRM/Utils/Cache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache/APCcache.php b/civicrm/CRM/Utils/Cache/APCcache.php
index 0f2ed74255f5caf59b18e7e0942251d8bdeb44fe..e696aa19c3d2cd884fe2f69fab52070918f9caf0 100644
--- a/civicrm/CRM/Utils/Cache/APCcache.php
+++ b/civicrm/CRM/Utils/Cache/APCcache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache/ArrayCache.php b/civicrm/CRM/Utils/Cache/ArrayCache.php
index 6bc0f2af5e4c99f4a3c6fb65da403d18027312cd..b2272fa1eb6c9879f5a195ccad2e2a5426a00291 100644
--- a/civicrm/CRM/Utils/Cache/ArrayCache.php
+++ b/civicrm/CRM/Utils/Cache/ArrayCache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache/Interface.php b/civicrm/CRM/Utils/Cache/Interface.php
index a0c958495ef58d706a84a4cd88ae3148f8e4a9d6..f11327cb59c730d4f85eaab883e8a1d5c027efcd 100644
--- a/civicrm/CRM/Utils/Cache/Interface.php
+++ b/civicrm/CRM/Utils/Cache/Interface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache/Memcache.php b/civicrm/CRM/Utils/Cache/Memcache.php
index bb6c7c80fef462852bd4224fd24e7ac860d94e0c..e7455bd498757afcbb9d9d538ae0d33b91293106 100644
--- a/civicrm/CRM/Utils/Cache/Memcache.php
+++ b/civicrm/CRM/Utils/Cache/Memcache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache/Memcached.php b/civicrm/CRM/Utils/Cache/Memcached.php
index b163aa5ce86f0a6f4f9464d84224d6aead951abf..e80b1af4b354cdae264b157fd1b0b31d30d71201 100644
--- a/civicrm/CRM/Utils/Cache/Memcached.php
+++ b/civicrm/CRM/Utils/Cache/Memcached.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache/NoCache.php b/civicrm/CRM/Utils/Cache/NoCache.php
index 3d619ef0383b674efe1c4fb7cc8faead9fd469da..66c6b74cff410ec6280e951843140dde66409bde 100644
--- a/civicrm/CRM/Utils/Cache/NoCache.php
+++ b/civicrm/CRM/Utils/Cache/NoCache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache/Redis.php b/civicrm/CRM/Utils/Cache/Redis.php
index 6a1bb482be20c9546dacdcae1e437ff7af188115..07279d530de987f039fc4f9e3e56a1f6c76bf04f 100644
--- a/civicrm/CRM/Utils/Cache/Redis.php
+++ b/civicrm/CRM/Utils/Cache/Redis.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache/SerializeCache.php b/civicrm/CRM/Utils/Cache/SerializeCache.php
index 32c50dc301405706dbaf8df3278169ed166a1e79..6164694c3e5cc5eb5263ce0dd08d4ed4801fc746 100644
--- a/civicrm/CRM/Utils/Cache/SerializeCache.php
+++ b/civicrm/CRM/Utils/Cache/SerializeCache.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Cache/SqlGroup.php b/civicrm/CRM/Utils/Cache/SqlGroup.php
index d556fe7917c0ac59e8c1bb3d503a204441e5ee1c..6f3f45f792743f727bab58ff670ecca6a40e8451 100644
--- a/civicrm/CRM/Utils/Cache/SqlGroup.php
+++ b/civicrm/CRM/Utils/Cache/SqlGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check.php b/civicrm/CRM/Utils/Check.php
index 71b93ece6bc9045c837d3fd6a534e9986217922e..24fd07062a1862571b4196ba3fa4306c81dda4bb 100644
--- a/civicrm/CRM/Utils/Check.php
+++ b/civicrm/CRM/Utils/Check.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component.php b/civicrm/CRM/Utils/Check/Component.php
index b14a991f87782659e59f3f4963d484bcda981238..1e5a881cde527f8a079197e6424b1401bd7a3c39 100644
--- a/civicrm/CRM/Utils/Check/Component.php
+++ b/civicrm/CRM/Utils/Check/Component.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component/Case.php b/civicrm/CRM/Utils/Check/Component/Case.php
index d9cd06a88066f478dc69128f6b0b5ae9bbf7a2ba..f5ca0c7be75408d866312dfefaf75b723c8d9864 100644
--- a/civicrm/CRM/Utils/Check/Component/Case.php
+++ b/civicrm/CRM/Utils/Check/Component/Case.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component/Env.php b/civicrm/CRM/Utils/Check/Component/Env.php
index 31b92afa3da6c11702b90ffe137ebcadf82b7c4d..db4e7194b9b749c7fa0ace9ad60df6d41a4938c4 100644
--- a/civicrm/CRM/Utils/Check/Component/Env.php
+++ b/civicrm/CRM/Utils/Check/Component/Env.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component/FinancialTypeAcls.php b/civicrm/CRM/Utils/Check/Component/FinancialTypeAcls.php
index e5a269043b943b6567bd81f3584e8d68803207a7..8d922967f0e34ac14d1747b09d6d7351a9c4dd90 100644
--- a/civicrm/CRM/Utils/Check/Component/FinancialTypeAcls.php
+++ b/civicrm/CRM/Utils/Check/Component/FinancialTypeAcls.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component/OptionGroups.php b/civicrm/CRM/Utils/Check/Component/OptionGroups.php
index ad5d1e635cb08ca40b7daecbca20da9f5e0515e0..91e88437eb53b8f5cf6035f629cfbf192241931a 100644
--- a/civicrm/CRM/Utils/Check/Component/OptionGroups.php
+++ b/civicrm/CRM/Utils/Check/Component/OptionGroups.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component/PriceFields.php b/civicrm/CRM/Utils/Check/Component/PriceFields.php
index ef4070a37a5774f8eadd2eb80a176323f9526d95..f2b9eb97156b30228e9d91333b0b0a0d61bd3cc2 100644
--- a/civicrm/CRM/Utils/Check/Component/PriceFields.php
+++ b/civicrm/CRM/Utils/Check/Component/PriceFields.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component/Schema.php b/civicrm/CRM/Utils/Check/Component/Schema.php
index 128b14159f5f9bf11d5c56e657123bbaa5ee8e0b..1340865a5bd7b0feb00628624c42ed4b03517ca8 100644
--- a/civicrm/CRM/Utils/Check/Component/Schema.php
+++ b/civicrm/CRM/Utils/Check/Component/Schema.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component/Security.php b/civicrm/CRM/Utils/Check/Component/Security.php
index 2bae2a87e8a25ad7b6a8b245c8fcb91f6efc7f4d..94bb65b2bbecb5accf715ef8219470e4d6f7ca49 100644
--- a/civicrm/CRM/Utils/Check/Component/Security.php
+++ b/civicrm/CRM/Utils/Check/Component/Security.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component/Source.php b/civicrm/CRM/Utils/Check/Component/Source.php
index 391d1b0eda7835e20ba6ae73d472d54a8191c3d3..0364965f99aafbb25169934c32453d9e7a1b9f92 100644
--- a/civicrm/CRM/Utils/Check/Component/Source.php
+++ b/civicrm/CRM/Utils/Check/Component/Source.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Component/Timestamps.php b/civicrm/CRM/Utils/Check/Component/Timestamps.php
index 01d27467333565fba3fcf7a3a0d4ff2c8f92dfdf..51589d87a89286f5edb299f06ffcb093fbe9d097 100644
--- a/civicrm/CRM/Utils/Check/Component/Timestamps.php
+++ b/civicrm/CRM/Utils/Check/Component/Timestamps.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Check/Message.php b/civicrm/CRM/Utils/Check/Message.php
index 916084ec82890ccb90e0cb0bc1eaaa3a0389146c..9dd18299fc58a24035d74a001d363fa10258190b 100644
--- a/civicrm/CRM/Utils/Check/Message.php
+++ b/civicrm/CRM/Utils/Check/Message.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Color.php b/civicrm/CRM/Utils/Color.php
index 15c4bcadacd62dbde7b5b49626e47f5bda325949..5d965dd342e6371c5a411c3ae76594c5d4a0a2ca 100644
--- a/civicrm/CRM/Utils/Color.php
+++ b/civicrm/CRM/Utils/Color.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/ConsoleTee.php b/civicrm/CRM/Utils/ConsoleTee.php
index fcac8fb3208c923df0333cfbe648628fddb1f8b7..1e1cce09319f121edd105a707ddc1009ebabdc53 100644
--- a/civicrm/CRM/Utils/ConsoleTee.php
+++ b/civicrm/CRM/Utils/ConsoleTee.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Constant.php b/civicrm/CRM/Utils/Constant.php
index 453dbae1cb4c8175f89052edd504915127f575f9..2d8efdbd15bacf770584e7f41179d56196e7a469 100644
--- a/civicrm/CRM/Utils/Constant.php
+++ b/civicrm/CRM/Utils/Constant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Crypt.php b/civicrm/CRM/Utils/Crypt.php
index f4db692f54a7b5c55777495afea46a684294b26b..e914eaa9ce7d5e36fe49d06224a9966be59e8871 100644
--- a/civicrm/CRM/Utils/Crypt.php
+++ b/civicrm/CRM/Utils/Crypt.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Date.php b/civicrm/CRM/Utils/Date.php
index 82977dfc6e3fcb12c722b666b1cdc56ab5f7ef38..5f7d7512ddaa3c10fbfe988098853d6b5a7077c7 100644
--- a/civicrm/CRM/Utils/Date.php
+++ b/civicrm/CRM/Utils/Date.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -791,26 +791,34 @@ class CRM_Utils_Date {
* Get start date and end from
* the given relative term and unit
*
- * @param date $relative
- * Eg: term.unit.
+ * @param string $relative Relative format in the format term.unit.
+ * Eg: previous.day
*
- * @param $from
- * @param $to
+ * @param string $from
+ * @param string $to
+ * @param string $fromTime
+ * @param string $toTime
*
* @return array
* start date, end date
*/
- public static function getFromTo($relative, $from, $to) {
+ public static function getFromTo($relative, $from, $to, $fromTime = NULL, $toTime = '235959') {
if ($relative) {
- list($term, $unit) = explode('.', $relative);
+ list($term, $unit) = explode('.', $relative, 2);
$dateRange = self::relativeToAbsolute($term, $unit);
- $from = $dateRange['from'];
- //Take only Date Part, Sometime Time part is also present in 'to'
+ $from = substr($dateRange['from'], 0, 8);
$to = substr($dateRange['to'], 0, 8);
+ // @todo fix relativeToAbsolute & add tests
+ // relativeToAbsolute returns 8 char date strings
+ // or 14 char date + time strings.
+ // We should use those. However, it turns out to be unreliable.
+ // e.g. this.week does NOT return 235959 for 'from'
+ // so our defaults are more reliable.
+ // Currently relativeToAbsolute only supports 'whole' days so that is ok
}
- $from = self::processDate($from);
- $to = self::processDate($to, '235959');
+ $from = self::processDate($from, $fromTime);
+ $to = self::processDate($to, $toTime);
return array($from, $to);
}
diff --git a/civicrm/CRM/Utils/DeprecatedUtils.php b/civicrm/CRM/Utils/DeprecatedUtils.php
index 2ff2231c547d901b24ea292d502076ea5365587e..34847cc9e218e0656717dbf4af70bffc8dc1de23 100644
--- a/civicrm/CRM/Utils/DeprecatedUtils.php
+++ b/civicrm/CRM/Utils/DeprecatedUtils.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/EnglishNumber.php b/civicrm/CRM/Utils/EnglishNumber.php
index 3673eceaf64a1d91c0892e799996d7bd349336aa..5854421836b41c8e5d68bbcc5fad3f3e08cdc71b 100644
--- a/civicrm/CRM/Utils/EnglishNumber.php
+++ b/civicrm/CRM/Utils/EnglishNumber.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/FakeObject.php b/civicrm/CRM/Utils/FakeObject.php
index 9c2d4f8bec9c5d54f14abcdded570cff0cd4d0d5..3c0d447bc10a3e874568b9b23cc0634e1f87cb9a 100644
--- a/civicrm/CRM/Utils/FakeObject.php
+++ b/civicrm/CRM/Utils/FakeObject.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/File.php b/civicrm/CRM/Utils/File.php
index 6c759d79257a6ba4cdd7fe4b7832b1f102ce1fd5..4403bc6e319999476fb19e192f6646d1e872fa68 100644
--- a/civicrm/CRM/Utils/File.php
+++ b/civicrm/CRM/Utils/File.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Geocode.php b/civicrm/CRM/Utils/Geocode.php
index c51e3b28840315e7893f5ed97ac63111e3978f0f..36d3a46bfa7fbd8d00cff2237a136bba8a35c149 100644
--- a/civicrm/CRM/Utils/Geocode.php
+++ b/civicrm/CRM/Utils/Geocode.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Geocode/Google.php b/civicrm/CRM/Utils/Geocode/Google.php
index 271fdac5e26ab98807c60712a77baaae7ab16d16..ba31ce7696a2749a4d19d401a1e0d9b999535c17 100644
--- a/civicrm/CRM/Utils/Geocode/Google.php
+++ b/civicrm/CRM/Utils/Geocode/Google.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/GeocodeProvider.php b/civicrm/CRM/Utils/GeocodeProvider.php
index 5cc66ce55cae10103d4f8615856c99c9d6028757..f87c8eac1150f8102a1136e4be7bbba8af49888d 100644
--- a/civicrm/CRM/Utils/GeocodeProvider.php
+++ b/civicrm/CRM/Utils/GeocodeProvider.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/GlobalStack.php b/civicrm/CRM/Utils/GlobalStack.php
index 365ebc03df2e3ebaab4695804a01bf42cc06cf2b..74590bbbf6d0f96ec88c3cf035a387d488e1a93e 100644
--- a/civicrm/CRM/Utils/GlobalStack.php
+++ b/civicrm/CRM/Utils/GlobalStack.php
@@ -1,6 +1,6 @@
<?php /*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook.php b/civicrm/CRM/Utils/Hook.php
index c6b99274fb118c6898e2fd999ff590d281b4050c..3f36511e47362ccb9faf96db7ccf77bc39daf2bb 100644
--- a/civicrm/CRM/Utils/Hook.php
+++ b/civicrm/CRM/Utils/Hook.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook/Backdrop.php b/civicrm/CRM/Utils/Hook/Backdrop.php
index e439e2f72508989d14faad6a21543a1d21e2fb68..204b3a722e076c11db195ed8f41605156b0fb4ac 100644
--- a/civicrm/CRM/Utils/Hook/Backdrop.php
+++ b/civicrm/CRM/Utils/Hook/Backdrop.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook/Drupal.php b/civicrm/CRM/Utils/Hook/Drupal.php
index fcdefd2023db29be048a24831380bbeac00af10f..f83a8fbbb21f6308e128269881d5ba59824a3a5c 100644
--- a/civicrm/CRM/Utils/Hook/Drupal.php
+++ b/civicrm/CRM/Utils/Hook/Drupal.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook/Drupal6.php b/civicrm/CRM/Utils/Hook/Drupal6.php
index 1ac57a19e6460f537b5dde742a4c1c2e8a3aabbd..ed9e9eb236340ed8b4c249705eda540d7cf44169 100644
--- a/civicrm/CRM/Utils/Hook/Drupal6.php
+++ b/civicrm/CRM/Utils/Hook/Drupal6.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook/Drupal8.php b/civicrm/CRM/Utils/Hook/Drupal8.php
index 0c505c16a0c4ba6e90a7a91959edf0139108bc8c..757ee8819a0da256fccdf2274074a9211319e0c3 100644
--- a/civicrm/CRM/Utils/Hook/Drupal8.php
+++ b/civicrm/CRM/Utils/Hook/Drupal8.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook/DrupalBase.php b/civicrm/CRM/Utils/Hook/DrupalBase.php
index aeee7a0566a479828fea9f4f8d341f856bcbdb6a..07288d507b4f11370c81e9d639ab88a98aad5580 100644
--- a/civicrm/CRM/Utils/Hook/DrupalBase.php
+++ b/civicrm/CRM/Utils/Hook/DrupalBase.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook/Joomla.php b/civicrm/CRM/Utils/Hook/Joomla.php
index 833c19effe01ca1422d7c5d8c3d5e65775d1c931..e80161de2590e54761c4b124c08ea49f485a4a2b 100644
--- a/civicrm/CRM/Utils/Hook/Joomla.php
+++ b/civicrm/CRM/Utils/Hook/Joomla.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook/Soap.php b/civicrm/CRM/Utils/Hook/Soap.php
index 3fc76004aa0345331accd12a2d921e308a504c5b..427f3f910d6a2d7c4c1792f81dfcbffb4b14b0d8 100644
--- a/civicrm/CRM/Utils/Hook/Soap.php
+++ b/civicrm/CRM/Utils/Hook/Soap.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook/UnitTests.php b/civicrm/CRM/Utils/Hook/UnitTests.php
index 420579af07a4bd416158788556695f03a890b8d3..72535b4aba39ec4ac2b244ecece74fffe8d0b3b3 100644
--- a/civicrm/CRM/Utils/Hook/UnitTests.php
+++ b/civicrm/CRM/Utils/Hook/UnitTests.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Hook/WordPress.php b/civicrm/CRM/Utils/Hook/WordPress.php
index 60d5415517c0a7dd8ba68edea4e9cee4cd71ef43..721af0518355bf4ea2182925e112a780543e5538 100644
--- a/civicrm/CRM/Utils/Hook/WordPress.php
+++ b/civicrm/CRM/Utils/Hook/WordPress.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Http.php b/civicrm/CRM/Utils/Http.php
index 5635600d2e81332b3ad06f82bec4172a7436da60..d5400a09233326e6e5f28cb5db4f9fdf32da8858 100644
--- a/civicrm/CRM/Utils/Http.php
+++ b/civicrm/CRM/Utils/Http.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/HttpClient.php b/civicrm/CRM/Utils/HttpClient.php
index e49600dac2c8e15a2f807843cc903b078e71c3d0..f9e115686c45d5c4e086015fe7fda04cc1151f3b 100644
--- a/civicrm/CRM/Utils/HttpClient.php
+++ b/civicrm/CRM/Utils/HttpClient.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/ICalendar.php b/civicrm/CRM/Utils/ICalendar.php
index b9a84c95e04b4b45f4ff2911d464e3a3924c5b92..bde84f2173db4db8f004e1d260c68da004d97bbf 100644
--- a/civicrm/CRM/Utils/ICalendar.php
+++ b/civicrm/CRM/Utils/ICalendar.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/JS.php b/civicrm/CRM/Utils/JS.php
index 11525c2ca54afbda4c5ba9dfe3eac184d4b09909..264c7dca1d8ad81d3c80c2afbb0acd6b824ce849 100644
--- a/civicrm/CRM/Utils/JS.php
+++ b/civicrm/CRM/Utils/JS.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/JSON.php b/civicrm/CRM/Utils/JSON.php
index 5cb9330e86746e4ff56551e9164ed95e648d2fa0..0b7f171a33dec97e3ec2ecd6ad92f50e81140e80 100644
--- a/civicrm/CRM/Utils/JSON.php
+++ b/civicrm/CRM/Utils/JSON.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Mail.php b/civicrm/CRM/Utils/Mail.php
index fc9eaf6287ac8e9f7cea308ec983fcf8ee79392d..bebd05169c5d21a3d796c64636940cb4bd03f8bd 100644
--- a/civicrm/CRM/Utils/Mail.php
+++ b/civicrm/CRM/Utils/Mail.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Mail/EmailProcessor.php b/civicrm/CRM/Utils/Mail/EmailProcessor.php
index fb8953ea9fb09865fb82bb0697f368cefdf67428..9a07d106fd3ea2290fb9def5dff29107815a31e1 100644
--- a/civicrm/CRM/Utils/Mail/EmailProcessor.php
+++ b/civicrm/CRM/Utils/Mail/EmailProcessor.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Mail/Incoming.php b/civicrm/CRM/Utils/Mail/Incoming.php
index 94832e2d5cc13c2169d440582ddad393e63501e1..36e7a2051829794c37dd5a619696cc30c620c846 100644
--- a/civicrm/CRM/Utils/Mail/Incoming.php
+++ b/civicrm/CRM/Utils/Mail/Incoming.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Migrate/Export.php b/civicrm/CRM/Utils/Migrate/Export.php
index e8e20764addd8b23e2319988c161f909fe1d3cf0..b3447a995ab0642ed7fce27ec2eda81e810688f7 100644
--- a/civicrm/CRM/Utils/Migrate/Export.php
+++ b/civicrm/CRM/Utils/Migrate/Export.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Migrate/ExportJSON.php b/civicrm/CRM/Utils/Migrate/ExportJSON.php
index 04f9ba641ef2b77528a45ec5ef1450627d66b0ad..94f19c079f00d2dcc61fb5ccee275cfc8609894e 100644
--- a/civicrm/CRM/Utils/Migrate/ExportJSON.php
+++ b/civicrm/CRM/Utils/Migrate/ExportJSON.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Migrate/Import.php b/civicrm/CRM/Utils/Migrate/Import.php
index 8a9cf99e74f8d0bdd0fc8d4868afb9ead7cac9d1..e4124fc92b5398fe223f8d6aceec14d5be7cdd86 100644
--- a/civicrm/CRM/Utils/Migrate/Import.php
+++ b/civicrm/CRM/Utils/Migrate/Import.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Migrate/ImportJSON.php b/civicrm/CRM/Utils/Migrate/ImportJSON.php
index 7dfe594b35798e4c4126e211c184d7c81fef37f7..f987d34e6cac848dbb2b558455be669f0ebda8df 100644
--- a/civicrm/CRM/Utils/Migrate/ImportJSON.php
+++ b/civicrm/CRM/Utils/Migrate/ImportJSON.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Money.php b/civicrm/CRM/Utils/Money.php
index b0771a46f072829e497da5dce949c9568e1a6e09..28ecf6aafe9f662e09461120983c72f3422f77fe 100644
--- a/civicrm/CRM/Utils/Money.php
+++ b/civicrm/CRM/Utils/Money.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Network.php b/civicrm/CRM/Utils/Network.php
index 4b5bf0acf51561480dac7a24d0d6b9f3fcef73b5..386384c7957245614ca0b011c0184e9fbd3c3763 100644
--- a/civicrm/CRM/Utils/Network.php
+++ b/civicrm/CRM/Utils/Network.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Number.php b/civicrm/CRM/Utils/Number.php
index a16a1740ba450035f8e0a7cf6f45c9c0ed69367c..856233316b9204e961bd229b75cc3b7bc125158b 100644
--- a/civicrm/CRM/Utils/Number.php
+++ b/civicrm/CRM/Utils/Number.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/OpenFlashChart.php b/civicrm/CRM/Utils/OpenFlashChart.php
index 6401f4af888f0205ec6b3085e70fbebf037510e5..de68ad4bfa237fdf146afb447d1ca4cda33c7aaf 100644
--- a/civicrm/CRM/Utils/OpenFlashChart.php
+++ b/civicrm/CRM/Utils/OpenFlashChart.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/OptionBag.php b/civicrm/CRM/Utils/OptionBag.php
index 6aebb568e678efe248b97b2082806515352bdfba..125dd3654a470a83b471d4e6d5827174b4f71252 100644
--- a/civicrm/CRM/Utils/OptionBag.php
+++ b/civicrm/CRM/Utils/OptionBag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/PDF/Document.php b/civicrm/CRM/Utils/PDF/Document.php
index 585a8ef14af72cff6cebc9b3945fd028fa2fffdb..77d96b91bb21a6e266f92659d77c6cfa4f5ed641 100644
--- a/civicrm/CRM/Utils/PDF/Document.php
+++ b/civicrm/CRM/Utils/PDF/Document.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/PDF/Label.php b/civicrm/CRM/Utils/PDF/Label.php
index 5192ce75854d676090493d625f8da2a01d525674..0f6a613feb8c35815e0a63bea435fecc864a806b 100644
--- a/civicrm/CRM/Utils/PDF/Label.php
+++ b/civicrm/CRM/Utils/PDF/Label.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/PDF/Utils.php b/civicrm/CRM/Utils/PDF/Utils.php
index 4cdbef3368b158801f1e055e4c56a8dc56f7de59..8e61de453fac538f59ba36b382e905640f930107 100644
--- a/civicrm/CRM/Utils/PDF/Utils.php
+++ b/civicrm/CRM/Utils/PDF/Utils.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Pager.php b/civicrm/CRM/Utils/Pager.php
index a2e8f3e74ae95eb008261e4bceca6ec98b7b7d0d..57fce5820d992abcc408ed267227198f22f03999 100644
--- a/civicrm/CRM/Utils/Pager.php
+++ b/civicrm/CRM/Utils/Pager.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/PagerAToZ.php b/civicrm/CRM/Utils/PagerAToZ.php
index 731b545d38d227a5e5962b1e9c3e610dc4fd82ba..a8f6e3f144c53bc5c21862ef7b3bb7faaec1f0ad 100644
--- a/civicrm/CRM/Utils/PagerAToZ.php
+++ b/civicrm/CRM/Utils/PagerAToZ.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/PseudoConstant.php b/civicrm/CRM/Utils/PseudoConstant.php
index c77237acde34ecf4f8cf4cb791041c34a38a5fb5..907223edfc1e28c88e548d51a83245c069b7de7b 100644
--- a/civicrm/CRM/Utils/PseudoConstant.php
+++ b/civicrm/CRM/Utils/PseudoConstant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/QueryFormatter.php b/civicrm/CRM/Utils/QueryFormatter.php
index 9bcbed6e1d8b71f125ca2792beb4b1f16aad99a9..601d4a55caa464d9cbb51b5f85b4a76f9baf980f 100644
--- a/civicrm/CRM/Utils/QueryFormatter.php
+++ b/civicrm/CRM/Utils/QueryFormatter.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/REST.php b/civicrm/CRM/Utils/REST.php
index df5382746f9c1216aaf600eb4dad15726e41ad2c..fafb1f1253e79119c8358b835f5a011ab503d150 100644
--- a/civicrm/CRM/Utils/REST.php
+++ b/civicrm/CRM/Utils/REST.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/ReCAPTCHA.php b/civicrm/CRM/Utils/ReCAPTCHA.php
index bf556b7e59d3692b9d355393eb2e2f4da45046f5..de4021bb1f938298699761021db931c4ccb39d17 100644
--- a/civicrm/CRM/Utils/ReCAPTCHA.php
+++ b/civicrm/CRM/Utils/ReCAPTCHA.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Recent.php b/civicrm/CRM/Utils/Recent.php
index 7070ecb907028c6b0233f24ec8dda40c3b4ca426..f3baf09271927f078747cb57930c96411460b359 100644
--- a/civicrm/CRM/Utils/Recent.php
+++ b/civicrm/CRM/Utils/Recent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Request.php b/civicrm/CRM/Utils/Request.php
index d1afbe876d161e4030b87fe96df1324bbb444bbe..831947358ed61658aab352e5009adb8c22eca973 100644
--- a/civicrm/CRM/Utils/Request.php
+++ b/civicrm/CRM/Utils/Request.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Rule.php b/civicrm/CRM/Utils/Rule.php
index d22e19c461f2e9908948672064eb73f160f621fe..060967d8b917b2aaf559cbca8ec65ac51f475ef1 100644
--- a/civicrm/CRM/Utils/Rule.php
+++ b/civicrm/CRM/Utils/Rule.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/SQL.php b/civicrm/CRM/Utils/SQL.php
index 2f50c8c6f03a28fcbb1d8b7016eb1a26606dd232..3a90ee05d191527fb05111698625b752fb976dd9 100644
--- a/civicrm/CRM/Utils/SQL.php
+++ b/civicrm/CRM/Utils/SQL.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -122,4 +122,17 @@ class CRM_Utils_SQL {
return TRUE;
}
+ /**
+ * Is the Database set up to handle acceents.
+ * @return bool
+ */
+ public static function supportStorageOfAccents() {
+ $charSetDB = CRM_Core_DAO::executeQuery("SHOW VARIABLES LIKE 'character_set_database'")->fetchAll();
+ $charSet = $charSetDB[0]['Value'];
+ if ($charSet == 'utf8') {
+ return TRUE;
+ }
+ return FALSE;
+ }
+
}
diff --git a/civicrm/CRM/Utils/SQL/Select.php b/civicrm/CRM/Utils/SQL/Select.php
index f05e2d6d8a673d0e002a53ee1087b36e8c1e1b27..23adc513d4be277a6e9afffab92c92ce8ec5945b 100644
--- a/civicrm/CRM/Utils/SQL/Select.php
+++ b/civicrm/CRM/Utils/SQL/Select.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Signer.php b/civicrm/CRM/Utils/Signer.php
index 15e4b510ea530db61e760a8e8b50777deeddf6de..a4a09bff7b683d698bbd8468a851080222f83bf8 100644
--- a/civicrm/CRM/Utils/Signer.php
+++ b/civicrm/CRM/Utils/Signer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/SoapServer.php b/civicrm/CRM/Utils/SoapServer.php
index 2a934e3cb7483cfd3eb5ec3bbc554daf95993e7e..348ee852d3e685c11900a7eafbeb9d023ae0b424 100644
--- a/civicrm/CRM/Utils/SoapServer.php
+++ b/civicrm/CRM/Utils/SoapServer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Sort.php b/civicrm/CRM/Utils/Sort.php
index 47cfb1c033d813565757cde7558e8a02ac39cf18..882b1e7d1bc013e0a94dde6ff2b18f3e25c9a82a 100644
--- a/civicrm/CRM/Utils/Sort.php
+++ b/civicrm/CRM/Utils/Sort.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/String.php b/civicrm/CRM/Utils/String.php
index bb715f37dd37ed1936043a0b428c877c6d7b99db..2225befa961d23e52465e0e1ac13c2a98b4c55cd 100644
--- a/civicrm/CRM/Utils/String.php
+++ b/civicrm/CRM/Utils/String.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/System.php b/civicrm/CRM/Utils/System.php
index ca0f9a9b9fcb86f336c1c98a85bd7cc6b856ce98..e2d72f5303244d9eb8c031c82696994bedd3f47f 100644
--- a/civicrm/CRM/Utils/System.php
+++ b/civicrm/CRM/Utils/System.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/System/Backdrop.php b/civicrm/CRM/Utils/System/Backdrop.php
index ab0a2963da9fe519f36ba30a11292b9845768bf5..f89b6b69a11c5bc3f3e762e51a6b8f822cae8f66 100644
--- a/civicrm/CRM/Utils/System/Backdrop.php
+++ b/civicrm/CRM/Utils/System/Backdrop.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/System/Drupal.php b/civicrm/CRM/Utils/System/Drupal.php
index 7dd4952051845d1d6df5cbc0cd06f731697bf82c..4a677da3f6aa1ba9abc61aca9220395bd8de464c 100644
--- a/civicrm/CRM/Utils/System/Drupal.php
+++ b/civicrm/CRM/Utils/System/Drupal.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/System/Drupal6.php b/civicrm/CRM/Utils/System/Drupal6.php
index df8eec7568caa222d410726bce7b4e92484f27d8..8e206a1fca74763601699d3e3a1c727af8545363 100644
--- a/civicrm/CRM/Utils/System/Drupal6.php
+++ b/civicrm/CRM/Utils/System/Drupal6.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/System/Drupal8.php b/civicrm/CRM/Utils/System/Drupal8.php
index 75f3f99701ad0b6c002678d7b0c289b760486860..858b9eee2b7d857291f1d2e231c5b2f5d4e61f58 100644
--- a/civicrm/CRM/Utils/System/Drupal8.php
+++ b/civicrm/CRM/Utils/System/Drupal8.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -440,7 +440,7 @@ class CRM_Utils_System_Drupal8 extends CRM_Utils_System_DrupalBase {
CRM_Utils_Hook::config($config);
if ($loadUser) {
- if (!empty($params['uid']) && $username = \Drupal\user\Entity\User::load($uid)->getUsername()) {
+ if (!empty($params['uid']) && $username = \Drupal\user\Entity\User::load($params['uid'])->getUsername()) {
$this->loadUser($username);
}
elseif (!empty($params['name']) && !empty($params['pass']) && \Drupal::service('user.auth')->authenticate($params['name'], $params['pass'])) {
@@ -569,6 +569,16 @@ class CRM_Utils_System_Drupal8 extends CRM_Utils_System_DrupalBase {
return $modules;
}
+ /**
+ * @inheritDoc
+ */
+ public function getUser($contactID) {
+ $user_details = parent::getUser($contactID);
+ $user_details['name'] = $user_details['name']->value;
+ $user_details['email'] = $user_details['email']->value;
+ return $user_details;
+ }
+
/**
* @inheritDoc
*/
diff --git a/civicrm/CRM/Utils/System/DrupalBase.php b/civicrm/CRM/Utils/System/DrupalBase.php
index ecc8ebbfe3a4616b2a170bc5d8a3e32e92aeea78..9be10ddef13b4500705736513fa2847af8dad011 100644
--- a/civicrm/CRM/Utils/System/DrupalBase.php
+++ b/civicrm/CRM/Utils/System/DrupalBase.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/System/Joomla.php b/civicrm/CRM/Utils/System/Joomla.php
index 5def803e23f5d88216977beea2608294ba24c8ca..2b8ec1a31a83da2fedcf0bbf7fe758b9985949a7 100644
--- a/civicrm/CRM/Utils/System/Joomla.php
+++ b/civicrm/CRM/Utils/System/Joomla.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -638,6 +638,16 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base {
return $this->getUniqueIdentifierFromUserObject($user);
}
+ /**
+ * @inheritDoc
+ */
+ public function getUser($contactID) {
+ $user_details = parent::getUser($contactID);
+ $user = JFactory::getUser($user_details['id']);
+ $user_details['name'] = $user->name;
+ return $user_details;
+ }
+
/**
* @inheritDoc
*/
diff --git a/civicrm/CRM/Utils/System/Soap.php b/civicrm/CRM/Utils/System/Soap.php
index c28a634cb0fee67533ec304b42ca1096bf25ab12..bfaa43d456730aaf48e30df32d229a68b5e07689 100644
--- a/civicrm/CRM/Utils/System/Soap.php
+++ b/civicrm/CRM/Utils/System/Soap.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/System/UnitTests.php b/civicrm/CRM/Utils/System/UnitTests.php
index 5b55f736b3faedcb9614feaeb1755e7b043612bf..617eb10d17c43415266de3ca3725b706e6c44aab 100644
--- a/civicrm/CRM/Utils/System/UnitTests.php
+++ b/civicrm/CRM/Utils/System/UnitTests.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php
index 1db0a2e4016f82bf5f7a319e8aa44c1030fb14d8..f2df6c84761c6186d0ba4a3172bf9fe2a2f5799b 100644
--- a/civicrm/CRM/Utils/System/WordPress.php
+++ b/civicrm/CRM/Utils/System/WordPress.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/SystemLogger.php b/civicrm/CRM/Utils/SystemLogger.php
index 62ba50b957877fc36a7cde188e711b6410baa4d1..ac81bc8d9adc8a3bb1ebd2133c920eb9730f311e 100644
--- a/civicrm/CRM/Utils/SystemLogger.php
+++ b/civicrm/CRM/Utils/SystemLogger.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Time.php b/civicrm/CRM/Utils/Time.php
index b52a4253c17e9b03b237540db1d05e755266f0a2..0211239e543e9707b96fa1a82f74b706ab211c5a 100644
--- a/civicrm/CRM/Utils/Time.php
+++ b/civicrm/CRM/Utils/Time.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Token.php b/civicrm/CRM/Utils/Token.php
index c2cbd5fbfc8eb6c499f3ccbfe73d9a41cd5e5c88..44a649885882a2453150f85d1eafa832aa062228 100644
--- a/civicrm/CRM/Utils/Token.php
+++ b/civicrm/CRM/Utils/Token.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -1157,7 +1157,7 @@ class CRM_Utils_Token {
* Gives required details of contacts in an indexed array format so we
* can iterate in a nice loop and do token evaluation
*
- * @param $contactIDs
+ * @param array $contactIDs
* @param array $returnProperties
* Of required properties.
* @param bool $skipOnHold Don't return on_hold contact info also.
@@ -1186,7 +1186,7 @@ class CRM_Utils_Token {
) {
$params = array();
- foreach ($contactIDs as $key => $contactID) {
+ foreach ($contactIDs as $contactID) {
$params[] = array(
CRM_Core_Form::CB_PREFIX . $contactID,
'=',
@@ -1215,7 +1215,7 @@ class CRM_Utils_Token {
$fields = array_merge(array_keys(CRM_Contact_BAO_Contact::exportableFields()),
array('display_name', 'checksum', 'contact_id')
);
- foreach ($fields as $key => $val) {
+ foreach ($fields as $val) {
// The unavailable fields are not available as tokens, do not have a one-2-one relationship
// with contacts and are expensive to resolve.
// @todo see CRM-17253 - there are some other fields (e.g note) that should be excluded
@@ -1239,12 +1239,12 @@ class CRM_Utils_Token {
$contactDetails = &$details[0];
- foreach ($contactIDs as $key => $contactID) {
+ foreach ($contactIDs as $contactID) {
if (array_key_exists($contactID, $contactDetails)) {
if (!empty($contactDetails[$contactID]['preferred_communication_method'])
) {
$communicationPreferences = array();
- foreach ($contactDetails[$contactID]['preferred_communication_method'] as $key => $val) {
+ foreach ($contactDetails[$contactID]['preferred_communication_method'] as $val) {
if ($val) {
$communicationPreferences[$val] = CRM_Core_PseudoConstant::getLabel('CRM_Contact_DAO_Contact', 'preferred_communication_method', $val);
}
diff --git a/civicrm/CRM/Utils/Type.php b/civicrm/CRM/Utils/Type.php
index 3380fde9fb3c5ef8e11219513c69dae2add75743..3cd8085a2d216dc67f0d3c1ebaa617fe731aa98f 100644
--- a/civicrm/CRM/Utils/Type.php
+++ b/civicrm/CRM/Utils/Type.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Url.php b/civicrm/CRM/Utils/Url.php
index 0c97ae48bafe2be7aeff36392e9c594b90a8909b..dc48b87edd9b60879aff0e365197d856582513b5 100644
--- a/civicrm/CRM/Utils/Url.php
+++ b/civicrm/CRM/Utils/Url.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Verp.php b/civicrm/CRM/Utils/Verp.php
index e00add68af810847580d4a2b7cc580a3c799960c..56c4d51dba7a4add84d0a9902ca0feb59f7856cf 100644
--- a/civicrm/CRM/Utils/Verp.php
+++ b/civicrm/CRM/Utils/Verp.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/VersionCheck.php b/civicrm/CRM/Utils/VersionCheck.php
index 5c9ba7cd11fedbd012b4d41fbe775603745ff9ac..2c8cbd9cc4c46613f8a37e31d32cc913df09365e 100644
--- a/civicrm/CRM/Utils/VersionCheck.php
+++ b/civicrm/CRM/Utils/VersionCheck.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -179,11 +179,10 @@ class CRM_Utils_VersionCheck {
$dao->find();
$ppTypes = array();
- // Get title and id for all processor types
- $ppTypeNames = CRM_Core_PseudoConstant::paymentProcessorType();
-
+ // Get title for all processor types
+ // FIXME: This should probably be getName, but it has always returned translated label so we stick with that for now as it would affect stats
while ($dao->fetch()) {
- $ppTypes[] = $ppTypeNames[$dao->payment_processor_type_id];
+ $ppTypes[] = CRM_Core_PseudoConstant::getLabel('CRM_Financial_BAO_PaymentProcessor', 'payment_processor_type_id', $dao->payment_processor_type_id);
}
// add the .-separated list of the processor types
$this->stats['PPTypes'] = implode(',', array_unique($ppTypes));
diff --git a/civicrm/CRM/Utils/VisualBundle.php b/civicrm/CRM/Utils/VisualBundle.php
index fb0791210907177fcd0a1b034e88e330ced8c998..fa76fa5efe93f84c95673dc40551f439b257ea22 100644
--- a/civicrm/CRM/Utils/VisualBundle.php
+++ b/civicrm/CRM/Utils/VisualBundle.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Weight.php b/civicrm/CRM/Utils/Weight.php
index 48fe4f47c6a330daa15c9f51850144184470a9b2..62ef87790c1613b6feb0f6b2adde09c28e02fce7 100644
--- a/civicrm/CRM/Utils/Weight.php
+++ b/civicrm/CRM/Utils/Weight.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Wrapper.php b/civicrm/CRM/Utils/Wrapper.php
index 6f8ec00b028e427ff91e7b67c8a8a43243d6649a..82f8e0ed6f4ef13df963b84603ff06150f62e86a 100644
--- a/civicrm/CRM/Utils/Wrapper.php
+++ b/civicrm/CRM/Utils/Wrapper.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/XML.php b/civicrm/CRM/Utils/XML.php
index 803c923069365a39d9b399a3e074209d0f7b1d70..dda751045abadc0c361d938fa6064879a51d8750 100644
--- a/civicrm/CRM/Utils/XML.php
+++ b/civicrm/CRM/Utils/XML.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/CRM/Utils/Zip.php b/civicrm/CRM/Utils/Zip.php
index cd06f99cede518b9f9310bf0a8149a5e042284f7..eaad2fa7a9f31224af556c3340ce06c15fa322ec 100644
--- a/civicrm/CRM/Utils/Zip.php
+++ b/civicrm/CRM/Utils/Zip.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Api3SelectQuery.php b/civicrm/Civi/API/Api3SelectQuery.php
index 99a77ae5a43283d9a0aa9f04847b817e6e34b215..71155a699f1a7a21d38b308181583c40fcda1a04 100644
--- a/civicrm/Civi/API/Api3SelectQuery.php
+++ b/civicrm/Civi/API/Api3SelectQuery.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Event/AuthorizeEvent.php b/civicrm/Civi/API/Event/AuthorizeEvent.php
index 11a86467ec2908e064e88705011fb65d95bd709c..01d2cdb77872400ede70fbac49cba790a65815d3 100644
--- a/civicrm/Civi/API/Event/AuthorizeEvent.php
+++ b/civicrm/Civi/API/Event/AuthorizeEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Event/Event.php b/civicrm/Civi/API/Event/Event.php
index 96b95818906de3ef0eb695ec8908e4b86800e8d1..c04432ffc5496fa718e34b9b03e2bd646356487f 100644
--- a/civicrm/Civi/API/Event/Event.php
+++ b/civicrm/Civi/API/Event/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Event/ExceptionEvent.php b/civicrm/Civi/API/Event/ExceptionEvent.php
index e35dec04e01a2598415773798fd613ab4eb2cbc8..002f61bdff836f24c697936977df89e06c2c43b8 100644
--- a/civicrm/Civi/API/Event/ExceptionEvent.php
+++ b/civicrm/Civi/API/Event/ExceptionEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Event/PrepareEvent.php b/civicrm/Civi/API/Event/PrepareEvent.php
index 53ec98edfcb85626520f6df85384542608684b56..dd0d131c2f156aeb10fc9cd00fe60fc6e6de92a8 100644
--- a/civicrm/Civi/API/Event/PrepareEvent.php
+++ b/civicrm/Civi/API/Event/PrepareEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Event/ResolveEvent.php b/civicrm/Civi/API/Event/ResolveEvent.php
index fb10018e8018cbc2e543cf81a702da4b8f57ba4c..d2de2f039bd19fe357cf3b4d5dc68fe8ea8f76d5 100644
--- a/civicrm/Civi/API/Event/ResolveEvent.php
+++ b/civicrm/Civi/API/Event/ResolveEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Event/RespondEvent.php b/civicrm/Civi/API/Event/RespondEvent.php
index 62c8be300649d3956e1e385da36fdd449435f8e8..dcb04ddc4c5b034c5dbfa3e3fc0175470e0b559b 100644
--- a/civicrm/Civi/API/Event/RespondEvent.php
+++ b/civicrm/Civi/API/Event/RespondEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Events.php b/civicrm/Civi/API/Events.php
index 37ca470dafad49200b50dbd4d6449124f3bd8162..997b8f5207bc8b5dec942e9659146632063d66a8 100644
--- a/civicrm/Civi/API/Events.php
+++ b/civicrm/Civi/API/Events.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Kernel.php b/civicrm/Civi/API/Kernel.php
index 8e541d82a5900b422f7ed42f0a8bff4d3604b75b..fba8167f33bf13abb3ab696cb28b787588653e8e 100644
--- a/civicrm/Civi/API/Kernel.php
+++ b/civicrm/Civi/API/Kernel.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Provider/AdhocProvider.php b/civicrm/Civi/API/Provider/AdhocProvider.php
index 3a9e5352d2de1fe681ab181df6e62a4ca99bfd35..03a39a50aa33814dcf32cc0c4b95908b28799c94 100644
--- a/civicrm/Civi/API/Provider/AdhocProvider.php
+++ b/civicrm/Civi/API/Provider/AdhocProvider.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Provider/MagicFunctionProvider.php b/civicrm/Civi/API/Provider/MagicFunctionProvider.php
index 4e08841fb0757cfe47bcbf2ce73108db46e61615..8753c3327bdc28078186d13343db99ec01532f14 100644
--- a/civicrm/Civi/API/Provider/MagicFunctionProvider.php
+++ b/civicrm/Civi/API/Provider/MagicFunctionProvider.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Provider/ProviderInterface.php b/civicrm/Civi/API/Provider/ProviderInterface.php
index b671052c0d447d8ea77e667e74b9b9617341a429..907b185d171b637bdf96450d53943b0cb7752b3d 100644
--- a/civicrm/Civi/API/Provider/ProviderInterface.php
+++ b/civicrm/Civi/API/Provider/ProviderInterface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Provider/ReflectionProvider.php b/civicrm/Civi/API/Provider/ReflectionProvider.php
index bc263cbf6b6bc7807ae59bb5636e204f2e99cf84..c76b4653ee12ebfe11de8670dd341b53607112f1 100644
--- a/civicrm/Civi/API/Provider/ReflectionProvider.php
+++ b/civicrm/Civi/API/Provider/ReflectionProvider.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Provider/StaticProvider.php b/civicrm/Civi/API/Provider/StaticProvider.php
index 27e14889f6da1a76d5232605b453950b75c72865..eccafd4b2051125968b547cb1211626cb96df0a4 100644
--- a/civicrm/Civi/API/Provider/StaticProvider.php
+++ b/civicrm/Civi/API/Provider/StaticProvider.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Request.php b/civicrm/Civi/API/Request.php
index fbee414d842c51f6bd4a390a9a6bab0d1658cd1a..63b0e60f4eb53f92cba28fe62182f999e51c2739 100644
--- a/civicrm/Civi/API/Request.php
+++ b/civicrm/Civi/API/Request.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/SelectQuery.php b/civicrm/Civi/API/SelectQuery.php
index 05951a0cd732a5d4fb26558bf9d175f899927877..4cb6d4a84ac57701e7ce3857d4c72df4dcb498c9 100644
--- a/civicrm/Civi/API/SelectQuery.php
+++ b/civicrm/Civi/API/SelectQuery.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Subscriber/APIv3SchemaAdapter.php b/civicrm/Civi/API/Subscriber/APIv3SchemaAdapter.php
index 22d406babecacaf3d971526d5fa9239654936377..755134b76aa856a999fc26ac6eaa90d726814efa 100644
--- a/civicrm/Civi/API/Subscriber/APIv3SchemaAdapter.php
+++ b/civicrm/Civi/API/Subscriber/APIv3SchemaAdapter.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Subscriber/ChainSubscriber.php b/civicrm/Civi/API/Subscriber/ChainSubscriber.php
index 7a2b8bd630a2a3f74ab84a5146a376e63531aed5..06a2e27140688eb3d4691ee35de9f8838158b93a 100644
--- a/civicrm/Civi/API/Subscriber/ChainSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/ChainSubscriber.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php b/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
index 0e3c98af37fb8826c18ac72d56a33db6e3735d23..719e716c26d6a80aa17b1b2e8198a20f7a731e12 100644
--- a/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
+++ b/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Subscriber/I18nSubscriber.php b/civicrm/Civi/API/Subscriber/I18nSubscriber.php
index 6ad8d1a3fff0733d40a10d483fae8c30b26cb78d..1446e242f89ee8786d1ccd2a9e1bb7aa6e910ca5 100644
--- a/civicrm/Civi/API/Subscriber/I18nSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/I18nSubscriber.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Subscriber/PermissionCheck.php b/civicrm/Civi/API/Subscriber/PermissionCheck.php
index e5fd68b1ff8f053efb2a48728ea00789bd24b0dd..862683ecbd86c717ddc774e73ad95e67075d6ef2 100644
--- a/civicrm/Civi/API/Subscriber/PermissionCheck.php
+++ b/civicrm/Civi/API/Subscriber/PermissionCheck.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Subscriber/TransactionSubscriber.php b/civicrm/Civi/API/Subscriber/TransactionSubscriber.php
index 04a57bff87e0eb95ae190154ad8768844c5ccac3..3c4e0da523da5ed15d45ec41e62cc9e1ce2a0fa3 100644
--- a/civicrm/Civi/API/Subscriber/TransactionSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/TransactionSubscriber.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Subscriber/WhitelistSubscriber.php b/civicrm/Civi/API/Subscriber/WhitelistSubscriber.php
index 64a0b3c7e03d7ab83ee11dbb0fb42a4e43a28dbb..5d293c54dab3d6e9ab46238bd24c1ff198ff93db 100644
--- a/civicrm/Civi/API/Subscriber/WhitelistSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/WhitelistSubscriber.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Subscriber/WrapperAdapter.php b/civicrm/Civi/API/Subscriber/WrapperAdapter.php
index d3da629242edf735defdd74fead67361dea09961..be1d571d24b06dfacd6c09b1923fe6e5d432608f 100644
--- a/civicrm/Civi/API/Subscriber/WrapperAdapter.php
+++ b/civicrm/Civi/API/Subscriber/WrapperAdapter.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/Subscriber/XDebugSubscriber.php b/civicrm/Civi/API/Subscriber/XDebugSubscriber.php
index b09b329d852895584ff1885b27cb46dcbcb74195..e80335223bebab2f706ddca198f983dbcc3e7c4b 100644
--- a/civicrm/Civi/API/Subscriber/XDebugSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/XDebugSubscriber.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/API/WhitelistRule.php b/civicrm/Civi/API/WhitelistRule.php
index fa22234dd9fbe09250fa69909c935b6f4ad46edc..5149e408d3a38bb169171bd4e5ccc66ab3333ba3 100644
--- a/civicrm/Civi/API/WhitelistRule.php
+++ b/civicrm/Civi/API/WhitelistRule.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/ActionSchedule/Mapping.php b/civicrm/Civi/ActionSchedule/Mapping.php
index 2d51e3aab50caf1268e442136949dc5f7d26a57c..cf2e70b1a8e93a0e9b38d85dba759581b249fe71 100644
--- a/civicrm/Civi/ActionSchedule/Mapping.php
+++ b/civicrm/Civi/ActionSchedule/Mapping.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/ActionSchedule/MappingInterface.php b/civicrm/Civi/ActionSchedule/MappingInterface.php
index 30636948dbd6d18ac7b8b33b12c82073e1c4e4a3..3ebe89de5533bd8384aec546edd7d8cb7bc67972 100644
--- a/civicrm/Civi/ActionSchedule/MappingInterface.php
+++ b/civicrm/Civi/ActionSchedule/MappingInterface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/ActionSchedule/RecipientBuilder.php b/civicrm/Civi/ActionSchedule/RecipientBuilder.php
index 7086ad63cf36e9ef0a1a91667c69eab7864f84a6..7e568aae329511390328766cad85c89b87d36661 100644
--- a/civicrm/Civi/ActionSchedule/RecipientBuilder.php
+++ b/civicrm/Civi/ActionSchedule/RecipientBuilder.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/CCase/Analyzer.php b/civicrm/Civi/CCase/Analyzer.php
index 34314fd7466391ef9ccc1f9b6e6fdee427cd663d..4b141dbdf9d8f34231c3f44c604dc402dbef5deb 100644
--- a/civicrm/Civi/CCase/Analyzer.php
+++ b/civicrm/Civi/CCase/Analyzer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/CCase/CaseChangeListener.php b/civicrm/Civi/CCase/CaseChangeListener.php
index 15efa0dcc8d7cf15a83ee1c79c822e8c94a62085..6c993b80b3ac5fcf390ba91a3ef567826a7fa312 100644
--- a/civicrm/Civi/CCase/CaseChangeListener.php
+++ b/civicrm/Civi/CCase/CaseChangeListener.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/CCase/Event/CaseChangeEvent.php b/civicrm/Civi/CCase/Event/CaseChangeEvent.php
index cb6c0a270c3c078b1fd1b6de48fa7846150451ff..2873ddbbf88f33467dc8c3144e95774b1deb6231 100644
--- a/civicrm/Civi/CCase/Event/CaseChangeEvent.php
+++ b/civicrm/Civi/CCase/Event/CaseChangeEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/CCase/Events.php b/civicrm/Civi/CCase/Events.php
index 1e7380006952aea252aeece635400b255b393dfa..9cecdf72e522fba92a38c185ed566758cc3672e3 100644
--- a/civicrm/Civi/CCase/Events.php
+++ b/civicrm/Civi/CCase/Events.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/DAO/Event/PostDelete.php b/civicrm/Civi/Core/DAO/Event/PostDelete.php
index 333b313d2a77a804d05cfd00d9ab9d1b578b3bb3..1f029c708038974e759a609f39c31abcb3fce88a 100644
--- a/civicrm/Civi/Core/DAO/Event/PostDelete.php
+++ b/civicrm/Civi/Core/DAO/Event/PostDelete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/DAO/Event/PostUpdate.php b/civicrm/Civi/Core/DAO/Event/PostUpdate.php
index 1949673f63e7e1848bdb57f3220552097a857f8f..b1420fb583f54f407f8b557ee10a98d3ee5cc072 100644
--- a/civicrm/Civi/Core/DAO/Event/PostUpdate.php
+++ b/civicrm/Civi/Core/DAO/Event/PostUpdate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/DAO/Event/PreDelete.php b/civicrm/Civi/Core/DAO/Event/PreDelete.php
index 36d6dce987cfc7477163e53bdf53b8077cecfe1a..fd7684899b336eba5ed8ec35c2000606e16dedef 100644
--- a/civicrm/Civi/Core/DAO/Event/PreDelete.php
+++ b/civicrm/Civi/Core/DAO/Event/PreDelete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/DatabaseInitializer.php b/civicrm/Civi/Core/DatabaseInitializer.php
index bcb9a0cb548f1b45a04443d2413c4946989823af..c64da002d8deb3ec1dce85f443c65cfe9feb9709 100644
--- a/civicrm/Civi/Core/DatabaseInitializer.php
+++ b/civicrm/Civi/Core/DatabaseInitializer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Event/GenericHookEvent.php b/civicrm/Civi/Core/Event/GenericHookEvent.php
index 745f10bd194ece2fb7d2f8215c905ce25ca5ead9..892619cfefcbd3b1c6cd56e996da6f3667409300 100644
--- a/civicrm/Civi/Core/Event/GenericHookEvent.php
+++ b/civicrm/Civi/Core/Event/GenericHookEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Event/PostEvent.php b/civicrm/Civi/Core/Event/PostEvent.php
index f9c0c33b0ee71bdafbff87546e1cc89c47ded726..848e471c15a3a9f93b875890ee32be7322eec164 100644
--- a/civicrm/Civi/Core/Event/PostEvent.php
+++ b/civicrm/Civi/Core/Event/PostEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Event/PreEvent.php b/civicrm/Civi/Core/Event/PreEvent.php
index 284c8ea29f122096bdde19a31363e071a7ca12a2..f1888e0091ce8238eaf18060b78446d2a7f60626 100644
--- a/civicrm/Civi/Core/Event/PreEvent.php
+++ b/civicrm/Civi/Core/Event/PreEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Event/SystemInstallEvent.php b/civicrm/Civi/Core/Event/SystemInstallEvent.php
index 3d7f5d252462c3de5b9055c5850a6db15a16ec19..478f1f7e357b831524ca52a3419d2ce8c73a3260 100644
--- a/civicrm/Civi/Core/Event/SystemInstallEvent.php
+++ b/civicrm/Civi/Core/Event/SystemInstallEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Event/UnhandledExceptionEvent.php b/civicrm/Civi/Core/Event/UnhandledExceptionEvent.php
index 71e3d6b9046e840164952c93d70eca23923d71bd..516d1ebe034672dbc3273bdce08752dfdb62a2b5 100644
--- a/civicrm/Civi/Core/Event/UnhandledExceptionEvent.php
+++ b/civicrm/Civi/Core/Event/UnhandledExceptionEvent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/InstallationCanary.php b/civicrm/Civi/Core/InstallationCanary.php
index a5de6fed6727d09c4107676fd59978c62ccac7b8..fae23c434cb57ade7b5a5d9ef1b822b2f6956b55 100644
--- a/civicrm/Civi/Core/InstallationCanary.php
+++ b/civicrm/Civi/Core/InstallationCanary.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/LocalizationInitializer.php b/civicrm/Civi/Core/LocalizationInitializer.php
index 4573d6265029dd09b6ff3ccd01f9d596f9663959..7b47fac280f2acec4e2561ab7538cb60af7c4ce5 100644
--- a/civicrm/Civi/Core/LocalizationInitializer.php
+++ b/civicrm/Civi/Core/LocalizationInitializer.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Lock/LockInterface.php b/civicrm/Civi/Core/Lock/LockInterface.php
index f427db9d195b52115ce875d06c5f409d88f4e3a5..f1a09e7b1a82feec1c1ce50b3898e233e415f38b 100644
--- a/civicrm/Civi/Core/Lock/LockInterface.php
+++ b/civicrm/Civi/Core/Lock/LockInterface.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Lock/LockManager.php b/civicrm/Civi/Core/Lock/LockManager.php
index a59798c162a58c20b1e489379e7d9dec4ef1f5aa..2d5118fd5644fe5b19f5718a062652a18a7c7fb8 100644
--- a/civicrm/Civi/Core/Lock/LockManager.php
+++ b/civicrm/Civi/Core/Lock/LockManager.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Lock/NullLock.php b/civicrm/Civi/Core/Lock/NullLock.php
index 447def0fa8353b7cdadcb01ec5d9ff51b251ae39..ad097b264b87781e61ebc631872ba4f1a7c6838b 100644
--- a/civicrm/Civi/Core/Lock/NullLock.php
+++ b/civicrm/Civi/Core/Lock/NullLock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/SettingsBag.php b/civicrm/Civi/Core/SettingsBag.php
index f56ac976340b06c2fdeb7b118e72c612002fa7ff..e3fcd7adb8232715c62cd8a4d1db30ce5e6bf8ab 100644
--- a/civicrm/Civi/Core/SettingsBag.php
+++ b/civicrm/Civi/Core/SettingsBag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/SettingsManager.php b/civicrm/Civi/Core/SettingsManager.php
index 041ebe62cb425864141f135fde8597619ba80c5b..8147afca982570b15757300a30a0253a1ca88467 100644
--- a/civicrm/Civi/Core/SettingsManager.php
+++ b/civicrm/Civi/Core/SettingsManager.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/SettingsMetadata.php b/civicrm/Civi/Core/SettingsMetadata.php
index 03390cbaed41622271d6b80dfaad7f4194280990..796319fb0b47672428cfaa53fdda8d35249f2577 100644
--- a/civicrm/Civi/Core/SettingsMetadata.php
+++ b/civicrm/Civi/Core/SettingsMetadata.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/SqlTrigger/StaticTriggers.php b/civicrm/Civi/Core/SqlTrigger/StaticTriggers.php
index 104e2a44f0c072a77b2ce7cde72189172b1124e4..40cd3a57ba5851da35ae0dbb71b3e16b5ce6d024 100644
--- a/civicrm/Civi/Core/SqlTrigger/StaticTriggers.php
+++ b/civicrm/Civi/Core/SqlTrigger/StaticTriggers.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/SqlTrigger/TimestampTriggers.php b/civicrm/Civi/Core/SqlTrigger/TimestampTriggers.php
index 67ceb628f493bf7a254bcaedf0898788bd2fa662..c7e1127322b519ca12eb10407d0b4ac96c711917 100644
--- a/civicrm/Civi/Core/SqlTrigger/TimestampTriggers.php
+++ b/civicrm/Civi/Core/SqlTrigger/TimestampTriggers.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/SqlTriggers.php b/civicrm/Civi/Core/SqlTriggers.php
index a8be7756a757619a57176b3ab30d815d67f1d0b8..450537f41d1c18ae8b313338e783b4960eaee6cf 100644
--- a/civicrm/Civi/Core/SqlTriggers.php
+++ b/civicrm/Civi/Core/SqlTriggers.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Transaction/Frame.php b/civicrm/Civi/Core/Transaction/Frame.php
index 94761e319d7646cdf4ba921e960264b94d44ce73..8bb2bcf652ff5306d0e6cbd8008315d474a707a2 100644
--- a/civicrm/Civi/Core/Transaction/Frame.php
+++ b/civicrm/Civi/Core/Transaction/Frame.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Core/Transaction/Manager.php b/civicrm/Civi/Core/Transaction/Manager.php
index acea08f6bc81be757db35e5cf1b999730951fb3b..57a16366c60d400a0e5057b16c37ffa8ac6ab6d0 100644
--- a/civicrm/Civi/Core/Transaction/Manager.php
+++ b/civicrm/Civi/Core/Transaction/Manager.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/Civi/Test/Api3TestTrait.php b/civicrm/Civi/Test/Api3TestTrait.php
index 767c7233907f1f559fc0199d31e04753e3596f2d..46880df32bf573f261aa8d116b5ba1d7145034a9 100644
--- a/civicrm/Civi/Test/Api3TestTrait.php
+++ b/civicrm/Civi/Test/Api3TestTrait.php
@@ -202,7 +202,7 @@ trait Api3TestTrait {
);
$result = $this->civicrm_api($entity, 'getsingle', $params);
if (!is_array($result) || !empty($result['is_error']) || isset($result['values'])) {
- throw new Exception('Invalid getsingle result' . print_r($result, TRUE));
+ throw new \Exception('Invalid getsingle result' . print_r($result, TRUE));
}
if ($checkAgainst) {
// @todo - have gone with the fn that unsets id? should we check id?
diff --git a/civicrm/Civi/Token/AbstractTokenSubscriber.php b/civicrm/Civi/Token/AbstractTokenSubscriber.php
index 8cd6c17ea8a69ef9c0636e228e3ef29450a155a8..1302de78c51956a48f6bba0e2d274214b49b17bd 100644
--- a/civicrm/Civi/Token/AbstractTokenSubscriber.php
+++ b/civicrm/Civi/Token/AbstractTokenSubscriber.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/ang/crmCaseType.js b/civicrm/ang/crmCaseType.js
index e3b4a16c6ab72518e0b9aab66a8d290458351a26..2ae4b98b3f12c5bc57674516aca855e18972a463 100644
--- a/civicrm/ang/crmCaseType.js
+++ b/civicrm/ang/crmCaseType.js
@@ -103,7 +103,9 @@
};
$(input).crmSelect2({
- data: scope[attrs.crmOptions],
+ data: function () {
+ return { results: scope[attrs.crmOptions] };
+ },
createSearchChoice: function(term) {
return {id: term, text: term + ' (' + ts('new') + ')'};
},
@@ -116,11 +118,6 @@
scope.$evalAsync('_resetSelection()');
e.preventDefault();
});
-
- scope.$watch(attrs.crmOptions, function(value) {
- $(input).select2('data', scope[attrs.crmOptions]);
- $(input).select2('val', '');
- });
}
};
});
@@ -380,7 +377,6 @@
})
.then(function (data) {
delete caseTypes.values[caseType.id];
- $scope.$digest();
});
};
$scope.revertCaseType = function (caseType) {
diff --git a/civicrm/ang/crmMailing/BlockMailing.html b/civicrm/ang/crmMailing/BlockMailing.html
index 6950000ac246eb2173f75fcf3c002114fdb080c0..8e09974322ce46b3edd8587e415e2db98cd026f9 100644
--- a/civicrm/ang/crmMailing/BlockMailing.html
+++ b/civicrm/ang/crmMailing/BlockMailing.html
@@ -41,15 +41,13 @@ It could perhaps be thinned by 30-60% by making more directives.
</div>
<span ng-controller="EditUnsubGroupCtrl">
<div crm-ui-field="{name: 'subform.baseGroup', title: ts('Unsubscribe Group')}" ng-if="isUnsubGroupRequired(mailing)">
- <select
+ <input
+ crm-entityref="{entity: 'Group', api: {params: {is_hidden: 0, is_active: 1}}, select: {allowClear:true, minimumInputLength: 0}}"
crm-ui-id="subform.baseGroup"
- crm-ui-select
name="baseGroup"
ng-model="mailing.recipients.groups.base[0]"
ng-required="true"
- >
- <option ng-repeat="grp in crmMailingConst.testGroupNames | filter:{is_hidden:0} | orderBy:'title'" value="{{grp.id}}">{{grp.title}}</option>
- </select>
+ />
</div>
</span>
<div crm-ui-field="{name: 'subform.subject', title: ts('Subject')}">
diff --git a/civicrm/ang/crmMailing/BlockPreview.html b/civicrm/ang/crmMailing/BlockPreview.html
index 823ea8548d925fede2ba512d585dbc1196bbbd56..1addd5fb46600fc63c37cbc23f471ddc132ef99c 100644
--- a/civicrm/ang/crmMailing/BlockPreview.html
+++ b/civicrm/ang/crmMailing/BlockPreview.html
@@ -45,16 +45,11 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController
<a crm-ui-help="hs({id: 'test', title: ts('Test Email')})"></a>
</div>
<div>
- <select
- name="preview_test_group"
- ui-jq="crmSelect2"
- ui-options="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Select Group')}"
+ <input
+ crm-entityref="{entity: 'Group', api: {params: {is_hidden: 0, is_active: 1}}, select: {allowClear:true, minimumInputLength: 0}}"
ng-model="testGroup.gid"
- ng-options="group.id as group.title for group in crmMailingConst.testGroupNames|orderBy:'title'"
class="crm-action-menu fa-envelope-o"
- >
- <option value=""></option>
- </select>
+ />
</div>
<button crm-icon="fa-paper-plane" title="{{crmMailing.$invalid || !testGroup.gid ? ts('Complete all required fields first') : ts('Send test message to group')}}" ng-disabled="crmMailing.$invalid || !testGroup.gid" crm-confirm="{resizable: true, width: '40%', height: '40%', open: previewTestGroup}" on-yes="doSend({gid: testGroup.gid})">{{ts('Send test')}}</button>
</div>
diff --git a/civicrm/ang/crmMailing/BlockPreview.js b/civicrm/ang/crmMailing/BlockPreview.js
index 36b72ea981dfe91cde338439a877c741385386d0..c2b692462e53dc8388eca0cac11e66ce74833e20 100644
--- a/civicrm/ang/crmMailing/BlockPreview.js
+++ b/civicrm/ang/crmMailing/BlockPreview.js
@@ -29,16 +29,15 @@
scope.previewTestGroup = function(e) {
var $dialog = $(this);
$dialog.html('<div class="crm-loading-element"></div>').parent().find('button[data-op=yes]').prop('disabled', true);
- $dialog.dialog('option', 'title', ts('Send to %1', {1: _.pluck(_.where(scope.crmMailingConst.testGroupNames, {id: scope.testGroup.gid}), 'title')[0]}));
- CRM.api3('contact', 'get', {
- group: scope.testGroup.gid,
- options: {limit: 0},
- return: 'display_name,email'
+ CRM.api3({
+ contact: ['contact', 'get', {group: scope.testGroup.gid, options: {limit: 0}, return: 'display_name,email'}],
+ group: ['group', 'getsingle', {id: scope.testGroup.gid, return: 'title'}]
}).done(function(data) {
+ $dialog.dialog('option', 'title', ts('Send to %1', {1: data.group.title}));
var count = 0,
// Fixme: should this be in a template?
- markup = '<ol>';
- _.each(data.values, function(row) {
+ markup = '<ol>';
+ _.each(data.contact.values, function(row) {
// Fixme: contact api doesn't seem capable of filtering out contacts with no email, so we're doing it client-side
if (row.email) {
count++;
@@ -49,7 +48,7 @@
markup = '<h4>' + ts('A test message will be sent to %1 people:', {1: count}) + '</h4>' + markup;
if (!count) {
markup = '<div class="messages status"><i class="crm-i fa-exclamation-triangle"></i> ' +
- (data.count ? ts('None of the contacts in this group have an email address.') : ts('Group is empty.')) +
+ (data.contact.count ? ts('None of the contacts in this group have an email address.') : ts('Group is empty.')) +
'</div>';
}
$dialog
diff --git a/civicrm/ang/crmMailingAB/EditCtrl/report.html b/civicrm/ang/crmMailingAB/EditCtrl/report.html
index d75d0ed23d8a34b02d1a25062a31c799489b768c..68b79245a301ee07814e3bae9dba990155392b4f 100644
--- a/civicrm/ang/crmMailingAB/EditCtrl/report.html
+++ b/civicrm/ang/crmMailingAB/EditCtrl/report.html
@@ -78,7 +78,7 @@
class="crm-hover-button action-item"
ng-href="{{statUrl(am.mailing, statType, 'events')}}"
title="{{ts('Browse events of type \'%1\'', {1: statType.title})}}"
- >{{stats[am.name][statType.name] || ts('n/a')}}</a>
+ >{{stats[am.name][statType.name] || ts('n/a')}} </a> {{stats[am.name][rateStats[statType.name]] || ' '}}
<a
class="crm-hover-button action-item"
ng-href="{{statUrl(am.mailing, statType, 'report')}}"
diff --git a/civicrm/ang/crmMailingAB/ReportCtrl.js b/civicrm/ang/crmMailingAB/ReportCtrl.js
index 9f44db9755459b9aca52faacdfb12e0e806564f5..8755945ee128b5ca14b7d76858e2077980306069 100644
--- a/civicrm/ang/crmMailingAB/ReportCtrl.js
+++ b/civicrm/ang/crmMailingAB/ReportCtrl.js
@@ -40,7 +40,11 @@
}).then(function(stats) {
$scope.stats = stats;
});
-
+ $scope.rateStats = {
+ 'Unique Clicks': 'clickthrough_rate',
+ 'Delivered': 'delivered_rate',
+ 'Opened': 'opened_rate',
+ };
$scope.statTypes = crmMailingStats.getStatTypes();
$scope.statUrl = function statUrl(mailing, statType, view) {
return crmMailingStats.getUrl(mailing, statType, view, 'abtest/' + $scope.abtest.ab.id);
diff --git a/civicrm/api/v3/Acl.php b/civicrm/api/v3/Acl.php
index f188760a6150c41d10fe60fc8f8a2912911d3ff0..b6c66ccef04ba6a0ee6c144df689bac70a5a6cd5 100644
--- a/civicrm/api/v3/Acl.php
+++ b/civicrm/api/v3/Acl.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/AclRole.php b/civicrm/api/v3/AclRole.php
index 36f570df60653a53ae1274142aaeb4cd64f6465e..681f20e527883fa856f3b8f35e96e0003ad2e479 100644
--- a/civicrm/api/v3/AclRole.php
+++ b/civicrm/api/v3/AclRole.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ActionSchedule.php b/civicrm/api/v3/ActionSchedule.php
index e901bd37525edc4610368e897dc17558dfe8fc99..b42b461d024ad4079d9e229182b9c3308eca6f33 100644
--- a/civicrm/api/v3/ActionSchedule.php
+++ b/civicrm/api/v3/ActionSchedule.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Activity.php b/civicrm/api/v3/Activity.php
index 45b39dea0f582fd37fa2579e9428faa5caa000e0..576b8771905d2c775c45a8277a523a1cadaeb7ed 100644
--- a/civicrm/api/v3/Activity.php
+++ b/civicrm/api/v3/Activity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ActivityContact.php b/civicrm/api/v3/ActivityContact.php
index be02bcc21118f770cddd4763554b412e7761f5ac..debbdbb8177d0ca32f54eaab58d10cf8ae7148a4 100644
--- a/civicrm/api/v3/ActivityContact.php
+++ b/civicrm/api/v3/ActivityContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ActivityType.php b/civicrm/api/v3/ActivityType.php
index 77a656ac339dfc1214e1a518429287960c0887ef..3f6d121f1a112ee8f5a0dc6cb1812934b8651a8d 100644
--- a/civicrm/api/v3/ActivityType.php
+++ b/civicrm/api/v3/ActivityType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Address.php b/civicrm/api/v3/Address.php
index 5ca5acfcbe150896cba77350d75563d7d73fdc1e..c03d3436d0b8c50c0cfd6e5e8cc1144bcc846fb9 100644
--- a/civicrm/api/v3/Address.php
+++ b/civicrm/api/v3/Address.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Attachment.php b/civicrm/api/v3/Attachment.php
index b503938b47e1471071a150772f6a33ff95373930..9c097038db75451c5bdd6b2a9e68dbad26cdaa13 100644
--- a/civicrm/api/v3/Attachment.php
+++ b/civicrm/api/v3/Attachment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Batch.php b/civicrm/api/v3/Batch.php
index 45372c1ae496983a3250b87e4c6ac4e99fe9a916..750e5c75b6cb16eedff0c8b6e50655480acba401 100644
--- a/civicrm/api/v3/Batch.php
+++ b/civicrm/api/v3/Batch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Campaign.php b/civicrm/api/v3/Campaign.php
index 215640451195d455299b1aff72fdb7ebaaf494d6..cbfc612a8bf9f178f3594c5be98ada6bf3fe1c71 100644
--- a/civicrm/api/v3/Campaign.php
+++ b/civicrm/api/v3/Campaign.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Case.php b/civicrm/api/v3/Case.php
index 116202c701a7d690201b09c3c308bed191310f3b..0d27319d97b60cf8f15e0f63f2f91fcefffd5062 100644
--- a/civicrm/api/v3/Case.php
+++ b/civicrm/api/v3/Case.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/CaseContact.php b/civicrm/api/v3/CaseContact.php
index c121abc7daccd446b878d860ef731361be9d1405..3072f8869ac1a024c666eed10e49fd302837e908 100644
--- a/civicrm/api/v3/CaseContact.php
+++ b/civicrm/api/v3/CaseContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/CaseType.php b/civicrm/api/v3/CaseType.php
index 36b011e3255b597685926202619be377dd12e313..f608e134206982432524254304749facd753b989 100644
--- a/civicrm/api/v3/CaseType.php
+++ b/civicrm/api/v3/CaseType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Constant.php b/civicrm/api/v3/Constant.php
index 6623ccc265c36f65f84ba925312b4b71b811a204..df0bec551f594caab7d88070ceaad08155d133af 100644
--- a/civicrm/api/v3/Constant.php
+++ b/civicrm/api/v3/Constant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Contact.php b/civicrm/api/v3/Contact.php
index 5e4149898a8aaeb3fc94a61116011c4179715a65..bf9d748f2802c52297f8b97034b5ae6c99883eea 100644
--- a/civicrm/api/v3/Contact.php
+++ b/civicrm/api/v3/Contact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ContactType.php b/civicrm/api/v3/ContactType.php
index f31750ba8a850bbea112b7da556d8cc6bbe2ca3c..67506888930706e03d0afb4436e93977fad0a731 100644
--- a/civicrm/api/v3/ContactType.php
+++ b/civicrm/api/v3/ContactType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Contribution.php b/civicrm/api/v3/Contribution.php
index 451e302d5832f505fc2b8a8cd6478fa19e8dc612..0d641ad8641f8ececec66b2ea42e1626ff0b8a25 100644
--- a/civicrm/api/v3/Contribution.php
+++ b/civicrm/api/v3/Contribution.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ContributionPage.php b/civicrm/api/v3/ContributionPage.php
index 46f7a554660fcbd490e08a07678c69116c867a8d..8506143621980477071890bf0e370c7faf9f7648 100644
--- a/civicrm/api/v3/ContributionPage.php
+++ b/civicrm/api/v3/ContributionPage.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ContributionProduct.php b/civicrm/api/v3/ContributionProduct.php
index 86efc7bd9682a2d4a02005ad74f14a48b9d0172e..55f8e2a73e71b04a777c9be31886fe9d76f91813 100644
--- a/civicrm/api/v3/ContributionProduct.php
+++ b/civicrm/api/v3/ContributionProduct.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ContributionRecur.php b/civicrm/api/v3/ContributionRecur.php
index 0c7a2cd94ccb7a208f31b44c0198a32326e8241c..144e62ad1a81cf6bad141cb14b2db774a264e5e8 100644
--- a/civicrm/api/v3/ContributionRecur.php
+++ b/civicrm/api/v3/ContributionRecur.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ContributionSoft.php b/civicrm/api/v3/ContributionSoft.php
index aafe6023e622daa614b923fe39cac980cfd2710f..00063c06b340ce45236dde29a7a670d12cccf87a 100644
--- a/civicrm/api/v3/ContributionSoft.php
+++ b/civicrm/api/v3/ContributionSoft.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Country.php b/civicrm/api/v3/Country.php
index 820e8087b3a6efcae7c2228f436008751dfcf71d..6a47bd3c43b4637368a136e38c57317c29bba81b 100644
--- a/civicrm/api/v3/Country.php
+++ b/civicrm/api/v3/Country.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/CustomField.php b/civicrm/api/v3/CustomField.php
index 2beca20a92327273530ceac808f480d949d8d2b0..43f2ce2afd40a1744903892749535629e150a6f4 100644
--- a/civicrm/api/v3/CustomField.php
+++ b/civicrm/api/v3/CustomField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/CustomGroup.php b/civicrm/api/v3/CustomGroup.php
index cf32d77f91b15813dfdd1bb5ea56fda5fe3ceff1..a5838cecae3f60f26af9704c27b63624adbf74ea 100644
--- a/civicrm/api/v3/CustomGroup.php
+++ b/civicrm/api/v3/CustomGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/CustomSearch.php b/civicrm/api/v3/CustomSearch.php
index 87120b8bd6674ddf72429ad193025889cba6a6fd..337eace060933d7a9da03b34d00929f8cb527f95 100644
--- a/civicrm/api/v3/CustomSearch.php
+++ b/civicrm/api/v3/CustomSearch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/CustomValue.php b/civicrm/api/v3/CustomValue.php
index 8c45ece601149687851bd528f7c51107653f3953..e5371f8feaf6d080587a2fbeebb7bcc1061dbbd9 100644
--- a/civicrm/api/v3/CustomValue.php
+++ b/civicrm/api/v3/CustomValue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Cxn.php b/civicrm/api/v3/Cxn.php
index 3c822a8c58dd00d95ab01fd0094733c2a20ac98a..b88b0bd0abe4d27f5d96113d05d6dc07559469fc 100644
--- a/civicrm/api/v3/Cxn.php
+++ b/civicrm/api/v3/Cxn.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/CxnApp.php b/civicrm/api/v3/CxnApp.php
index 127874ccab7cd50efad27d0b8ebbfb482f323953..00c58903bcd128755ed9c39f5fbff194d1564a02 100644
--- a/civicrm/api/v3/CxnApp.php
+++ b/civicrm/api/v3/CxnApp.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Dashboard.php b/civicrm/api/v3/Dashboard.php
index 01c1e43cd11b19d2262a7ad8b13f61a25d0ea41c..504d59c11332fbe764ae01bad076817efa4c074b 100644
--- a/civicrm/api/v3/Dashboard.php
+++ b/civicrm/api/v3/Dashboard.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/DashboardContact.php b/civicrm/api/v3/DashboardContact.php
index 7a1d9b3711c21fc660b2f4cb5bc1f43ed2a0bcb4..82524f308738563ed50fe1d27d5e19fa5c122598 100644
--- a/civicrm/api/v3/DashboardContact.php
+++ b/civicrm/api/v3/DashboardContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Domain.php b/civicrm/api/v3/Domain.php
index 20e360df546106279ef0a1d5b642b5490efcd3c2..cca8ee1a070a965aed638fccc4f5440c3b9833e7 100644
--- a/civicrm/api/v3/Domain.php
+++ b/civicrm/api/v3/Domain.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Email.php b/civicrm/api/v3/Email.php
index aee04e6c6d6b954417a450f3fc5067b03da0ea03..009449e3ba68ea437d6353ba93b1a64749a42614 100644
--- a/civicrm/api/v3/Email.php
+++ b/civicrm/api/v3/Email.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/EntityBatch.php b/civicrm/api/v3/EntityBatch.php
index 7dae97a0e3710bcc27b6dcc7f13dd010ce16f34c..0a7ac37b3834a7708631b7f301e875e5aef13c35 100644
--- a/civicrm/api/v3/EntityBatch.php
+++ b/civicrm/api/v3/EntityBatch.php
@@ -1,7 +1,7 @@
<?php
/*
--------------------------------------------------------------------
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
--------------------------------------------------------------------
| Copyright CiviCRM LLC (c) 2004-2017 |
--------------------------------------------------------------------
diff --git a/civicrm/api/v3/EntityFinancialAccount.php b/civicrm/api/v3/EntityFinancialAccount.php
index c4a6ea95b40a5a7a5e8e4e2d760ed23f2c027b70..5337fcc86dd7891f96d6536e8d76774397523aaa 100644
--- a/civicrm/api/v3/EntityFinancialAccount.php
+++ b/civicrm/api/v3/EntityFinancialAccount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/EntityFinancialTrxn.php b/civicrm/api/v3/EntityFinancialTrxn.php
index 5ddd6c30a5d9eaf7ee95430b66c19504f3b1656f..11f0e53f3e81988fafbb3c75eb814a45defb344a 100644
--- a/civicrm/api/v3/EntityFinancialTrxn.php
+++ b/civicrm/api/v3/EntityFinancialTrxn.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/EntityTag.php b/civicrm/api/v3/EntityTag.php
index cb5eb85ddf8130349cf26d45fb6488d6b60d6c8d..a3098bea8591850d7c90df5553017f31bc5f8b2b 100644
--- a/civicrm/api/v3/EntityTag.php
+++ b/civicrm/api/v3/EntityTag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Event.php b/civicrm/api/v3/Event.php
index 0a06e0fa6cb1d921c343b74eac5844302e84fa7a..4c622f12977648a102e50d11ebeebc531f45522b 100644
--- a/civicrm/api/v3/Event.php
+++ b/civicrm/api/v3/Event.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Extension.php b/civicrm/api/v3/Extension.php
index 6926aa8bfbb86f2e826c77ca9f0df41543d77bb7..c7302892aaf3a950e9cd6e0a56f10ac994e74dd4 100644
--- a/civicrm/api/v3/Extension.php
+++ b/civicrm/api/v3/Extension.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/File.php b/civicrm/api/v3/File.php
index 33703c5e5bab6cd04a3a3df8ab7aef48fbcfd21e..5a04e6477a7bde7f10a6fc6a50ee4a900ff94256 100644
--- a/civicrm/api/v3/File.php
+++ b/civicrm/api/v3/File.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/FinancialAccount.php b/civicrm/api/v3/FinancialAccount.php
index 2ca0960dff58576db5e06cdd8eb5fc5d4786bd0d..fc7bca50b4749c0981a96791791d16f8d75bd0f2 100644
--- a/civicrm/api/v3/FinancialAccount.php
+++ b/civicrm/api/v3/FinancialAccount.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/FinancialItem.php b/civicrm/api/v3/FinancialItem.php
index 9aecca6eaf488fced7351cf0d3221ec9fc713592..40ef66f8230b9eaab02c39b9d56fe38d13771638 100644
--- a/civicrm/api/v3/FinancialItem.php
+++ b/civicrm/api/v3/FinancialItem.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/FinancialTrxn.php b/civicrm/api/v3/FinancialTrxn.php
index 23f19807cc152625a9327b684527cc84c827fe7e..3acd230bf59d696514e0ddc7c12f5f9af4c96b14 100644
--- a/civicrm/api/v3/FinancialTrxn.php
+++ b/civicrm/api/v3/FinancialTrxn.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/FinancialType.php b/civicrm/api/v3/FinancialType.php
index 3b4f37336ea306d092eb628b6ca1cbd1c019270e..cc597b3445dacd03e4d2adb2609f59a91e5eb79d 100644
--- a/civicrm/api/v3/FinancialType.php
+++ b/civicrm/api/v3/FinancialType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Generic.php b/civicrm/api/v3/Generic.php
index b6d0bb1cac88dcbf1779b840bfea3a3ceb62facf..f35f84379426af6531bfce293c4b22bf9461b50e 100644
--- a/civicrm/api/v3/Generic.php
+++ b/civicrm/api/v3/Generic.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
@@ -475,6 +475,13 @@ function _civicrm_api3_generic_getoptions_spec(&$params, $apiRequest) {
}
}
}
+
+ $entityName = _civicrm_api_get_entity_name_from_camel($apiRequest['entity']);
+ $getOptionsSpecFunction = '_civicrm_api3_' . $entityName . '_getoptions_spec';
+
+ if (function_exists($getOptionsSpecFunction)) {
+ $getOptionsSpecFunction($params);
+ }
}
/**
diff --git a/civicrm/api/v3/Generic/Getactions.php b/civicrm/api/v3/Generic/Getactions.php
index 900d1a1f9aca3294aedbe641903b822879890ae5..ee080ded2f91f2d5aedf086aaa1843ead228df9a 100644
--- a/civicrm/api/v3/Generic/Getactions.php
+++ b/civicrm/api/v3/Generic/Getactions.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Generic/Getlist.php b/civicrm/api/v3/Generic/Getlist.php
index 124dc9eb1147786daf0913708dd58f239c7a27d6..a89f717db675ba0ac2d12cbe3c9b32c92c76a3f1 100644
--- a/civicrm/api/v3/Generic/Getlist.php
+++ b/civicrm/api/v3/Generic/Getlist.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Generic/Getunique.php b/civicrm/api/v3/Generic/Getunique.php
new file mode 100644
index 0000000000000000000000000000000000000000..e4ecc550709613c63d0014734456436368bc23c2
--- /dev/null
+++ b/civicrm/api/v3/Generic/Getunique.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5 |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2017 |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM. |
+ | |
+ | CiviCRM is free software; you can copy, modify, and distribute it |
+ | under the terms of the GNU Affero General Public License |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
+ | |
+ | CiviCRM is distributed in the hope that it will be useful, but |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
+ | See the GNU Affero General Public License for more details. |
+ | |
+ | You should have received a copy of the GNU Affero General Public |
+ | License and the CiviCRM Licensing Exception along |
+ | with this program; if not, contact CiviCRM LLC |
+ | at info[AT]civicrm[DOT]org. If you have questions about the |
+ | GNU Affero General Public License or the licensing of CiviCRM, |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * @package CiviCRM_APIv3
+ */
+
+/**
+ * Generic api wrapper used to get all unique fields for a given entity.
+ *
+ * @param array $apiRequest
+ *
+ * @return mixed
+ */
+function civicrm_api3_generic_getunique($apiRequest) {
+ $entity = _civicrm_api_get_entity_name_from_camel($apiRequest['entity']);
+ $uniqueFields = array();
+
+ $dao = _civicrm_api3_get_DAO($entity);
+ $uFields = $dao::indices();
+
+ foreach ($uFields as $fieldKey => $field) {
+ if (!isset($field['unique']) || !$field['unique']) {
+ continue;
+ }
+ $uniqueFields[$fieldKey] = $field['field'];
+ }
+
+ return civicrm_api3_create_success($uniqueFields);
+}
diff --git a/civicrm/api/v3/Generic/Setvalue.php b/civicrm/api/v3/Generic/Setvalue.php
index 11d9d4bf0d0435c1d7c15e01c5995826872a6ccd..6ad5242a5f55057bed131a68b12aeb8a9badbeeb 100644
--- a/civicrm/api/v3/Generic/Setvalue.php
+++ b/civicrm/api/v3/Generic/Setvalue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Generic/Update.php b/civicrm/api/v3/Generic/Update.php
index 0e248fe03cfab7c426a651e930e1f37151b3c553..8ab6953534edb73ce2aff5bdd76c7d571b706e66 100644
--- a/civicrm/api/v3/Generic/Update.php
+++ b/civicrm/api/v3/Generic/Update.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Generic/Validate.php b/civicrm/api/v3/Generic/Validate.php
index 573463ba4e40754029406fcf9d5a1ad4cb734666..f322a8e4a12c1bd6aa5cf9ce50093e9555ac12a2 100644
--- a/civicrm/api/v3/Generic/Validate.php
+++ b/civicrm/api/v3/Generic/Validate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Grant.php b/civicrm/api/v3/Grant.php
index 60e3797a939f542719b8898e2340eec2f903df60..a93b5290d35b8917129fff24cd62695827687d20 100644
--- a/civicrm/api/v3/Grant.php
+++ b/civicrm/api/v3/Grant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Group.php b/civicrm/api/v3/Group.php
index 9e6449e82ad38c46ee29970bcd9b7a12aac3c893..a18c50968fdc66a502d0d35510d63288d621e27a 100644
--- a/civicrm/api/v3/Group.php
+++ b/civicrm/api/v3/Group.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/GroupContact.php b/civicrm/api/v3/GroupContact.php
index 53f055e82b856ee0128c2fcc367c0c8c51a7cc14..16046437951ff89c9361d761e589592ecab4eb94 100644
--- a/civicrm/api/v3/GroupContact.php
+++ b/civicrm/api/v3/GroupContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/GroupNesting.php b/civicrm/api/v3/GroupNesting.php
index 20ed57e99a44a81af8d7269633fb56268ec83ec9..fd26e64f13ec095eecd979e94852917f2453ecb1 100644
--- a/civicrm/api/v3/GroupNesting.php
+++ b/civicrm/api/v3/GroupNesting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/GroupOrganization.php b/civicrm/api/v3/GroupOrganization.php
index 0816c5b9bc6e85f9d38eb1f2404ddc0f40e39b5e..6362a1a4598c939ac8be0c4786316ff8d972f9b4 100644
--- a/civicrm/api/v3/GroupOrganization.php
+++ b/civicrm/api/v3/GroupOrganization.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Im.php b/civicrm/api/v3/Im.php
index e78bf0481295551f2a704020358e6c35e752f86b..d0b79b47155b38bb132bd9d11cfb6fa5381fabe4 100644
--- a/civicrm/api/v3/Im.php
+++ b/civicrm/api/v3/Im.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Job.php b/civicrm/api/v3/Job.php
index e9e9306691d4288e0d874a783732d1615a09d4d2..7a7e699dc8d9795a06a3d16d1c11cdcb44c52701 100644
--- a/civicrm/api/v3/Job.php
+++ b/civicrm/api/v3/Job.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/JobLog.php b/civicrm/api/v3/JobLog.php
index ce2a9e911fea88f85b65325ab22f6d370adadb39..e7cbd1c14390890b6b6b916a7f4b144ff3dc8758 100644
--- a/civicrm/api/v3/JobLog.php
+++ b/civicrm/api/v3/JobLog.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/LineItem.php b/civicrm/api/v3/LineItem.php
index f5935bf0325b39584921971f821b9a5cec635cdc..bb1ab79762f0fa65dc55b6c9af01dad3084200fc 100644
--- a/civicrm/api/v3/LineItem.php
+++ b/civicrm/api/v3/LineItem.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/LocBlock.php b/civicrm/api/v3/LocBlock.php
index 6f16ba0871b07a07ee631686895eefe471cc9023..63245132a7ad24d30ed0cebbc91457a332836f5e 100644
--- a/civicrm/api/v3/LocBlock.php
+++ b/civicrm/api/v3/LocBlock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/LocationType.php b/civicrm/api/v3/LocationType.php
index bd419d87117752a84548745cc74d9bf642c6a61d..ed4b293af57fa1a90239e670e55f816beb6eb09b 100644
--- a/civicrm/api/v3/LocationType.php
+++ b/civicrm/api/v3/LocationType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Logging.php b/civicrm/api/v3/Logging.php
index 3287b8794f675febda5dc29548e21dbcc7077f8f..76c02053794e676716acb9061e0a76fb45e9ad22 100644
--- a/civicrm/api/v3/Logging.php
+++ b/civicrm/api/v3/Logging.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailSettings.php b/civicrm/api/v3/MailSettings.php
index 112a175e9fbd8b49a1d93d4f7779aeab900e16fe..49ac5542d41c706757c57e4f56eab8b9ab136cec 100644
--- a/civicrm/api/v3/MailSettings.php
+++ b/civicrm/api/v3/MailSettings.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Mailing.php b/civicrm/api/v3/Mailing.php
index 32c3fe1a33b635ef80261f244dcf6fd95bce39d2..b0e868490cff832373e3a8a020c52275a7e33a20 100644
--- a/civicrm/api/v3/Mailing.php
+++ b/civicrm/api/v3/Mailing.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
@@ -769,6 +769,14 @@ function civicrm_api3_mailing_stats($params) {
break;
}
}
+ $stats[$params['mailing_id']]['delivered_rate'] = $stats[$params['mailing_id']]['opened_rate'] = $stats[$params['mailing_id']]['clickthrough_rate'] = '0.00%';
+ if (!empty(CRM_Mailing_Event_BAO_Queue::getTotalCount($params['mailing_id'], $params['job_id']))) {
+ $stats[$params['mailing_id']]['delivered_rate'] = round((100.0 * $stats[$params['mailing_id']]['Delivered']) / CRM_Mailing_Event_BAO_Queue::getTotalCount($params['mailing_id'], $params['job_id']), 2) . '%';
+ }
+ if (!empty($stats[$params['mailing_id']]['Delivered'])) {
+ $stats[$params['mailing_id']]['opened_rate'] = round($stats[$params['mailing_id']]['Opened'] / $stats[$params['mailing_id']]['Delivered'] * 100.0, 2) . '%';
+ $stats[$params['mailing_id']]['clickthrough_rate'] = round($stats[$params['mailing_id']]['Unique Clicks'] / $stats[$params['mailing_id']]['Delivered'] * 100.0, 2) . '%';
+ }
return civicrm_api3_create_success($stats);
}
diff --git a/civicrm/api/v3/MailingAB.php b/civicrm/api/v3/MailingAB.php
index 542ced9213fee074713d5b2ba21088d57fca1720..d184c3150bf27c11416ad85e5d4c32057e485e0b 100644
--- a/civicrm/api/v3/MailingAB.php
+++ b/civicrm/api/v3/MailingAB.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingComponent.php b/civicrm/api/v3/MailingComponent.php
index e05491edceacb7777bc85f349561a4803ce0c7e3..997c28c0d6313936aa641443bf0cdc4fc5a95d95 100644
--- a/civicrm/api/v3/MailingComponent.php
+++ b/civicrm/api/v3/MailingComponent.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingContact.php b/civicrm/api/v3/MailingContact.php
index 9d14e1030c401c9213277692e218fbd6df7551cb..174eae6b791d9daa992c267375c8e53ac5f406c2 100644
--- a/civicrm/api/v3/MailingContact.php
+++ b/civicrm/api/v3/MailingContact.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingEventConfirm.php b/civicrm/api/v3/MailingEventConfirm.php
index 3efa8f28d43a9d55869eaa71d7835b1a860239de..93d6ed03a85f521c5f508bcec7c0e9bc1c7ab9e8 100644
--- a/civicrm/api/v3/MailingEventConfirm.php
+++ b/civicrm/api/v3/MailingEventConfirm.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingEventQueue.php b/civicrm/api/v3/MailingEventQueue.php
index a1a3f8de84a0fe0a3fba7802598e34b3aab25f99..becbf4f6dfe4662dde229d3a12990049b909b86d 100644
--- a/civicrm/api/v3/MailingEventQueue.php
+++ b/civicrm/api/v3/MailingEventQueue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingEventResubscribe.php b/civicrm/api/v3/MailingEventResubscribe.php
index 0a8a3516a100990c89741311332de0412f0b3b4e..0b73fe6e7e3f581b24cc339c2a54b49fe7b55a2c 100644
--- a/civicrm/api/v3/MailingEventResubscribe.php
+++ b/civicrm/api/v3/MailingEventResubscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingEventSubscribe.php b/civicrm/api/v3/MailingEventSubscribe.php
index 228427a7388f439a2d012c117dfb470cb6884e79..f9754794bc765cf74fa11f25ba858c22a6aa420b 100644
--- a/civicrm/api/v3/MailingEventSubscribe.php
+++ b/civicrm/api/v3/MailingEventSubscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingEventUnsubscribe.php b/civicrm/api/v3/MailingEventUnsubscribe.php
index d3b07f3c25c2e4a0bf1e472dd5d8a8c50add09e3..e6dc768c952c047cd7d3dd590f4188d884103f13 100644
--- a/civicrm/api/v3/MailingEventUnsubscribe.php
+++ b/civicrm/api/v3/MailingEventUnsubscribe.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingGroup.php b/civicrm/api/v3/MailingGroup.php
index 9a7a6ef67af572b629225fea722a2088d9cdd0c0..f1a08270bbd12456919559ed4e88c27076656372 100644
--- a/civicrm/api/v3/MailingGroup.php
+++ b/civicrm/api/v3/MailingGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingJob.php b/civicrm/api/v3/MailingJob.php
index 8114f5cfb4fce56a02fc5f53cd24bab7042da0ab..a744ded53e3e7f57d65e5cf7f540610c57462e3e 100644
--- a/civicrm/api/v3/MailingJob.php
+++ b/civicrm/api/v3/MailingJob.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MailingRecipients.php b/civicrm/api/v3/MailingRecipients.php
index 3c3daf33e1e33cf06dee39f257e4b1714510f0c5..f2312debb23032e1704d005fa8623fa8a0718c99 100644
--- a/civicrm/api/v3/MailingRecipients.php
+++ b/civicrm/api/v3/MailingRecipients.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Mapping.php b/civicrm/api/v3/Mapping.php
index 2ce632d83d8ba4d2a6fd4a1bbde639b16bcb5957..567ae6a2b2e60c0c916044793d44815db61a701b 100644
--- a/civicrm/api/v3/Mapping.php
+++ b/civicrm/api/v3/Mapping.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MappingField.php b/civicrm/api/v3/MappingField.php
index 88d257bc9c49d5e005eadac6f85f279fc2097d33..9d5c7dd927c0b4b8b5bc9b1cb57eee2ffcfab6d0 100644
--- a/civicrm/api/v3/MappingField.php
+++ b/civicrm/api/v3/MappingField.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Membership.php b/civicrm/api/v3/Membership.php
index cf926cc8e7335f14443eb6ecf18151b1d85753ec..4f0c657a9184ad1f70425e6bc19902fccf43e221 100644
--- a/civicrm/api/v3/Membership.php
+++ b/civicrm/api/v3/Membership.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MembershipBlock.php b/civicrm/api/v3/MembershipBlock.php
index 0b6fc837cc4323e01287cbefbca7f69845b451b2..420e40f72f1c2fec1dcd2417720d4a5876e7f4a0 100644
--- a/civicrm/api/v3/MembershipBlock.php
+++ b/civicrm/api/v3/MembershipBlock.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MembershipLog.php b/civicrm/api/v3/MembershipLog.php
index cd5dd6ad7bb257a2ab13d1456076714e5386286d..90b16832227fec8596a9bc12d584ab6b086b235e 100644
--- a/civicrm/api/v3/MembershipLog.php
+++ b/civicrm/api/v3/MembershipLog.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MembershipPayment.php b/civicrm/api/v3/MembershipPayment.php
index 3f13154fb0ab99bacc79c470a6ffa7a3b0878ebe..6cc68ed5f2dc1c1f74455888d58f971e177acf30 100644
--- a/civicrm/api/v3/MembershipPayment.php
+++ b/civicrm/api/v3/MembershipPayment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MembershipStatus.php b/civicrm/api/v3/MembershipStatus.php
index 724cfb2f5afe956052d532bd9bedc1530ca39551..b3ac4b99aa31b8d88d4a56377cad6306f18666b6 100644
--- a/civicrm/api/v3/MembershipStatus.php
+++ b/civicrm/api/v3/MembershipStatus.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MembershipType.php b/civicrm/api/v3/MembershipType.php
index 436b22e8792bde0acc3662b9bc852eed71a7d051..5011383c689781edb7e60be0b059198d37af4732 100644
--- a/civicrm/api/v3/MembershipType.php
+++ b/civicrm/api/v3/MembershipType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/MessageTemplate.php b/civicrm/api/v3/MessageTemplate.php
index 8c4c7554184df13fa96d2037740601c78dcef7fa..a00627fd3cc99c616167fca8517897a6d08a987f 100644
--- a/civicrm/api/v3/MessageTemplate.php
+++ b/civicrm/api/v3/MessageTemplate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Navigation.php b/civicrm/api/v3/Navigation.php
index fb040d2c65d5a16bac7d7d0f07802c9dce1c2eb9..1ce843095c366798cffaaf39b404ae0f0bbe1c64 100644
--- a/civicrm/api/v3/Navigation.php
+++ b/civicrm/api/v3/Navigation.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Note.php b/civicrm/api/v3/Note.php
index d08d6e37f020b39c89b740187829e31b1fbe3baf..e8495abb78f20eee7d6cbf3ac9c2585753f28b67 100644
--- a/civicrm/api/v3/Note.php
+++ b/civicrm/api/v3/Note.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/OpenID.php b/civicrm/api/v3/OpenID.php
index d338a2429041871138cf3473aca84d9884d28f5c..da41b99d897a113fe3ac41dfa965ee07a9409947 100644
--- a/civicrm/api/v3/OpenID.php
+++ b/civicrm/api/v3/OpenID.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/OptionGroup.php b/civicrm/api/v3/OptionGroup.php
index e20cced41fdadb886c151622ee7335334980ec7e..24822c85205e0b63b1072471d4cba37cab7a0448 100644
--- a/civicrm/api/v3/OptionGroup.php
+++ b/civicrm/api/v3/OptionGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/OptionValue.php b/civicrm/api/v3/OptionValue.php
index e83333467051bb81c288b724a7b52a6900c53b1c..0c436d6267ced21f81d209dca4a90587fbe4bbb3 100644
--- a/civicrm/api/v3/OptionValue.php
+++ b/civicrm/api/v3/OptionValue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Order.php b/civicrm/api/v3/Order.php
index 4bbaef684f06e79a9c58d8cb7f838c0cafa289e7..6b4a316e8c4451915678dbf5aa1dd66c83fcf507 100644
--- a/civicrm/api/v3/Order.php
+++ b/civicrm/api/v3/Order.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Participant.php b/civicrm/api/v3/Participant.php
index ab6c8bbf1a98786f7e48efe238c7544d5575b51c..8f91fbcf424b680e83097cd85cb7ecafa283d618 100644
--- a/civicrm/api/v3/Participant.php
+++ b/civicrm/api/v3/Participant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ParticipantPayment.php b/civicrm/api/v3/ParticipantPayment.php
index 7a231e78d6d505d66f1df47c2317b553d27cdbd1..6690eab437b8ad8ef34301bdfb5bf310259e401c 100644
--- a/civicrm/api/v3/ParticipantPayment.php
+++ b/civicrm/api/v3/ParticipantPayment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ParticipantStatusType.php b/civicrm/api/v3/ParticipantStatusType.php
index ea74bbf59308c69eb5f73ad3ad476e0dd603235c..5c2ef79d6eb429b7baf696effa43132a458979a3 100644
--- a/civicrm/api/v3/ParticipantStatusType.php
+++ b/civicrm/api/v3/ParticipantStatusType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Payment.php b/civicrm/api/v3/Payment.php
index 1b96697a30a308970cd6a9dcc2f4d95dd7a58c04..34734c400cb6260051b9eb26edbbfddba2953eb4 100644
--- a/civicrm/api/v3/Payment.php
+++ b/civicrm/api/v3/Payment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/PaymentProcessor.php b/civicrm/api/v3/PaymentProcessor.php
index d129caf4b8dd1c377856e0c4d3b73b69c9eee36d..2f51ca951dee70058c560379740406b2b4b04ee8 100644
--- a/civicrm/api/v3/PaymentProcessor.php
+++ b/civicrm/api/v3/PaymentProcessor.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/PaymentProcessorType.php b/civicrm/api/v3/PaymentProcessorType.php
index 9c2799650fcc805560e39d27403358f9a519d239..337839693525beb7a6acb5f48c826d3037627b1c 100644
--- a/civicrm/api/v3/PaymentProcessorType.php
+++ b/civicrm/api/v3/PaymentProcessorType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/PaymentToken.php b/civicrm/api/v3/PaymentToken.php
index b6e08fd86c17c5af8d69b313b906d0afe2d8486e..18df6addb19fa1d6e73e88f42810d8fba7fbd754 100644
--- a/civicrm/api/v3/PaymentToken.php
+++ b/civicrm/api/v3/PaymentToken.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Pcp.php b/civicrm/api/v3/Pcp.php
index 0016b5a96657728efe49f27da92248fd19115fdb..7b11e6cd3dfe4813b95d69bc21cf15bd38244eab 100644
--- a/civicrm/api/v3/Pcp.php
+++ b/civicrm/api/v3/Pcp.php
@@ -2,7 +2,7 @@
/*
* +--------------------------------------------------------------------+
- * | CiviCRM version 4.7 |
+ * | CiviCRM version 5 |
* +--------------------------------------------------------------------+
* | Copyright CiviCRM LLC (c) 2004-2017 |
* +--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Phone.php b/civicrm/api/v3/Phone.php
index 1e86e1383b86af6e1a09ebef684472cc3cc76b50..0ce79c13697a83bd9a1c76ee5c73fc0207049e87 100644
--- a/civicrm/api/v3/Phone.php
+++ b/civicrm/api/v3/Phone.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Phone/Get.php b/civicrm/api/v3/Phone/Get.php
index 39a8aa88c286d6fa0f1b2683e41082190158c2ec..b5d7c5a37da9427f193266e7bcaef422f9a5ea09 100644
--- a/civicrm/api/v3/Phone/Get.php
+++ b/civicrm/api/v3/Phone/Get.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Pledge.php b/civicrm/api/v3/Pledge.php
index 596c10655f2cd63fa148fbec29d2f4c08285b650..f74e0466e4e6236c2a3c3e88b812d7f864124154 100644
--- a/civicrm/api/v3/Pledge.php
+++ b/civicrm/api/v3/Pledge.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/PledgePayment.php b/civicrm/api/v3/PledgePayment.php
index 53857df7cdbdb651017e30e77ad9294000581c28..b4294fa1ca86c2929a156dfb660532eb24c03d44 100644
--- a/civicrm/api/v3/PledgePayment.php
+++ b/civicrm/api/v3/PledgePayment.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Premium.php b/civicrm/api/v3/Premium.php
index 066e6e9a9bf7e4091f0ed13176603330018a66c1..4591db3400f547956b5dcb4ae6e27f4dbccfb688 100644
--- a/civicrm/api/v3/Premium.php
+++ b/civicrm/api/v3/Premium.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/PriceField.php b/civicrm/api/v3/PriceField.php
index c1f391387e85c1c4ef5c9dd08f93590f3cf0af11..c773c920147fc7d0103028afec086762be7b53e3 100644
--- a/civicrm/api/v3/PriceField.php
+++ b/civicrm/api/v3/PriceField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/PriceFieldValue.php b/civicrm/api/v3/PriceFieldValue.php
index b13da150869992bcc1e359e8dd12b4f9aee3c842..4fda0fa296e3685a76e8d27da72b69f1be91efad 100644
--- a/civicrm/api/v3/PriceFieldValue.php
+++ b/civicrm/api/v3/PriceFieldValue.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/PriceSet.php b/civicrm/api/v3/PriceSet.php
index 6ecb5da9c6a4612dedeeed022e807ee002f8c538..93a274c0d25362fcc9365c5d664abf055ddbb413 100644
--- a/civicrm/api/v3/PriceSet.php
+++ b/civicrm/api/v3/PriceSet.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/PrintLabel.php b/civicrm/api/v3/PrintLabel.php
index c436a853c2ad22a323a0cb50fd63cb20fda9166c..d17752649a2f4800672d185a546f6e4a94f78952 100644
--- a/civicrm/api/v3/PrintLabel.php
+++ b/civicrm/api/v3/PrintLabel.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Product.php b/civicrm/api/v3/Product.php
index a60e19bad037ebd571e7e98e5f2821749a68a3f6..0b16b3cde44786fa298950e1702b81e58670f85c 100644
--- a/civicrm/api/v3/Product.php
+++ b/civicrm/api/v3/Product.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Profile.php b/civicrm/api/v3/Profile.php
index 7a0e431751b166baa12c83585b48935db5902637..2951c8d65c37a8de947acb331874f8bf42f6bd2a 100644
--- a/civicrm/api/v3/Profile.php
+++ b/civicrm/api/v3/Profile.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/RecurringEntity.php b/civicrm/api/v3/RecurringEntity.php
index 5bf8c20a6809a15a6c8ad27cfb4dfd9e457a1bfe..e77ade4096ee2613855f5faddc267522affdb64e 100644
--- a/civicrm/api/v3/RecurringEntity.php
+++ b/civicrm/api/v3/RecurringEntity.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Relationship.php b/civicrm/api/v3/Relationship.php
index bab339b835ac1dbcce3a2d538394f8506deb2dcf..8211283fb7c7844305db93873fdb1b8ceeddc68e 100644
--- a/civicrm/api/v3/Relationship.php
+++ b/civicrm/api/v3/Relationship.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
@@ -169,3 +169,53 @@ function civicrm_api3_relationship_setvalue($params) {
}
return $result;
}
+
+function _civicrm_api3_relationship_getoptions_spec(&$params) {
+ $params['field']['options']['relationship_type_id'] = ts('Relationship Type ID');
+
+ // Add parameters for limiting relationship type ID
+ $relationshipTypePrefix = ts('(For relationship_type_id only) ');
+ $params['contact_id'] = [
+ 'title' => ts('Contact ID'),
+ 'description' => $relationshipTypePrefix . ts('Limits options to those'
+ . ' available to give contact'),
+ 'type' => CRM_Utils_Type::T_INT,
+ 'FKClassName' => 'CRM_Contact_DAO_Contact',
+ 'FKApiName' => 'Contact',
+ ];
+ $params['relationship_direction'] = [
+ 'title' => ts('Relationship Direction'),
+ 'description' => $relationshipTypePrefix . ts('For relationships where the '
+ . 'name is the same for both sides (i.e. "Spouse Of") show the option '
+ . 'from "A" (origin) side or "B" (target) side of the relationship?'),
+ 'type' => CRM_Utils_Type::T_STRING,
+ 'options' => ['a_b' => 'a_b', 'b_a' => 'b_a'],
+ 'api.default' => 'a_b',
+ ];
+ $params['relationship_id'] = [
+ 'title' => ts('Reference Relationship ID'),
+ 'description' => $relationshipTypePrefix . ts('If provided alongside '
+ . 'contact ID it will be used to establish the contact type of the "B" '
+ . 'side of the relationship and limit options based on it. If the '
+ . 'provided contact ID does not match the "A" side of this relationship '
+ . 'then the "A" side of this relationship will be used to limit options'),
+ 'type' => CRM_Utils_Type::T_INT,
+ 'FKClassName' => 'CRM_Contact_DAO_Relationship',
+ 'FKApiName' => 'Relationship',
+ ];
+ $contactTypes = CRM_Contact_BAO_ContactType::contactTypes();
+ $params['contact_type'] = [
+ 'title' => ts('Contact Type'),
+ 'description' => $relationshipTypePrefix . ts('Limits options to those '
+ . 'available to this contact type. Overridden by the contact type of '
+ . 'contact ID (if provided)'),
+ 'type' => CRM_Utils_Type::T_STRING,
+ 'options' => array_combine($contactTypes, $contactTypes),
+ ];
+ $params['is_form'] = [
+ 'title' => ts('Is Form?'),
+ 'description' => $relationshipTypePrefix . ts('Formats the options for use'
+ . ' in a form if true. The format is <id>_a_b => <label>'),
+ 'type' => CRM_Utils_Type::T_BOOLEAN
+ ];
+}
diff --git a/civicrm/api/v3/RelationshipType.php b/civicrm/api/v3/RelationshipType.php
index b7aa1d34c89266801794adafa9762a0106435818..cca618cae3a9b6eeeca1c9868b3dc2d1525a0098 100644
--- a/civicrm/api/v3/RelationshipType.php
+++ b/civicrm/api/v3/RelationshipType.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ReportInstance.php b/civicrm/api/v3/ReportInstance.php
index cb8c618e550d774f74786abedfcfa5eddc6c8707..2272e29b49950b502b766e53a5c145633f98a12d 100644
--- a/civicrm/api/v3/ReportInstance.php
+++ b/civicrm/api/v3/ReportInstance.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/ReportTemplate.php b/civicrm/api/v3/ReportTemplate.php
index 69c250a7cde375c5566e05397331bd1071ec89ac..e121c4114645756c5c1cbc030b50d88e694e3a71 100644
--- a/civicrm/api/v3/ReportTemplate.php
+++ b/civicrm/api/v3/ReportTemplate.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/RuleGroup.php b/civicrm/api/v3/RuleGroup.php
index d8abd0a8b38fc490a2558760c8b8a3de85d0c40d..ea8790c01471df9cd6ebe9d2047d4f0dd98e4ce0 100644
--- a/civicrm/api/v3/RuleGroup.php
+++ b/civicrm/api/v3/RuleGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/SavedSearch.php b/civicrm/api/v3/SavedSearch.php
index ec9538601db8406968bb09d82d68aa950d732673..65f449e10b0c6f93e8ef7ce1c84c99788c059a0a 100644
--- a/civicrm/api/v3/SavedSearch.php
+++ b/civicrm/api/v3/SavedSearch.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright Chirojeugd-Vlaanderen vzw 2015 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Setting.php b/civicrm/api/v3/Setting.php
index 0677d2ffa0491704be94f768839c1fa07af34254..df4b6a8f59f22def31cd409ae40c3ea8a52b7446 100644
--- a/civicrm/api/v3/Setting.php
+++ b/civicrm/api/v3/Setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/SmsProvider.php b/civicrm/api/v3/SmsProvider.php
index c445c4ed76afd67a783e2ac42b9133ed8410b2db..4d22aede6ded9d753d93280d5d142eccf828c76b 100644
--- a/civicrm/api/v3/SmsProvider.php
+++ b/civicrm/api/v3/SmsProvider.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/StateProvince.php b/civicrm/api/v3/StateProvince.php
index 2044cf98b3c7f080b975156a421e99cc862ab84f..7fbcac0fdb926d44f4d9ed4bfc2b307bba99a8a2 100644
--- a/civicrm/api/v3/StateProvince.php
+++ b/civicrm/api/v3/StateProvince.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/StatusPreference.php b/civicrm/api/v3/StatusPreference.php
index 734fadba570f272c5165135f12b7f9e13dc761bc..aea7785966dd406413dc0ceecfa4b948f114c3b8 100644
--- a/civicrm/api/v3/StatusPreference.php
+++ b/civicrm/api/v3/StatusPreference.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Survey.php b/civicrm/api/v3/Survey.php
index 9c1decf3b2336caedede7e50f731f64ba4471d22..5f1eef8a2bbde97e8f4faf1ab81c4e49ffdf216c 100644
--- a/civicrm/api/v3/Survey.php
+++ b/civicrm/api/v3/Survey.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/SurveyRespondant.php b/civicrm/api/v3/SurveyRespondant.php
index eb5fe593d166a5c43fecf45ff0ee82c229ca5a10..f8b663eecefec1b3cbc7e124f26dbde3543f1967 100644
--- a/civicrm/api/v3/SurveyRespondant.php
+++ b/civicrm/api/v3/SurveyRespondant.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright Tech To The People (c) 2010 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/System.php b/civicrm/api/v3/System.php
index f561c0f8589dd6275c96edc1a1258d70e3a13782..41646c5ef31a8ee0cf6bf1c50f496124721222d9 100644
--- a/civicrm/api/v3/System.php
+++ b/civicrm/api/v3/System.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/SystemLog.php b/civicrm/api/v3/SystemLog.php
index 540c6662030fb7cfaea5f7b9d6cf78bfb2f7f70e..50942ff2fe24bb26dc833719bf676116d91b6a1a 100644
--- a/civicrm/api/v3/SystemLog.php
+++ b/civicrm/api/v3/SystemLog.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Tag.php b/civicrm/api/v3/Tag.php
index 7c67264e7255313227790dfe5653ed78a3a48527..bd48c23496c484f08f494837650fc1c21d05c8fc 100644
--- a/civicrm/api/v3/Tag.php
+++ b/civicrm/api/v3/Tag.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/UFField.php b/civicrm/api/v3/UFField.php
index e281a7d8ff2b39ef5811cc30afd1079bb5c51bf6..553bfe1c2eedbb17d7b3d27926f9358eb50f5fb0 100644
--- a/civicrm/api/v3/UFField.php
+++ b/civicrm/api/v3/UFField.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/UFGroup.php b/civicrm/api/v3/UFGroup.php
index 2816791aaf9f6ddb61551a1d93756138b59c7a78..0f9861f06de9e5f80a7409e6c9e3a6b8b9c62710 100644
--- a/civicrm/api/v3/UFGroup.php
+++ b/civicrm/api/v3/UFGroup.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/UFJoin.php b/civicrm/api/v3/UFJoin.php
index d615582152cddcb3b6199c38b89303486a63da42..75ea630708a57ce623e454a2e34a8c0fab667ea0 100644
--- a/civicrm/api/v3/UFJoin.php
+++ b/civicrm/api/v3/UFJoin.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/UFMatch.php b/civicrm/api/v3/UFMatch.php
index 8ecdf16d95617978be07725e7ec774e5e0fd6f12..81c2a2d9c18df55b4d61af1c1977c5abc0c5c182 100644
--- a/civicrm/api/v3/UFMatch.php
+++ b/civicrm/api/v3/UFMatch.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/User.php b/civicrm/api/v3/User.php
index a0b69a347302a5050f341f5d45aca42986c75724..71e2a6b4e488d6e096d099606b6b31e55b310494 100644
--- a/civicrm/api/v3/User.php
+++ b/civicrm/api/v3/User.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/Website.php b/civicrm/api/v3/Website.php
index 310d601fee61962ca0d2b31a63d272f4f116fdc1..98e74e5cf2f5cd59607a2b433be3dfeaa1175025 100644
--- a/civicrm/api/v3/Website.php
+++ b/civicrm/api/v3/Website.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/WordReplacement.php b/civicrm/api/v3/WordReplacement.php
index 93d779e878e7fedae0cb9c7cf15a40ab1f2b5269..2bdfe06563d2c531190cffb9d8cfcd382f9bbdd3 100644
--- a/civicrm/api/v3/WordReplacement.php
+++ b/civicrm/api/v3/WordReplacement.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/api/v3/utils.php b/civicrm/api/v3/utils.php
index b12e53636ddf0cb3b698eef466d1f09347fb6263..9948ae9e6bddd7dbadb8177ee28015e8ca9c5f0d 100644
--- a/civicrm/api/v3/utils.php
+++ b/civicrm/api/v3/utils.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/ContributionProcessor.php b/civicrm/bin/ContributionProcessor.php
index 5432bc045f9aa020a025d75cc20331541c70cc9a..7c961b5ed9231fe377c8f30c95acf16d6d926eb8 100644
--- a/civicrm/bin/ContributionProcessor.php
+++ b/civicrm/bin/ContributionProcessor.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/cli.class.php b/civicrm/bin/cli.class.php
index 7f432deb930908ead880a632155e471b6f01bed7..8f6705f2d0087c1d0eb0c8a6c82ba30db2187da6 100644
--- a/civicrm/bin/cli.class.php
+++ b/civicrm/bin/cli.class.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright Tech To The People http:tttp.eu (c) 2008 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/cli.php b/civicrm/bin/cli.php
index 2dd7550449078c045326779d118a2859040349e1..3c30fd2a2360c2af4684ca9caee1bc1e2ac9af68 100644
--- a/civicrm/bin/cli.php
+++ b/civicrm/bin/cli.php
@@ -2,7 +2,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright Tech To The People http:tttp.eu (c) 2008 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/cron.php b/civicrm/bin/cron.php
index fc273a836a9b37723d0b36f79112a429d43f3603..19cc4b8fb92d68fafe412e365873336b6f322af8 100644
--- a/civicrm/bin/cron.php
+++ b/civicrm/bin/cron.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/csv/delete.php b/civicrm/bin/csv/delete.php
index 58ea2e1750104521b85920adf5cf87294e579721..ca8c433816fa4d5e03b0fc4ea4362ad99e3102ab 100644
--- a/civicrm/bin/csv/delete.php
+++ b/civicrm/bin/csv/delete.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright Tech To The People http:tttp.eu (c) 2011 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/csv/export.php b/civicrm/bin/csv/export.php
index c18b86d911c5fa64087a1db982fb631117d3942a..6d6066fa4dc2d776fae6ec8ed252932f03d57313 100644
--- a/civicrm/bin/csv/export.php
+++ b/civicrm/bin/csv/export.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright Tech To The People http:tttp.eu (c) 2011 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/csv/import.php b/civicrm/bin/csv/import.php
index cadb3497cfa707302ac06cdff4daef3cf30ca620..d78af15178c32bc149d34293cc062cc7c2b651d8 100644
--- a/civicrm/bin/csv/import.php
+++ b/civicrm/bin/csv/import.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright Tech To The People http:tttp.eu (c) 2011 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/migrate/export.php b/civicrm/bin/migrate/export.php
index 7d0b582e96e020ab18b675eac5acffbf7e57c306..dfe495bafd3b9c4aa6935d2d9bc4293a75ffef69 100644
--- a/civicrm/bin/migrate/export.php
+++ b/civicrm/bin/migrate/export.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/migrate/exportJSON.php b/civicrm/bin/migrate/exportJSON.php
index 0865344318a589afec481ae0d5918c6b112dc86e..5737dbdf213a848ced93bc8520cda3b1ca8374f7 100644
--- a/civicrm/bin/migrate/exportJSON.php
+++ b/civicrm/bin/migrate/exportJSON.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/migrate/import.php b/civicrm/bin/migrate/import.php
index 0c0ac0c9952fb25d3f3d58554c0028bb3ffa3ca6..238642bfe65525bb1681254c36cc37fbca4971dc 100644
--- a/civicrm/bin/migrate/import.php
+++ b/civicrm/bin/migrate/import.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/migrate/importJSON.php b/civicrm/bin/migrate/importJSON.php
index 60ffd494707f6abdcdef6c9928c81667b049d43f..ea012721daf23c62bfdf73cf6c697daa120715b5 100644
--- a/civicrm/bin/migrate/importJSON.php
+++ b/civicrm/bin/migrate/importJSON.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/bin/migrate/move.php b/civicrm/bin/migrate/move.php
index 91ea24b45f7e52815dc9045475e75d58345766c1..73a1965b88a117b2282425885080b7e7cd360e68 100644
--- a/civicrm/bin/migrate/move.php
+++ b/civicrm/bin/migrate/move.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 3c2709960ee9eb98900201d3f823e5ca362d3a13..47976439518e6109f8b3ce4f5ead6a1e5ddf0353 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,6 +1,6 @@
<?php
function civicrmVersion( ) {
- return array( 'version' => '5.1.2',
+ return array( 'version' => '5.2.0',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/extern/authorizeIPN.php b/civicrm/extern/authorizeIPN.php
index 9022af0b5dce9d488931c26278a93b4d0a67eebd..2e35b0469567eb3eaac300380f31dc06ad6f5743 100644
--- a/civicrm/extern/authorizeIPN.php
+++ b/civicrm/extern/authorizeIPN.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/extern/cxn.php b/civicrm/extern/cxn.php
index bca69b17e41e682c876e000bc5702c73291ebea8..589745dc25bffe776ff6e12212e8a504619c24b7 100644
--- a/civicrm/extern/cxn.php
+++ b/civicrm/extern/cxn.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/extern/ipn.php b/civicrm/extern/ipn.php
index c3ded9a10a07e07252972d8d5e81fc3e9f03616a..269599001c9d70370347c9158553e204c9964f74 100644
--- a/civicrm/extern/ipn.php
+++ b/civicrm/extern/ipn.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/extern/rest.php b/civicrm/extern/rest.php
index ec5aa40c5087ccad0bb6ad43509e2416d47fe168..85c282354e7e7bec84727cdf6fabee5ee1109094 100644
--- a/civicrm/extern/rest.php
+++ b/civicrm/extern/rest.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/extern/soap.php b/civicrm/extern/soap.php
index e6f528b7e90d2a177a44e624f356be7ca660a7f3..7b7b473cb842e9bc4e4f73476e83a31fb38c9530 100644
--- a/civicrm/extern/soap.php
+++ b/civicrm/extern/soap.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/extern/widget.php b/civicrm/extern/widget.php
index 38c1eec4bfe45faa73783ed6d2b927e58b4dc2b5..9be3aef13bdcb6e2b29fe0d3cdc02fa4eb1edd80 100644
--- a/civicrm/extern/widget.php
+++ b/civicrm/extern/widget.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/install/civicrm.php b/civicrm/install/civicrm.php
index 591079d3cd73cb6a31f42d3617c1fb8b6d7c4ca7..bc0e608f2382e95dd829a016f7358feb4a91a314 100644
--- a/civicrm/install/civicrm.php
+++ b/civicrm/install/civicrm.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/js/crm.optionEdit.js b/civicrm/js/crm.optionEdit.js
index 1b1338ce00a793cca1f54b80241e7305cce9b634..20e01b7afdcbcbb6bb6976af17ab58f00ef5cf2e 100644
--- a/civicrm/js/crm.optionEdit.js
+++ b/civicrm/js/crm.optionEdit.js
@@ -30,10 +30,13 @@ jQuery(function($) {
*/
function rebuildOptions($existing, rebuilder) {
if ($existing.data('api-entity') && $existing.data('api-field')) {
- CRM.api3($existing.data('api-entity'), 'getoptions', {
+ var params = {
sequential: 1,
field: $existing.data('api-field')
- })
+ };
+ $.extend(params, $existing.data('option-edit-context'));
+
+ CRM.api3($existing.data('api-entity'), 'getoptions', params)
.done(function(data) {
rebuilder($existing, data.values);
});
diff --git a/civicrm/packages/Mail/mail.php b/civicrm/packages/Mail/mail.php
index db42ce1dbe569510c3e6d07ff9a5a161a0022a00..1c6ee09ea95b8d1ff25428c486c5cd4b82a7fcbe 100644
--- a/civicrm/packages/Mail/mail.php
+++ b/civicrm/packages/Mail/mail.php
@@ -116,7 +116,8 @@ class Mail_mail extends Mail {
{
if (defined('CIVICRM_MAIL_LOG')) {
CRM_Utils_Mail::logger($recipients, $headers, $body);
- if(!defined('CIVICRM_MAIL_LOG_AND SEND')) {
+ // Note: "CIVICRM_MAIL_LOG_AND SEND" (space not underscore) was a typo that existed for some years, so kept here for compatibility, but it should not be used.
+ if(!defined('CIVICRM_MAIL_LOG_AND_SEND') && !defined('CIVICRM_MAIL_LOG_AND SEND')) {
return true;
}
}
diff --git a/civicrm/packages/Mail/sendmail.php b/civicrm/packages/Mail/sendmail.php
index 374371ecceb61410470013b9401c8a4d64807306..c6e642620fc481fc13cac78b14047ff6e8ee1273 100644
--- a/civicrm/packages/Mail/sendmail.php
+++ b/civicrm/packages/Mail/sendmail.php
@@ -106,7 +106,8 @@ class Mail_sendmail extends Mail {
{
if (defined('CIVICRM_MAIL_LOG')) {
CRM_Utils_Mail::logger($recipients, $headers, $body);
- if(!defined('CIVICRM_MAIL_LOG_AND SEND')) {
+ // Note: "CIVICRM_MAIL_LOG_AND SEND" (space not underscore) was a typo that existed for some years, so kept here for compatibility, but it should not be used.
+ if(!defined('CIVICRM_MAIL_LOG_AND_SEND') && !defined('CIVICRM_MAIL_LOG_AND SEND')) {
return true;
}
}
diff --git a/civicrm/packages/Mail/smtp.php b/civicrm/packages/Mail/smtp.php
index 16099d40a9e58a4b2b6c1b3622ab88419b7db83d..bda1acfd1ce582698ed33804e97d9392299d02b2 100644
--- a/civicrm/packages/Mail/smtp.php
+++ b/civicrm/packages/Mail/smtp.php
@@ -246,7 +246,8 @@ class Mail_smtp extends Mail {
{
if (defined('CIVICRM_MAIL_LOG')) {
CRM_Utils_Mail::logger($recipients, $headers, $body);
- if(!defined('CIVICRM_MAIL_LOG_AND SEND')) {
+ // Note: "CIVICRM_MAIL_LOG_AND SEND" (space not underscore) was a typo that existed for some years, so kept here for compatibility, but it should not be used.
+ if(!defined('CIVICRM_MAIL_LOG_AND_SEND') && !defined('CIVICRM_MAIL_LOG_AND SEND')) {
return true;
}
}
diff --git a/civicrm/packages/kcfinder/core/class/uploader.php b/civicrm/packages/kcfinder/core/class/uploader.php
index 5b2c39a63bba4d27c45aede200eb2eab74fa338a..91e606cf6442b36800b3351716f2d2c22ca2cbf4 100644
--- a/civicrm/packages/kcfinder/core/class/uploader.php
+++ b/civicrm/packages/kcfinder/core/class/uploader.php
@@ -87,6 +87,10 @@ class uploader {
* @var string */
protected $cms = "";
+/** Ouput format.
+ * @var string */
+ protected $outputFormat = 'js';
+
/** Magic method which allows read-only access to protected or private class properties
* @param string $property
* @return mixed */
@@ -249,6 +253,11 @@ class uploader {
$this->typeURL = "{$this->config['uploadURL']}/{$this->type}";
}
+ // Output Format
+ if (isset($_GET['format'])) {
+ $this->outputFormat = $_GET['format'];
+ }
+
// HOST APPLICATIONS INIT
if (isset($_GET['CKEditorFuncNum'])) {
$this->opener['name'] = "ckeditor";
@@ -759,11 +768,18 @@ class uploader {
$js = $this->$method($url, $message);
}
- if (!isset($js))
+ if ($this->outputFormat == 'json') {
+ header('Content-Type: application/json');
+ $json = $this->callBack_json($url, $message);
+ echo json_encode($json);
+ }
+ else {
+ if (!isset($js)) {
$js = $this->callBack_default($url, $message);
-
- header("Content-Type: text/html; charset={$this->charset}");
- echo "<html><body>$js</body></html>";
+ }
+ header("Content-Type: text/html; charset={$this->charset}");
+ echo "<html><body>$js</body></html>";
+ }
}
protected function callBack_ckeditor($url, $message) {
@@ -817,6 +833,27 @@ if (window.opener) window.close();
protected function get_htaccess() {
return file_get_contents("conf/upload.htaccess");
}
+
+ protected function callBack_json($url, $message) {
+ $uploaded = !empty($url) ? 1 : 0;
+ $result = [
+ 'uploaded' => $uploaded
+ ];
+ if ($uploaded) {
+ $result['url'] = $url;
+ $urlPieces = explode('/', $url);
+ end($urlPieces);
+ $fileNamekey = key($urlPieces);
+ $result['fileName'] = $urlPieces[$fileNamekey];
+ }
+ else {
+ $result['error'] = [
+ 'message' => $message,
+ ];
+ }
+ return $result;
+ }
+
}
?>
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index cc16e4c21b5dafdab379631d00802e2f7a062e40..852e08ce3a02cc547da31bc0ead87283077679f0 100644
--- a/civicrm/release-notes.md
+++ b/civicrm/release-notes.md
@@ -14,6 +14,17 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress
+## CiviCRM 5.2.0
+
+Released June 6, 2018
+
+- **[Synopsis](release-notes/5.2.0.md#synopsis)**
+- **[Features](release-notes/5.2.0.md#features)**
+- **[Bugs resolved](release-notes/5.2.0.md#bugs)**
+- **[Miscellany](release-notes/5.2.0.md#misc)**
+- **[Credits](release-notes/5.2.0.md#credits)**
+- **[Feedback](release-notes/5.2.0.md#feedback)**
+
## CiviCRM 5.1.2
Released May 16, 2018
diff --git a/civicrm/release-notes/5.2.0.md b/civicrm/release-notes/5.2.0.md
new file mode 100644
index 0000000000000000000000000000000000000000..8c09ba5a1a7990bf532ce04269cf39fc243df946
--- /dev/null
+++ b/civicrm/release-notes/5.2.0.md
@@ -0,0 +1,503 @@
+# CiviCRM 5.2.0
+
+Released June 6, 2018
+
+- **[Synopsis](#synopsis)**
+- **[Features](#features)**
+- **[Bugs resolved](#bugs)**
+- **[Miscellany](#misc)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities? | no |
+| Change the database schema? | no |
+| Alter the API? | **yes** |
+| Require attention to configuration options? | no |
+| Fix problems installing or upgrading to a previous version? | no |
+| Introduce features? | **yes** |
+| Fix bugs? | **yes** |
+
+## <a name="features"></a>Features
+
+### Core CiviCRM
+
+- **[CRM-21753](https://issues.civicrm.org/jira/browse/CRM-21753) Support
+ 'criteria' in url on batch merge form
+ ([11658](https://github.com/civicrm/civicrm-core/pull/11658))**
+
+ A new `criteria` URL parameter for finding duplicate contacts allows you to
+ specify API criteria to only search for duplicates among a subset of contacts.
+
+- **Add New API Call To Get All Unique Fields For Given Entity
+ ([11990](https://github.com/civicrm/civicrm-core/pull/11990))**
+
+ This adds a new `getunique` API method that will go through the indexes of an
+ entity table and return all unique fields (including combination indexes).
+
+- **[CRM-21849](https://issues.civicrm.org/jira/browse/CRM-21849) Add Link To
+ Edit Relationship Types
+ ([11853](https://github.com/civicrm/civicrm-core/pull/11853))**
+
+ This change adds a settings button next to the Relationship Type field on the
+ Edit Relationship screen which allows you to edit relationship types.
+
+- **[dev/core#90](https://lab.civicrm.org/dev/core/issues/90) Apply disabling
+ Full Group By to reports
+ ([12047](https://github.com/civicrm/civicrm-core/pull/12047),
+ [12043](https://github.com/civicrm/civicrm-core/pull/12043))**
+
+ This applies the disabling of ONLY_FULL_GROUP_BY sql mode to reports and on
+ specific queries as needed to enable tests to run on MySQL 5.7
+
+- **[dev/core#66](https://lab.civicrm.org/dev/core/issues/66) Standardise
+ Address code in Contact summary report & enable links
+ ([11993](https://github.com/civicrm/civicrm-core/pull/11993))**
+
+ This change refactors the Address related code as part of a drive to get
+ addresses for multiple contacts in one report. This change adds prefixing
+ into the function used to add the columns, an approach taken from the Extended
+ Reports extension.
+
+- **[dev/translation#9](https://lab.civicrm.org/dev/translation/issues/9) Create
+ API Action to rebuild Multilingual Schema
+ ([11967](https://github.com/civicrm/civicrm-core/pull/11967))**
+
+ This change adds an API method called `System.rebuildmultilingualschema` to
+ allow users to rebuild the multilingual schema.
+
+- **Add 'addToDeveloperTab' in more places to expose sql in use (permission
+ limited) ([11947](https://github.com/civicrm/civicrm-core/pull/11947))**
+
+ The Database Log report includes a number of database queries besides the main
+ query. These populate temporary tables, among other things. The SQL for
+ these ancillary queries is now visible in the Developer tab alongside the main
+ query.
+
+- **Fix API template ([11970](https://github.com/civicrm/civicrm-core/pull/11970))**
+
+ This PR fixes structure and style of CiviCRM API explorer to make it look like
+ other pages to give unified interface between screens.
+
+### CiviContribute
+
+- **[dev/core#73](https://lab.civicrm.org/dev/core/issues/73) - Add invoice
+ number to bookkeeping report
+ ([12020](https://github.com/civicrm/civicrm-core/pull/12020))**
+
+ Invoice Number and Invoice Reference are now both available in the bookkeeping
+ transactions report. Before this change, only Invoice ID was shown as a column
+ in bookkeeping report.
+
+### CiviEvent
+
+- **[CRM-20879](https://issues.civicrm.org/jira/browse/CRM-20879) Extend
+ self-service event registration transfer to backend
+ ([10695](https://github.com/civicrm/civicrm-core/pull/10695))**
+
+ This change adds links to "Transfer or Cancel" an event registration when
+ viewing an event registration for a participant and when viewing a contact's
+ event registrations from the event tab on the contact's record.
+
+### CiviMail
+
+- **[dev/core#53](https://lab.civicrm.org/dev/core/issues/53) Add in stats to AB
+ tests and add in clickthrough and opened % stats to mailing reports
+ ([11957](https://github.com/civicrm/civicrm-core/pull/11957))**
+
+ This change adds Mailing delivery stat percentages to AB tests and also adds
+ in new opened and clickthrough rate stats.
+
+## <a name="bugs"></a>Bugs resolved
+
+### Core CiviCRM
+
+- **[dev/core#98](https://lab.civicrm.org/dev/core/issues/98) Searching by any
+ Address fields with location type other than primary throw DB error
+ ([12081](https://github.com/civicrm/civicrm-core/pull/12081))**
+
+ This change resolves a database error that would appear in Search Builder when
+ a user picks an address field with a location type other than "Primary".
+
+- **[dev/core#91](https://lab.civicrm.org/dev/core/issues/91) Search Builder
+ Improvements ([12058](https://github.com/civicrm/civicrm-core/pull/12058))**
+
+ On the Search Builder screen, this change limits the MySQL operators
+ available based on the type of field (string, date etc.).
+
+- **[dev/core#75](https://lab.civicrm.org/dev/core/issues/75) - warning message
+ after an activity is created
+ ([12027](https://github.com/civicrm/civicrm-core/pull/12027))**
+
+- **Translate strings in "Report" UI, et al
+ ([12009](https://github.com/civicrm/civicrm-core/pull/12009) and
+ [11988](https://github.com/civicrm/civicrm-core/pull/11988))**
+
+ A number of phrases, particularly in reports and CiviGrant, were not wrapped
+ in a translation function.
+
+- **Improve input handling in get-cases AJAX API
+ ([12017](https://github.com/civicrm/civicrm-core/pull/12017))**
+
+ Changes case type id and status id to be 'CommaSeparatedIntegers' instead of
+ 'String' to improve input handling in get-cases AJAX API.
+
+- **[CRM-19885](https://issues.civicrm.org/jira/browse/CRM-19885) Scheduled
+ Reminders: lack of default form values leads to SQL syntax error
+ ([11972](https://github.com/civicrm/civicrm-core/pull/11972))**
+
+ This fixes a regression from CRM-19853 where some fields were changed to text
+ input without defining default values. Specifically, the problem involved
+ integer fields start_action_offset, repetition_frequency_interval,
+ end_frequency_interval, which aren't required fields. Leaving these blank led
+ to `NULL` values in the database, which then led to SQL syntax errors.
+
+- **[dev/core#64](https://lab.civicrm.org/dev/core/issues/64) - In custom
+ searches, column headings are being ignored
+ ([12001](https://github.com/civicrm/civicrm-core/pull/12001))**
+
+ This change fixes a regression where for custom searches--ones that come
+ installed with core CiviCRM as well as user-defined ones--the column headings
+ defined in the custom search code were being ignored. This issue began in
+ CiviCRM 5.0.0.
+
+- **[dev/core#70](https://lab.civicrm.org/dev/core/issues/70) On any custom
+ search 'Print selected rows' action doesn't retain columns/values
+ ([12010](https://github.com/civicrm/civicrm-core/pull/12010))**
+
+- **[dev/core#48](https://lab.civicrm.org/dev/core/issues/48) Fix PDF Letter
+ only generates a single letter when multiple contact IDs are specified
+ ([11985](https://github.com/civicrm/civicrm-core/pull/11985))**
+
+ This change fixes a bug where when multiple contact IDs are specified via
+ print/merge task the PDFLetterCommon code overwrote them with a single contact
+ ID of the logged in user. This means that only a single PDF letter is
+ printed/generated. This PR only uses the logged in contact ID if no contact
+ IDs have been specified.
+
+- **[dev/core#59](https://lab.civicrm.org/dev/core/issues/59) scheduled reminder
+ email validation
+ ([11973](https://github.com/civicrm/civicrm-core/pull/11973))**
+
+ This change makes it so that the email address field on the scheduled reminder
+ form is validated. Before this change, a non-email value could be stored in
+ the field which would result in a silent failure.
+
+- **[CRM-20598](https://issues.civicrm.org/jira/browse/CRM-20598) Phone ext in
+ profile edit messing with address
+ ([11978](https://github.com/civicrm/civicrm-core/pull/11978))**
+
+ This change fixes a bug where when using a profile in edit mode with "Phone
+ and Extension" on primary field and some primary address fields (street, city,
+ country): it works fine the first time the profile is used, but it removes the
+ existing address when a user tries to use the profile a second time.
+
+- **AllCoreTables - Generate file every time
+ ([11755](https://github.com/civicrm/civicrm-core/pull/11755))**
+
+ The auto-generated file AllCoreTables was not being updated as often as
+ necessary, and the freshness checks were almost as expensive as just generating
+ the file, if not more, this was causing issues for the Attachment API. This
+ change makes it so the file is generated every time.
+
+- **Prevent hard-fail when section header / group by option chosen on logging
+ report ([11953](https://github.com/civicrm/civicrm-core/pull/11953))**
+
+- **[CRM-21855](https://issues.civicrm.org/jira/browse/CRM-21855) Editing "A"
+ side of relationship copies values to "B" side
+ ([11965](https://github.com/civicrm/civicrm-core/pull/11965))**
+
+ When editing a relationship type, values in the "Relationship A to B" column
+ were copied to the "Relationship B to A" column.
+
+- **[CRM-21523](https://issues.civicrm.org/jira/browse/CRM-21523) scheduled
+ reminders: when using repetition, require frequency intervals
+ ([11377](https://github.com/civicrm/civicrm-core/pull/11377))**
+
+- **Move help section outside the container
+ ([12031](https://github.com/civicrm/civicrm-core/pull/12031))**
+
+ This moves the help section markup on the Find and Merge Duplicate Contacts
+ page to preserve consistency among other screens.
+
+### CiviCase
+
+- **[CRM-21843](https://issues.civicrm.org/jira/browse/CRM-21843) Case
+ activities delimiter not working
+ ([11961](https://github.com/civicrm/civicrm-core/pull/11961))**
+
+ This change fixes a bug in exporting cases where the last column would contain
+ all the activity fields jammed together.
+
+- **Fix select2 value updation for crmAddName Directive
+ ([11979](https://github.com/civicrm/civicrm-core/pull/11979))**
+
+ This fixes a bug where the Case Type options selection field was not
+ populating properly.
+
+- **[dev/core#54](https://lab.civicrm.org/dev/core/issues/54) - Activity created
+ for case role relationship is not assigned to correct contact
+ ([11960](https://github.com/civicrm/civicrm-core/pull/11960))**
+
+ This change fixes a bug where if the user added a role for a case. The activity
+ created was assigned to the client instead of the relationship contact.
+
+- **[dev/core#137](https://lab.civicrm.org/dev/core/issues/137) Fix Find Deleted
+ Cases ([12219](https://github.com/civicrm/civicrm-core/pull/12219))**
+
+ Using the Find Cases search to find deleted cases would result in a fatal
+ error.
+
+### CiviContribute
+
+- **Fix contribution detail report to work with FULL GROUP BY mode
+ ([11954](https://github.com/civicrm/civicrm-core/pull/11954))**
+
+ This change makes it so the contribution detail report works in both full
+ group by and non full group by mode.
+
+- **[dev/core#78](https://lab.civicrm.org/dev/core/issues/78) - Incorrect
+ Payment Processor for Recurring Payments
+ ([12030](https://github.com/civicrm/civicrm-core/pull/12030))**
+
+ The Authorize.net instant payment notification (IPN) code did not properly
+ accommodate multiple Authorize.net payment processor instances and would
+ sometimes load the incorrect processor.
+
+- **[dev/core#72](https://lab.civicrm.org/dev/core/issues/72) fix payflow bug
+ for amount ([12019](https://github.com/civicrm/civicrm-core/pull/12019))**
+
+ Fixes a bug where PayflowPro throws an error due to more than 4 decimal places
+ in the amount.
+
+- **[CRM-19752](https://issues.civicrm.org/jira/browse/CRM-19752) Slow query
+ created by financial type acls
+ ([11657](https://github.com/civicrm/civicrm-core/pull/11657))**
+
+ This change is to improve financial ACL code that was unnecessarily slowing
+ down the contact dashboard on sites where financial ACLs are not enabled.
+ Financial ACL joins and conditions are no longer added where financial ACLs
+ are not enabled.
+
+- **[dev/financial#11](https://lab.civicrm.org/dev/financial/issues/11) email
+ invoice fails with validation error
+ ([11971](https://github.com/civicrm/civicrm-core/pull/11971))**
+
+ The "Email Invoice" action would result in an outgoing error message: The mail
+ library returned the following error message: Validation failed for: ""NAME"".
+
+- **Fix template for widget
+ ([11902](https://github.com/civicrm/civicrm-core/pull/11902))**
+
+ This fixes glitches in the Contribution Widget template so that the button is
+ aligned properly under it.
+
+- **Remove usage of deprecated paymentProcessorType function
+ ([12039](https://github.com/civicrm/civicrm-core/pull/12039))**
+
+ This cleans up and removes usage of the deprecated
+ `CRM_Core_PseudoConstant::paymentProcessorType` function.
+
+### CiviEvent
+
+- **Fix Soft credit personal note ton limit to 255 characters (DB limit).
+ ([12056](https://github.com/civicrm/civicrm-core/pull/12056))**
+
+ This change fixes a bug where when a user is donating on a CiviEvent Personal
+ Campaign page, checks the "Show my support in public honor roll", and puts a
+ message in the "Personal Note" box that is longer than 255 characters.
+ Submitting the donation would succeed, but the page threw a fatal error before
+ the receipt is sent.
+
+- **[dev/core#60](https://lab.civicrm.org/dev/core/issues/60) Fix for check
+ number no longer exposed dev/core/issues/60
+ ([12059](https://github.com/civicrm/civicrm-core/pull/12059))**
+
+ This change fixes a bug where the "Check number" was not showing on Pay Later
+ event registrations when edited.
+
+- **Fix: Batch update participants with checkboxes fails
+ ([12051](https://github.com/civicrm/civicrm-core/pull/12051))**
+
+ This change fixes a bug where when doing a batch update of participants
+ including a field that uses checkboxes the batch update fails.
+
+- **[dev/core#65](https://lab.civicrm.org/dev/core/issues/65) Fix issue where
+ source for participant could be entered w…
+ ([12014](https://github.com/civicrm/civicrm-core/pull/12014))**
+
+ This change fixes a bug where when one attempted to manually add a participant
+ to an event using the "Add event registration" tab on their CiviCRM profile, but
+ the screen wouldn't save, the page just stays frozen and fails to complete.
+
+- **[dev/core#68](https://lab.civicrm.org/dev/core/issues/68) Fix DB Error on
+ 'Find Participant' page when MySQL FULL_GROUP_BY_MODE is enabled
+ ([12120](https://github.com/civicrm/civicrm-core/pull/12120))**
+
+### CiviMail
+
+- **[dev/mail#13](https://lab.civicrm.org/dev/mail/issues/13) All unsubscribe
+ group members are excluded from a mailing with a manually specified
+ unsubscribe group (group_type=Base) if the unsubscribe group is a Smart group
+ ([12262](https://github.com/civicrm/civicrm-core/pull/12262))**
+
+- **[CRM-21194](https://issues.civicrm.org/jira/browse/CRM-21194) Unique clicks
+ in mailing report shows duplicates
+ ([10988](https://github.com/civicrm/civicrm-core/pull/10988))**
+
+- **[CRM-21100](https://issues.civicrm.org/jira/browse/CRM-21100) Empty list
+ shown in "Send test email to group" dropdown
+ ([10898](https://github.com/civicrm/civicrm-core/pull/10898))**
+
+- **[dev/core#86](https://lab.civicrm.org/dev/core/issues/86) Notify admin when
+ testing email if CIVICRM_MAIL_LOG_AND_SEND is set
+ ([12037](https://github.com/civicrm/civicrm-core/pull/12037) and [204](https://github.com/civicrm/civicrm-packages/pull/204))**
+
+ Now administrators are notified when `CIVICRM_MAIL_LOG_AND_SEND` is set just
+ as when `CIVICRM_MAIL_LOG` is set.
+
+### CiviMember
+
+- **Re-Fix Case form task (export/print not working) (replace quick fix with
+ proper fix) ([12110](https://github.com/civicrm/civicrm-core/pull/12110))**
+
+ This resolves a problem exporting from Advanced Search, displaying results as
+ Memberships, where the export options were for contacts, not memberships.
+
+- **[dev/core#100](https://lab.civicrm.org/dev/core/issues/100) Membership
+ Detail report throw DB error
+ ([12150](https://github.com/civicrm/civicrm-core/pull/12150))**
+
+ The Membership Detail report would throw a DB error due to the ACL clause
+ being applied twice.
+
+### Drupal integration
+
+- **Fix the contact merge form on Drupal 8
+ ([11992](https://github.com/civicrm/civicrm-core/pull/11992))**
+
+ This fixes a bug with Drupal 8 integrations where attempting to merge contacts
+ which are associated with Drupal users resulted in a fatal error.
+
+- **Drupal8 loadBootStrap: fix user variable
+ ([11958](https://github.com/civicrm/civicrm-core/pull/11958))**
+
+ This fixes an error when sending requests to the REST API endpoint because of
+ an incorrectly referenced variable.
+
+### WordPress Integration
+
+- **[CRM-21564](https://issues.civicrm.org/jira/browse/CRM-21564) Changing from
+ using exec to WP_CLI::Launch
+ ([119](https://github.com/civicrm/civicrm-wordpress/pull/119))**
+
+ This change moves from using `exec` to `WP_CLI::Launch` because `exec` does
+ not seem to be available on all systems. It also makes the code more
+ consistent for running external processes.
+
+## <a name="misc"></a>Miscellany
+
+- **[CRM-21037](https://issues.civicrm.org/jira/browse/CRM-21037) Add unit tests
+ for Activity sendSMS functions
+ ([10946](https://github.com/civicrm/civicrm-core/pull/10946))**
+
+- **[CRM-21148](https://issues.civicrm.org/jira/browse/CRM-21148) Refactor
+ "getFromTo()" functions
+ ([11887](https://github.com/civicrm/civicrm-core/pull/11887))**
+
+- **Fix (unreleased) regression on report pager
+ ([12080](https://github.com/civicrm/civicrm-core/pull/12080))**
+
+- **[NFC] FIx indenting in eventFees template
+ ([12062](https://github.com/civicrm/civicrm-core/pull/12062))**
+
+- **[NFC] Add metadata to describe personal note field
+ ([12046](https://github.com/civicrm/civicrm-core/pull/12046))**
+
+- **(NFC) Update version in header
+ ([11999](https://github.com/civicrm/civicrm-core/pull/11999))**
+
+- **[nfc] Consistently specify whether to clean money when calling from test
+ suite ([11959](https://github.com/civicrm/civicrm-core/pull/11959))**
+
+- **(NFC) Update version in header
+ ([530](https://github.com/civicrm/civicrm-drupal/pull/530))**
+
+- **(NFC) Fix Warnings When Updating Custom Entities
+ ([12033](https://github.com/civicrm/civicrm-core/pull/12033))**
+
+- **(NFC) Update version headers in `xml`, `tests`, `tools`, et al
+ ([12029](https://github.com/civicrm/civicrm-core/pull/12029))**
+
+- **5.1 ([12018](https://github.com/civicrm/civicrm-core/pull/12018))**
+
+- **[CRM-20459](https://issues.civicrm.org/jira/browse/CRM-20459) Actively
+ deprecate CRM_Core_OptionGroup::getValue
+ ([12049](https://github.com/civicrm/civicrm-core/pull/12049))**
+
+- **Rename function enableFullGroupByMode to be reenableFullGroupByMode t…
+ ([12064](https://github.com/civicrm/civicrm-core/pull/12064))**
+
+- **Remove unused code in CRM_Contribute_Form_ContributionPage_Amount::formRule
+ ([12054](https://github.com/civicrm/civicrm-core/pull/12054))**
+
+- **Add unit test to event batch update (includes function extraction to support
+ this) ([12048](https://github.com/civicrm/civicrm-core/pull/12048))**
+
+- **E-notice fix ([11982](https://github.com/civicrm/civicrm-core/pull/11982))**
+
+- **Extract custom data edit template code to shared template
+ ([11950](https://github.com/civicrm/civicrm-core/pull/11950))**
+
+- **Simple function extraction on editing Address (within main contact edit)
+ ([11900](https://github.com/civicrm/civicrm-core/pull/11900))**
+
+- **Allow KCFinder to send back a json encoded response instead of string…
+ ([203](https://github.com/civicrm/civicrm-packages/pull/203))**
+
+- **Mark Accent String Tests as incomplete if on a database that is not utf8
+ ([12060](https://github.com/civicrm/civicrm-core/pull/12060))**
+
+- **Add missing case type tests
+ ([12023](https://github.com/civicrm/civicrm-core/pull/12023))**
+
+- **Namespace exception in test
+ ([11986](https://github.com/civicrm/civicrm-core/pull/11986))**
+
+- **Fix intermittant test bug
+ ([11995](https://github.com/civicrm/civicrm-core/pull/11995))**
+
+- **(NFC) Add in 5.1.0 and 5.1.1 mysql upgrade files
+ ([12143](https://github.com/civicrm/civicrm-core/pull/12143))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following code authors:
+
+AGH Strategies - Andrew Hunt; Australian Greens - Seamus Lee; CiviCoop - Jaap
+Jansma; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; CompuCorp -
+Debarshi Bhaumik, Michael Devery, Mukesh Ram, René Olivo, Vinu Varshith Sekar;
+Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove; Fuzion - Jitendra Purohit; JMA
+Consulting - Monish Deb; Lighthouse Design and Consulting - Brian Shaughnessy;
+Megaphone Technology Consulting - Jon Goldberg; MJW Consulting - Matthew Wire;
+myDropWizard - David Snopek; Progressive Technology Project - Jamie McClelland;
+Tom Bloor; Wikimedia Foundation - Eileen McNaughton
+
+Most authors also reviewed code for this release; in addition, the following
+reviewers contributed their comments:
+
+Alexander Ferreras; Chris Burgess; Christian Wach; CiviCoop - Klaas Eikelboom;
+Coop SymbioTIC - Stéphane Lussier; Donald Hirst; Fuzion - Peter Davis; GMCVO
+Databases - Jon-Man Cheung; JMA Consulting - Joe Murray; Joinery - Allen Shaw;
+Left Join Labs - Sean Madsen; Lemniscus - Noah Miller; Nubay Services - David
+Tarrant; Pradeep Nayak; Semper IT - Karin Gerritsen; small biz; Tadpole
+Collective - Kevin Cristiano; Third Sector Design - Michael McAndrew
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Alice Frumin and Andrew Hunt. If you'd like
+to provide feedback on them, please login to https://chat.civicrm.org/civicrm
+and contact `@agh1`.
diff --git a/civicrm/settings/Address.setting.php b/civicrm/settings/Address.setting.php
index 417788353b6a4509d6ba132b702ccf5f26ac91d2..6ea9ea29f98dd0bd7988ec9845b115c86b2753ed 100644
--- a/civicrm/settings/Address.setting.php
+++ b/civicrm/settings/Address.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Campaign.setting.php b/civicrm/settings/Campaign.setting.php
index 287fbf9e2ce783495c7a23ba23e74ad67a605aea..e3d2ea40784db183991f88d3159a75376557a923 100644
--- a/civicrm/settings/Campaign.setting.php
+++ b/civicrm/settings/Campaign.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Case.setting.php b/civicrm/settings/Case.setting.php
index 77ada717515530e7992d92f5ef79244ba79cdff4..c4f4772e82b4e3bb6e316907faa0ec599032d360 100644
--- a/civicrm/settings/Case.setting.php
+++ b/civicrm/settings/Case.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Contribute.setting.php b/civicrm/settings/Contribute.setting.php
index a9b510998806472f3730b7befc684d7c5f085935..c91cec28dbea8fe4968db9fc6c86f5021b316f12 100644
--- a/civicrm/settings/Contribute.setting.php
+++ b/civicrm/settings/Contribute.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Core.setting.php b/civicrm/settings/Core.setting.php
index a205b161fb4a994dd853167b47b5aac5ade93263..0efc087dac7997ce85808a62e8cf56e1d55a5ff0 100644
--- a/civicrm/settings/Core.setting.php
+++ b/civicrm/settings/Core.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
@@ -974,6 +974,7 @@ return array(
'type' => 'Array',
'add' => '4.7',
'is_domain' => 1,
+ 'is_contact' => 0,
'default' => array(),
'title' => 'Do not notify assignees for',
'help_text' => 'These activity types will be excluded from automated email notifications to assignees.',
diff --git a/civicrm/settings/Developer.setting.php b/civicrm/settings/Developer.setting.php
index 9a47e7916e62a4395ed69f6d499bc3e0fd649f06..df66912bda4e58d990db2670a55a3b9876f91a59 100644
--- a/civicrm/settings/Developer.setting.php
+++ b/civicrm/settings/Developer.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Directory.setting.php b/civicrm/settings/Directory.setting.php
index 7333d0e59aefc354fcef13167f170ad4e82c2216..c8fce022cdccc438254b59d2d1716bf7b2386301 100644
--- a/civicrm/settings/Directory.setting.php
+++ b/civicrm/settings/Directory.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Event.setting.php b/civicrm/settings/Event.setting.php
index 44c116527e7d46fee7d26d523f40b167e7a7d0bc..9c8312073ed94440c89870541a3160b0277653f0 100644
--- a/civicrm/settings/Event.setting.php
+++ b/civicrm/settings/Event.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Extension.setting.php b/civicrm/settings/Extension.setting.php
index 2961a04813db8412284b8135cc957418f3bd0d46..75b1581a58f650ac90392461eae6431645c3fb1c 100644
--- a/civicrm/settings/Extension.setting.php
+++ b/civicrm/settings/Extension.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Localization.setting.php b/civicrm/settings/Localization.setting.php
index 76cc771d779be118871cc6ee77f999debf105d48..d19176ca1d3bfbffbec15287a3d829d8605f5015 100644
--- a/civicrm/settings/Localization.setting.php
+++ b/civicrm/settings/Localization.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Mailing.setting.php b/civicrm/settings/Mailing.setting.php
index e38584c89f3264af810b3102448dab3859a21d7a..691da48ee93e93fe6b8414b38515e4a5cb9f5238 100644
--- a/civicrm/settings/Mailing.setting.php
+++ b/civicrm/settings/Mailing.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Map.setting.php b/civicrm/settings/Map.setting.php
index 933a9ad42f8e534c56ab5307a07c04abe9250fc1..a465b253e0cc79bc07c2342e7c8b70850ec0aee4 100644
--- a/civicrm/settings/Map.setting.php
+++ b/civicrm/settings/Map.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Member.setting.php b/civicrm/settings/Member.setting.php
index 819aa401d7f52670c5d7bc52b8a4da06d247bdd5..f2a8962b7a7c8d48801a3a55524384f7dbfb231c 100644
--- a/civicrm/settings/Member.setting.php
+++ b/civicrm/settings/Member.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Multisite.setting.php b/civicrm/settings/Multisite.setting.php
index c26ba2cd006230b1508fd52f93ed0e0532705a67..4a1a3b85a0006bd5f2aa95ce232bc5067b18532b 100644
--- a/civicrm/settings/Multisite.setting.php
+++ b/civicrm/settings/Multisite.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Search.setting.php b/civicrm/settings/Search.setting.php
index 6cc84b3f6123e8de090df818de58835f7a0daa35..0f805195e1e9be862c9b9e98102a6540b2959053 100644
--- a/civicrm/settings/Search.setting.php
+++ b/civicrm/settings/Search.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/settings/Url.setting.php b/civicrm/settings/Url.setting.php
index 142d7d94cde14f2d90817b93042842cb1bd33665..f5c43bc6107e2f3b579c8b1421431ab370795808 100644
--- a/civicrm/settings/Url.setting.php
+++ b/civicrm/settings/Url.setting.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
diff --git a/civicrm/sql/case_sample.mysql b/civicrm/sql/case_sample.mysql
index fa0561c499db1d4c4e9e18ea578b7c6c3c0181ae..e504c6c2855b9e231e80245c25aa6d0b1b0416e4 100644
--- a/civicrm/sql/case_sample.mysql
+++ b/civicrm/sql/case_sample.mysql
@@ -84,4 +84,4 @@ SELECT 'Benefits Specialist is', 'Benefits Specialist is', 'Benefits Specialist'
-- *
-- *******************************************************/
-INSERT INTO `civicrm_group` ( `name`, `title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `parents`, `children`, `is_hidden` ) (SELECT 'Case_Resources', 'Case Resources', 'Contacts in this group are listed with their phone number and email when viewing case. You also can send copies of case activities to these contacts.', NULL, NULL, 1, 'User and User Admin Only', ' ( `civicrm_group_contact-5`.group_id IN ( 5 ) AND `civicrm_group_contact-5`.status IN ("Added") ) ', 'a:10:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:22:"civicrm_state_province";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:25:"`civicrm_group_contact-5`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-5` ON contact_a.id = `civicrm_group_contact-5`.contact_id ";s:6:"gender";i:1;}', 'a:2:{s:15:"civicrm_contact";i:1;s:25:"`civicrm_group_contact-5`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-5` ON contact_a.id = `civicrm_group_contact-5`.contact_id ";}', '2', NULL, NULL, NULL, 0 FROM dual WHERE NOT EXISTS (SELECT * FROM `civicrm_group` WHERE `name` = 'Case_Resources'));
\ No newline at end of file
+INSERT INTO `civicrm_group` ( `name`, `title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `parents`, `children`, `is_hidden` ) (SELECT 'Case_Resources', 'Case Resources', 'Contacts in this group are listed with their phone number and email when viewing case. You also can send copies of case activities to these contacts.', NULL, NULL, 1, 'User and User Admin Only', ' ( `civicrm_group_contact-5`.group_id IN ( 5 ) AND `civicrm_group_contact-5`.status IN ("Added") ) ', 'a:10:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:22:"civicrm_state_province";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:25:"`civicrm_group_contact-5`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-5` ON contact_a.id = `civicrm_group_contact-5`.contact_id ";s:6:"gender";i:1;}', 'a:2:{s:15:"civicrm_contact";i:1;s:25:"`civicrm_group_contact-5`";s:114:" LEFT JOIN civicrm_group_contact `civicrm_group_contact-5` ON contact_a.id = `civicrm_group_contact-5`.contact_id ";}', '2', NULL, NULL, NULL, 0 FROM dual WHERE NOT EXISTS (SELECT * FROM `civicrm_group` WHERE `name` = 'Case_Resources'));
diff --git a/civicrm/sql/civicrm.mysql b/civicrm/sql/civicrm.mysql
index d19c7b2dda10511267d52d143322c0f4ebf67bd7..41d7dbdb15b7171d88756b57b6a4dd3488e61c6d 100644
--- a/civicrm/sql/civicrm.mysql
+++ b/civicrm/sql/civicrm.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -28,7 +28,7 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -3601,15 +3601,15 @@ CREATE TABLE `civicrm_action_schedule` (
`limit_to` tinyint COMMENT 'Is this the recipient criteria limited to OR in addition to?',
`entity_value` varchar(255) COMMENT 'Entity value',
`entity_status` varchar(64) COMMENT 'Entity status',
- `start_action_offset` int unsigned COMMENT 'Reminder Interval.',
+ `start_action_offset` int unsigned DEFAULT 0 COMMENT 'Reminder Interval.',
`start_action_unit` varchar(8) COMMENT 'Time units for reminder.',
`start_action_condition` varchar(64) COMMENT 'Reminder Action',
`start_action_date` varchar(64) COMMENT 'Entity date',
`is_repeat` tinyint DEFAULT 0 ,
`repetition_frequency_unit` varchar(8) COMMENT 'Time units for repetition of reminder.',
- `repetition_frequency_interval` int unsigned COMMENT 'Time interval for repeating the reminder.',
+ `repetition_frequency_interval` int unsigned DEFAULT 0 COMMENT 'Time interval for repeating the reminder.',
`end_frequency_unit` varchar(8) COMMENT 'Time units till repetition of reminder.',
- `end_frequency_interval` int unsigned COMMENT 'Time interval till repeating the reminder.',
+ `end_frequency_interval` int unsigned DEFAULT 0 COMMENT 'Time interval till repeating the reminder.',
`end_action` varchar(32) COMMENT 'Reminder Action till repeating the reminder.',
`end_date` varchar(64) COMMENT 'Entity end date',
`is_active` tinyint DEFAULT 1 COMMENT 'Is this option active?',
@@ -4985,4 +4985,4 @@ CREATE TABLE `civicrm_line_item` (
, CONSTRAINT FK_civicrm_line_item_contribution_id FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE SET NULL, CONSTRAINT FK_civicrm_line_item_price_field_id FOREIGN KEY (`price_field_id`) REFERENCES `civicrm_price_field`(`id`) ON DELETE SET NULL, CONSTRAINT FK_civicrm_line_item_price_field_value_id FOREIGN KEY (`price_field_value_id`) REFERENCES `civicrm_price_field_value`(`id`) ON DELETE SET NULL, CONSTRAINT FK_civicrm_line_item_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL
) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-
\ No newline at end of file
+
diff --git a/civicrm/sql/civicrm_acl.mysql b/civicrm/sql/civicrm_acl.mysql
index b701b35230c36458228e0fc3bcc37934d7cee403..2491afe82bae20fa412b624da362ca40d83a26a8 100644
--- a/civicrm/sql/civicrm_acl.mysql
+++ b/civicrm/sql/civicrm_acl.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -103,4 +103,4 @@ INSERT INTO civicrm_group (`id`, `name`, `title`, `description`, `source`, `save
INSERT INTO civicrm_acl_entity_role
(`acl_role_id`, `entity_table`, `entity_id`, `is_active`)
VALUES
- (1, 'civicrm_group', 1, 1);
\ No newline at end of file
+ (1, 'civicrm_group', 1, 1);
diff --git a/civicrm/sql/civicrm_case_sql.mysql b/civicrm/sql/civicrm_case_sql.mysql
index a267541c78142d489332a8a7772a3835a98b9232..2da79d584c52385b110a4264f9e50b90cb66d2db 100644
--- a/civicrm/sql/civicrm_case_sql.mysql
+++ b/civicrm/sql/civicrm_case_sql.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2017 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index fad0a8d794dfa02f98e3296486d76e58d59bd76a..48f5c517ae7d8d6665b8be372928ada4079bd9dd 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -295,7 +295,7 @@ INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1252", "Saint Barthélemy", "BL", "2", "0");
INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1253", "Saint Martin (French part)", "MF", "2", "0");
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -4418,7 +4418,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
(NULL, 1080, "08", "Ogooué-Maritime"),
(NULL, 1080, "09", "Woleu-Ntem");
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -4631,7 +4631,7 @@ INSERT INTO civicrm_currency (id, name, symbol, numeric_code, full_name) VALUES
(184, "ZMK", NULL, "894", "Zambian Kwacha"),
(185, "ZWD", "Z$", "716", "Zimbabwe Dollar");
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -6470,7 +6470,7 @@ INSERT INTO `civicrm_contact_type`
( 3, 'Organization', 'Organization', NULL, NULL, 1, 1);
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -23143,7 +23143,7 @@ VALUES
(@option_group_id_soft_credit_type , 'Personal Campaign Page', 10, 'pcp', 10, 0, 1, 1),
(@option_group_id_soft_credit_type , 'Gift', 11, 'gift', 11, 0, 1, 1);
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -23961,4 +23961,4 @@ INSERT INTO `civicrm_report_instance`
( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
VALUES
( @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
-UPDATE civicrm_domain SET version = '5.1.2';
+UPDATE civicrm_domain SET version = '5.2.0';
diff --git a/civicrm/sql/civicrm_demo_processor.mysql b/civicrm/sql/civicrm_demo_processor.mysql
index f9c1d4689f950541dd5a7f63bf4091c2fe32ae06..300f06f9db85a2f5dc51b22dc8cf078b18acdf70 100644
--- a/civicrm/sql/civicrm_demo_processor.mysql
+++ b/civicrm/sql/civicrm_demo_processor.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2017 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/sql/civicrm_devel_config.mysql b/civicrm/sql/civicrm_devel_config.mysql
index 96a58861587c5c24d44613a0ef7bd8968454bacc..7a0a5a07ebe9fdd323f5be8500ab22f2db8eb98d 100644
--- a/civicrm/sql/civicrm_devel_config.mysql
+++ b/civicrm/sql/civicrm_devel_config.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2017 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/sql/civicrm_drop.mysql b/civicrm/sql/civicrm_drop.mysql
index 8b71665041cac4ca3eb55d787665cc23a30a6085..1f38187ae46cf0def7f20dea81919d6bb2f66660 100644
--- a/civicrm/sql/civicrm_drop.mysql
+++ b/civicrm/sql/civicrm_drop.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -186,4 +186,4 @@ DROP TABLE IF EXISTS `civicrm_file`;
DROP TABLE IF EXISTS `civicrm_extension`;
DROP TABLE IF EXISTS `civicrm_address_format`;
-SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
+SET FOREIGN_KEY_CHECKS=1;
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index b74dad99afdda0d62f65f619a85d607f307829bb..e00963195f6890dfbf18828f44e38d2537b463e1 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -398,7 +398,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.1.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.2.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
@@ -703,7 +703,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_mailing_bounce_pattern` WRITE;
/*!40000 ALTER TABLE `civicrm_mailing_bounce_pattern` DISABLE KEYS */;
-INSERT INTO `civicrm_mailing_bounce_pattern` (`id`, `bounce_type_id`, `pattern`) VALUES (1,1,'Client TOS Notification'),(2,2,'(be|am)? (out of|away from) (the|my)? (office|computer|town)'),(3,2,'i am on vacation'),(4,3,'name(server entry| lookup failure)'),(5,3,'no (mail server|matches to nameserver query|dns entries)'),(6,3,'reverse dns entry'),(7,3,'Host or domain name not found'),(8,3,'Unable to resolve MX record for'),(9,4,'(unknown|not local) host'),(10,4,'all hosts have been failing'),(11,4,'allowed rcpthosts'),(12,4,'connection (refused|timed out)'),(13,4,'not connected'),(14,4,'couldn\'t find any host named'),(15,4,'error involving remote host'),(16,4,'host unknown'),(17,4,'invalid host name'),(18,4,'isn\'t in my control/locals file'),(19,4,'local configuration error'),(20,4,'not a gateway'),(21,4,'server is (down or unreachable|not responding)'),(22,4,'too many connections'),(23,4,'unable to connect'),(24,4,'lost connection'),(25,4,'conversation with [^ ]* timed out while'),(26,4,'server requires authentication'),(27,4,'authentication (is )?required'),(28,5,'(my )?e-?mail( address)? has changed'),(29,5,'account (inactive|expired|deactivated)'),(30,5,'account is locked'),(31,5,'changed w+( e-?mail)? address'),(32,5,'deactivated mailbox'),(33,5,'disabled or discontinued'),(34,5,'inactive user'),(35,5,'is inactive on this domain'),(36,5,'mail receiving disabled'),(37,5,'mail( ?)address is administrative?ly disabled'),(38,5,'mailbox (temporarily disabled|currently suspended)'),(39,5,'no longer (accepting mail|on server|in use|with|employed|on staff|works for|using this account)'),(40,5,'not accepting (mail|messages)'),(41,5,'please use my new e-?mail address'),(42,5,'this address no longer accepts mail'),(43,5,'user account suspended'),(44,5,'account that you tried to reach is disabled'),(45,5,'User banned'),(46,6,'(user|recipient( name)?) is not recognized'),(47,6,'554 delivery error'),(48,6,'address does not exist'),(49,6,'address(es)?( you (entered|specified))? (could|was)( not|n.t)( be)? found'),(50,6,'address(ee)? (unknown|invalid)'),(51,6,'bad destination'),(52,6,'badly formatted address'),(53,6,'can\'t open mailbox for'),(54,6,'cannot deliver'),(55,6,'delivery to the following recipient(s)? failed'),(56,6,'destination addresses were unknown'),(57,6,'did not reach the following recipient'),(58,6,'does not exist'),(59,6,'does not like recipient'),(60,6,'does not specify a valid notes mail file'),(61,6,'illegal alias'),(62,6,'invalid (mailbox|(e-?mail )?address|recipient|final delivery)'),(63,6,'invalid( or unknown)?( virtual)? user'),(64,6,'(mail )?delivery (to this user )?is not allowed'),(65,6,'mailbox (not found|unavailable|name not allowed)'),(66,6,'message could not be forwarded'),(67,6,'missing or malformed local(-| )part'),(68,6,'no e-?mail address registered'),(69,6,'no such (mail drop|mailbox( \\w+)?|(e-?mail )?address|recipient|(local )?user|person)( here)?'),(70,6,'no mailbox (here )?by that name'),(71,6,'not (listed in|found in directory|known at this site|our customer)'),(72,6,'not a valid( (user|mailbox))?'),(73,6,'not present in directory entry'),(74,6,'recipient (does not exist|(is )?unknown|rejected|denied|not found)'),(75,6,'this user doesn\'t have a yahoo.com address'),(76,6,'unavailable to take delivery of the message'),(77,6,'unavailable mailbox'),(78,6,'unknown (local( |-)part|recipient|address error)'),(79,6,'unknown( or illegal)? user( account)?'),(80,6,'unrecognized recipient'),(81,6,'unregistered address'),(82,6,'user (unknown|does not exist)'),(83,6,'user doesn\'t have an? w+ account'),(84,6,'user(\'s e-?mail name is)? not found'),(85,6,'^Validation failed for:'),(86,6,'5.1.2 Address rejected'),(87,6,'no valid recipients?'),(88,6,'RecipNotFound'),(89,6,'no one at this address'),(90,6,'misconfigured forwarding address'),(91,6,'account is not allowed'),(92,6,'Address .<[^>]*>. not known here'),(93,6,'Recipient address rejected: ([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}'),(94,6,'Non sono riuscito a trovare l.indirizzo e-mail'),(95,6,'nadie con esta direcci..?n'),(96,6,'ni bilo mogo..?e najti prejemnikovega e-po..?tnega naslova'),(97,6,'Elektronski naslov (je ukinjen|ne obstaja)'),(98,6,'nepravilno nastavljen predal'),(99,7,'(mail( forwarding)?|routing).loop'),(100,7,'excessive recursion'),(101,7,'loop detected'),(102,7,'maximum hop count exceeded'),(103,7,'message was forwarded more than the maximum allowed times'),(104,7,'too many (hops|recursive forwards)'),(105,8,'(disk(space)?|over the allowed|exceed(ed|s)?|storage) quota'),(106,8,'522_mailbox_full'),(107,8,'exceeds allowed message count'),(108,8,'file too large'),(109,8,'full mailbox'),(110,8,'(mail|in)(box|folder) ((for user \\w+ )?is )?full'),(111,8,'mailbox (has exceeded|is over) the limit'),(112,8,'mailbox( exceeds allowed)? size'),(113,8,'no space left for this user'),(114,8,'over\\s?quota'),(115,8,'quota (for the mailbox )?has been exceeded'),(116,8,'quota ?(usage|violation|exceeded)'),(117,8,'recipient storage full'),(118,8,'not able to receive more mail'),(119,8,'doesn.t have enough disk space left'),(120,8,'exceeded storage allocation'),(121,8,'running out of disk space'),(122,9,'cannot find your hostname'),(123,9,'ip name lookup'),(124,9,'not configured to relay mail'),(125,9,'relay(ing)? (not permitted|(access )?denied)'),(126,9,'relayed mail to .+? not allowed'),(127,9,'sender ip must resolve'),(128,9,'unable to relay'),(129,9,'No route to host'),(130,9,'Network is unreachable'),(131,9,'unrouteable address'),(132,9,'We don.t handle mail for'),(133,9,'we do not relay'),(134,9,'Rejected by next-hop'),(135,9,'not permitted to( *550)? relay through this server'),(136,10,'(bulk( e-?mail)|content|attachment blocking|virus|mail system) filters?'),(137,10,'(hostile|questionable|unacceptable) content'),(138,10,'address .+? has not been verified'),(139,10,'anti-?spam (policw+|software)'),(140,10,'anti-?virus gateway has detected'),(141,10,'blacklisted'),(142,10,'blocked message'),(143,10,'content control'),(144,10,'delivery not authorized'),(145,10,'does not conform to our e-?mail policy'),(146,10,'excessive spam content'),(147,10,'message looks suspicious'),(148,10,'open relay'),(149,10,'sender was rejected'),(150,10,'spam(check| reduction software| filters?)'),(151,10,'blocked by a user configured filter'),(152,10,'(detected|rejected) (as|due to) spam'),(153,10,'X-HmXmrOriginalRecipient'),(154,10,'Client host .[^ ]*. blocked'),(155,10,'automatic(ally-generated)? messages are not accepted'),(156,10,'denied by policy'),(157,10,'has no corresponding reverse \\(PTR\\) address'),(158,10,'has a policy that( [^ ]*)? prohibited the mail that you sent'),(159,10,'is likely unsolicited mail'),(160,10,'Local Policy Violation'),(161,10,'ni bilo mogo..?e dostaviti zaradi varnostnega pravilnika'),(162,10,'abuse report'),(163,11,'nonstandard smtp line terminator'),(164,11,'syntax error in from address'),(165,11,'unknown smtp code');
+INSERT INTO `civicrm_mailing_bounce_pattern` (`id`, `bounce_type_id`, `pattern`) VALUES (1,1,'Client TOS Notification'),(2,2,'(be|am)? (out of|away from) (the|my)? (office|computer|town)'),(3,2,'i am on vacation'),(4,3,'name(server entry| lookup failure)'),(5,3,'no (mail server|matches to nameserver query|dns entries)'),(6,3,'reverse dns entry'),(7,3,'Host or domain name not found'),(8,3,'Unable to resolve MX record for'),(9,4,'(unknown|not local) host'),(10,4,'all hosts have been failing'),(11,4,'allowed rcpthosts'),(12,4,'connection (refused|timed out)'),(13,4,'not connected'),(14,4,'couldn\'t find any host named'),(15,4,'error involving remote host'),(16,4,'host unknown'),(17,4,'invalid host name'),(18,4,'isn\'t in my control/locals file'),(19,4,'local configuration error'),(20,4,'not a gateway'),(21,4,'server is (down or unreachable|not responding)'),(22,4,'too many connections'),(23,4,'unable to connect'),(24,4,'lost connection'),(25,4,'conversation with [^ ]* timed out while'),(26,4,'server requires authentication'),(27,4,'authentication (is )?required'),(28,5,'(my )?e-?mail( address)? has changed'),(29,5,'account (inactive|expired|deactivated)'),(30,5,'account is locked'),(31,5,'changed w+( e-?mail)? address'),(32,5,'deactivated mailbox'),(33,5,'disabled or discontinued'),(34,5,'inactive user'),(35,5,'is inactive on this domain'),(36,5,'mail receiving disabled'),(37,5,'mail( ?)address is administrative?ly disabled'),(38,5,'mailbox (temporarily disabled|currently suspended)'),(39,5,'no longer (accepting mail|on server|in use|with|employed|on staff|works for|using this account)'),(40,5,'not accepting (mail|messages)'),(41,5,'please use my new e-?mail address'),(42,5,'this address no longer accepts mail'),(43,5,'user account suspended'),(44,5,'account that you tried to reach is disabled'),(45,5,'User banned'),(46,6,'(user|recipient( name)?) is not recognized'),(47,6,'554 delivery error'),(48,6,'address does not exist'),(49,6,'address(es)?( you (entered|specified))? (could|was)( not|n.t)( be)? found'),(50,6,'address(ee)? (unknown|invalid)'),(51,6,'bad destination'),(52,6,'badly formatted address'),(53,6,'can\'t open mailbox for'),(54,6,'cannot deliver'),(55,6,'delivery to the following recipient(s)? failed'),(56,6,'destination addresses were unknown'),(57,6,'did not reach the following recipient'),(58,6,'does not exist'),(59,6,'does not like recipient'),(60,6,'does not specify a valid notes mail file'),(61,6,'illegal alias'),(62,6,'invalid (mailbox|(e-?mail )?address|recipient|final delivery)'),(63,6,'invalid( or unknown)?( virtual)? user'),(64,6,'(mail )?delivery (to this user )?is not allowed'),(65,6,'mailbox (not found|unavailable|name not allowed)'),(66,6,'message could not be forwarded'),(67,6,'missing or malformed local(-| )part'),(68,6,'no e-?mail address registered'),(69,6,'no such (mail drop|mailbox( \\w+)?|(e-?mail )?address|recipient|(local )?user|person)( here)?'),(70,6,'no mailbox (here )?by that name'),(71,6,'not (listed in|found in directory|known at this site|our customer)'),(72,6,'not a valid( (user|mailbox))?'),(73,6,'not present in directory entry'),(74,6,'recipient (does not exist|(is )?unknown|rejected|denied|not found)'),(75,6,'this user doesn\'t have a yahoo.com address'),(76,6,'unavailable to take delivery of the message'),(77,6,'unavailable mailbox'),(78,6,'unknown (local( |-)part|recipient|address error)'),(79,6,'unknown( or illegal)? user( account)?'),(80,6,'unrecognized recipient'),(81,6,'unregistered address'),(82,6,'user (unknown|does not exist)'),(83,6,'user doesn\'t have an? w+ account'),(84,6,'user(\'s e-?mail name is)? not found'),(85,6,'^Validation failed for:'),(86,6,'5.1.0 Address rejected'),(87,6,'no valid recipients?'),(88,6,'RecipNotFound'),(89,6,'no one at this address'),(90,6,'misconfigured forwarding address'),(91,6,'account is not allowed'),(92,6,'Address .<[^>]*>. not known here'),(93,6,'Recipient address rejected: ([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}'),(94,6,'Non sono riuscito a trovare l.indirizzo e-mail'),(95,6,'nadie con esta direcci..?n'),(96,6,'ni bilo mogo..?e najti prejemnikovega e-po..?tnega naslova'),(97,6,'Elektronski naslov (je ukinjen|ne obstaja)'),(98,6,'nepravilno nastavljen predal'),(99,7,'(mail( forwarding)?|routing).loop'),(100,7,'excessive recursion'),(101,7,'loop detected'),(102,7,'maximum hop count exceeded'),(103,7,'message was forwarded more than the maximum allowed times'),(104,7,'too many (hops|recursive forwards)'),(105,8,'(disk(space)?|over the allowed|exceed(ed|s)?|storage) quota'),(106,8,'522_mailbox_full'),(107,8,'exceeds allowed message count'),(108,8,'file too large'),(109,8,'full mailbox'),(110,8,'(mail|in)(box|folder) ((for user \\w+ )?is )?full'),(111,8,'mailbox (has exceeded|is over) the limit'),(112,8,'mailbox( exceeds allowed)? size'),(113,8,'no space left for this user'),(114,8,'over\\s?quota'),(115,8,'quota (for the mailbox )?has been exceeded'),(116,8,'quota ?(usage|violation|exceeded)'),(117,8,'recipient storage full'),(118,8,'not able to receive more mail'),(119,8,'doesn.t have enough disk space left'),(120,8,'exceeded storage allocation'),(121,8,'running out of disk space'),(122,9,'cannot find your hostname'),(123,9,'ip name lookup'),(124,9,'not configured to relay mail'),(125,9,'relay(ing)? (not permitted|(access )?denied)'),(126,9,'relayed mail to .+? not allowed'),(127,9,'sender ip must resolve'),(128,9,'unable to relay'),(129,9,'No route to host'),(130,9,'Network is unreachable'),(131,9,'unrouteable address'),(132,9,'We don.t handle mail for'),(133,9,'we do not relay'),(134,9,'Rejected by next-hop'),(135,9,'not permitted to( *550)? relay through this server'),(136,10,'(bulk( e-?mail)|content|attachment blocking|virus|mail system) filters?'),(137,10,'(hostile|questionable|unacceptable) content'),(138,10,'address .+? has not been verified'),(139,10,'anti-?spam (policw+|software)'),(140,10,'anti-?virus gateway has detected'),(141,10,'blacklisted'),(142,10,'blocked message'),(143,10,'content control'),(144,10,'delivery not authorized'),(145,10,'does not conform to our e-?mail policy'),(146,10,'excessive spam content'),(147,10,'message looks suspicious'),(148,10,'open relay'),(149,10,'sender was rejected'),(150,10,'spam(check| reduction software| filters?)'),(151,10,'blocked by a user configured filter'),(152,10,'(detected|rejected) (as|due to) spam'),(153,10,'X-HmXmrOriginalRecipient'),(154,10,'Client host .[^ ]*. blocked'),(155,10,'automatic(ally-generated)? messages are not accepted'),(156,10,'denied by policy'),(157,10,'has no corresponding reverse \\(PTR\\) address'),(158,10,'has a policy that( [^ ]*)? prohibited the mail that you sent'),(159,10,'is likely unsolicited mail'),(160,10,'Local Policy Violation'),(161,10,'ni bilo mogo..?e dostaviti zaradi varnostnega pravilnika'),(162,10,'abuse report'),(163,11,'nonstandard smtp line terminator'),(164,11,'syntax error in from address'),(165,11,'unknown smtp code');
/*!40000 ALTER TABLE `civicrm_mailing_bounce_pattern` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1473,7 +1473,7 @@ UNLOCK TABLES;
-- Dump completed on 2018-01-12 9:52:54
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2017 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/sql/civicrm_navigation.mysql b/civicrm/sql/civicrm_navigation.mysql
index d844e88e51f68e376c640f101568928e973dc9b6..5ee6beb1890dd51666645222587dfa3394161391 100644
--- a/civicrm/sql/civicrm_navigation.mysql
+++ b/civicrm/sql/civicrm_navigation.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -816,4 +816,4 @@ VALUES
INSERT INTO `civicrm_report_instance`
( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
VALUES
- ( @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
\ No newline at end of file
+ ( @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
diff --git a/civicrm/sql/civicrm_sample.mysql b/civicrm/sql/civicrm_sample.mysql
index 9eaf66dbc8e334610ddc3aea06aff8c818f46b26..bfba24241c677f52044fcbe46867b0f252d0704c 100644
--- a/civicrm/sql/civicrm_sample.mysql
+++ b/civicrm/sql/civicrm_sample.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
@@ -252,7 +252,7 @@ VALUES
(@priceFieldID,'tenor','Tenor','40',2,1,0,2),
(@priceFieldID,'soprano','Soprano','50',3,1,0,2);
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/sql/civicrm_sample_custom_data.mysql b/civicrm/sql/civicrm_sample_custom_data.mysql
index 21a6f314d85cc8700d458608bc7e63b8bd4ffe89..e12103b43b7e6f4441b970e277dfc6ae738772e9 100644
--- a/civicrm/sql/civicrm_sample_custom_data.mysql
+++ b/civicrm/sql/civicrm_sample_custom_data.mysql
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2017 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/ACL/Form/ACL.tpl b/civicrm/templates/CRM/ACL/Form/ACL.tpl
index eed5ed0fc3ccd3c21f5b4deaa437e073fa753974..d884d08c8c2fcc53c2084db1a5abf84cc69d00e3 100644
--- a/civicrm/templates/CRM/ACL/Form/ACL.tpl
+++ b/civicrm/templates/CRM/ACL/Form/ACL.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/ACL/Form/ACLBasic.tpl b/civicrm/templates/CRM/ACL/Form/ACLBasic.tpl
index 902218a0353c93d4846e9b8f0a567742e022db1c..6ee8b70d80720b573a95f19967b408e6fb33fc1f 100644
--- a/civicrm/templates/CRM/ACL/Form/ACLBasic.tpl
+++ b/civicrm/templates/CRM/ACL/Form/ACLBasic.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/ACL/Form/EntityRole.tpl b/civicrm/templates/CRM/ACL/Form/EntityRole.tpl
index eea780563513e928048c3216c1c9cfef81fbaa58..5a90d3e911da93fdfe80efe79c9eaf3a3761ec05 100644
--- a/civicrm/templates/CRM/ACL/Form/EntityRole.tpl
+++ b/civicrm/templates/CRM/ACL/Form/EntityRole.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/ACL/Form/WordPress/Permissions.tpl b/civicrm/templates/CRM/ACL/Form/WordPress/Permissions.tpl
index 21dc63d64dfeabe96be93a64d01008463c39d762..5790aa592c00a2db707ae66a92d01a0bcefddc4c 100644
--- a/civicrm/templates/CRM/ACL/Form/WordPress/Permissions.tpl
+++ b/civicrm/templates/CRM/ACL/Form/WordPress/Permissions.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/ACL/Header.tpl b/civicrm/templates/CRM/ACL/Header.tpl
index 8c73d8eb180c36a6839f6f3a64c2b430cedb5762..3043d68525c62d9f7460d0b039c698e7e5c53af0 100644
--- a/civicrm/templates/CRM/ACL/Header.tpl
+++ b/civicrm/templates/CRM/ACL/Header.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/ACL/Page/ACL.tpl b/civicrm/templates/CRM/ACL/Page/ACL.tpl
index 80d3dc6faaef172d0612a45959b21f6ec7cee56d..4cd6940043c8487e7eac116d45796500bd62652d 100644
--- a/civicrm/templates/CRM/ACL/Page/ACL.tpl
+++ b/civicrm/templates/CRM/ACL/Page/ACL.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/ACL/Page/ACLBasic.tpl b/civicrm/templates/CRM/ACL/Page/ACLBasic.tpl
index c9c122bacfd6c27d6bf540e04513d40c9cf1a2c3..04959cba60c82ffc83d6a79b84b6a74f23b079b8 100644
--- a/civicrm/templates/CRM/ACL/Page/ACLBasic.tpl
+++ b/civicrm/templates/CRM/ACL/Page/ACLBasic.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/ACL/Page/EntityRole.tpl b/civicrm/templates/CRM/ACL/Page/EntityRole.tpl
index 5875cdaf905f117e04f6a959517f49baacc90417..ca674ac6ebd911448f5c8d0c6fbcbe325693df17 100644
--- a/civicrm/templates/CRM/ACL/Page/EntityRole.tpl
+++ b/civicrm/templates/CRM/ACL/Page/EntityRole.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Calendar/ICal.tpl b/civicrm/templates/CRM/Activity/Calendar/ICal.tpl
index 11f914146956df9be0253bd28bb9bad0cf3fe9d4..3ff740bde8a8efcc419f6e96ab60f2816de7eed2 100644
--- a/civicrm/templates/CRM/Activity/Calendar/ICal.tpl
+++ b/civicrm/templates/CRM/Activity/Calendar/ICal.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Activity.hlp b/civicrm/templates/CRM/Activity/Form/Activity.hlp
index e8b6dbe32ebd27182ca90892a2fa92d5277c0fa5..cfcbbd851390cf3441b54ee507e215d7829b7699 100644
--- a/civicrm/templates/CRM/Activity/Form/Activity.hlp
+++ b/civicrm/templates/CRM/Activity/Form/Activity.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Activity.tpl b/civicrm/templates/CRM/Activity/Form/Activity.tpl
index 816b507a579a20099c0765d53f47336330d9441b..eac293ef8a1d0187237c65b7d362376f83b444f4 100644
--- a/civicrm/templates/CRM/Activity/Form/Activity.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Activity.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/ActivityJs.tpl b/civicrm/templates/CRM/Activity/Form/ActivityJs.tpl
index e7c0945a3dcdf52971024b325845ddf1f7edd1d4..6a10997fa651abeb0a76534d7db43ff104c9039c 100644
--- a/civicrm/templates/CRM/Activity/Form/ActivityJs.tpl
+++ b/civicrm/templates/CRM/Activity/Form/ActivityJs.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl b/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl
index 7289080ac47837635e3f899a603d90c0dc0909d8..9098058370fe6c4b1411b84abe7ad0c74b45530a 100644
--- a/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl
+++ b/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/ActivityView.tpl b/civicrm/templates/CRM/Activity/Form/ActivityView.tpl
index f5a71a739d05bacc64e2f1d66997f7b6df37d20b..d57c964a5bbbec04df0dd2cd11c96d2cb5860c70 100644
--- a/civicrm/templates/CRM/Activity/Form/ActivityView.tpl
+++ b/civicrm/templates/CRM/Activity/Form/ActivityView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Search.tpl b/civicrm/templates/CRM/Activity/Form/Search.tpl
index 6294f89ed634c146d6a53d39ae5d469bd9795d19..32a68a6ceff2ef13100d5e803da82e5afd6828e3 100644
--- a/civicrm/templates/CRM/Activity/Form/Search.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Search/Common.tpl b/civicrm/templates/CRM/Activity/Form/Search/Common.tpl
index a78e20d621791b804f95fcd2fd12729758b789ef..9b7c93cff41931e8529fb99de3f88a53021e4e6e 100644
--- a/civicrm/templates/CRM/Activity/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Search/Common.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Activity/Form/Search/EmptyResults.tpl
index ea7dfcd9b1b60529894d688e4b04a856c3679f39..8c4d30ce150931d88fc04827f4eee0aeb89db4a9 100644
--- a/civicrm/templates/CRM/Activity/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Search/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Selector.tpl b/civicrm/templates/CRM/Activity/Form/Selector.tpl
index a0cefd052e85e148699261f7a312b374bfcf9bda..eff2d965dfcb4498e7f3ac947cc1020b7d6f3571 100644
--- a/civicrm/templates/CRM/Activity/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task.tpl b/civicrm/templates/CRM/Activity/Form/Task.tpl
index 2975e9590e3819d6e5e5ea92a26487be28ad2f4a..523709e780dd6b103f2ebe555f2bedbfc1694359 100644
--- a/civicrm/templates/CRM/Activity/Form/Task.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/AddToTag.tpl b/civicrm/templates/CRM/Activity/Form/Task/AddToTag.tpl
index e85c7ad614d50535b32c3ce45acbe815133ab03d..6e69c4d8d4a3445297bd4083483026f617ccea49 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/AddToTag.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/AddToTag.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl b/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl
index 681b977432192a8efe08a0a7bb2013eb5bae0ae4..9d791e60b40d1f7427c30f7f71bc617c6779cf62 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/Delete.tpl b/civicrm/templates/CRM/Activity/Form/Task/Delete.tpl
index b758f5a7294a16889ce282e3f4cbb93283238484..fecd5873f656aa4754ade4c0916325c0cbf2a426 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/Email.tpl b/civicrm/templates/CRM/Activity/Form/Task/Email.tpl
index 9b7a13ada8bd503c9f100352fed2af347406aecd..b67407fbc1b479008e589658a5c04c4c2dd9e1f4 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/Email.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/FileOnCase.tpl b/civicrm/templates/CRM/Activity/Form/Task/FileOnCase.tpl
index 07c9bae6bbfabc9027c48af9f9b1bd0d9b959d8c..5e3e47f4f9eadc6600a503bbfb402d473b729f85 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/FileOnCase.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/FileOnCase.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/PickOption.tpl b/civicrm/templates/CRM/Activity/Form/Task/PickOption.tpl
index fcc11e968d81bf0a8d840b59565c74d796ca4c42..43ec4275f24ebd77012d45678a0588ba4b67fde7 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/PickOption.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/PickOption.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Activity/Form/Task/PickProfile.tpl
index 7865ddc48f705602f12f2c7af7392676aab3ddda..94a1b2a5af5ea4629f4522398a39ab91c46bc78a 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/PickProfile.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/Print.tpl b/civicrm/templates/CRM/Activity/Form/Task/Print.tpl
index cd18d4ebb1b8ecebd9121d6c14c2acf7e603863a..8282e545d5b00434c15020f107283c6d752465a1 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl b/civicrm/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl
index d26cc18a4c9eb3989fda2c4b10e1792753ae9596..1679834d50b7a5f1b1a163e015cd49083acb1701 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/SMS.tpl b/civicrm/templates/CRM/Activity/Form/Task/SMS.tpl
index 805e94166d78535ded5ec71e689549a37fbd3d5c..c3a0ac0db7120cae3dca21592aec79959b9163b6 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/SMS.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/SMS.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl b/civicrm/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl
index 1480afe853d918db9617324605157df9b54803ef..3c575816e3ebfc8ad9249b543cda953b085d8eb1 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Activity/Import/Form/DataSource.hlp
index 329be7992cdc90abd96fcb8c0b4229761577d2d0..566c9d3cfae492a40a652692434f6237cccd8cfd 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Activity/Import/Form/DataSource.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Activity/Import/Form/DataSource.tpl
index 939c265318b392ac3f7c267073c70a6450b95f4c..d56a1cab7adcc444e69ef9a4d34e32c27dbdc9b6 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/DataSource.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Import/Form/MapField.tpl b/civicrm/templates/CRM/Activity/Import/Form/MapField.tpl
index a8af2f2009353fb16d80be3fa6e1559d1aad1ea9..d88e7d951a53f4facc67df7ce07d89b8665de78f 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/MapField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Activity/Import/Form/MapTable.tpl
index 13af32e2676a5a55f48c5a00ff2529bf1214eb7c..47ac7972fdb0b5e23a3dac0fac534a3d38fb0168 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/MapTable.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Import/Form/Preview.tpl b/civicrm/templates/CRM/Activity/Import/Form/Preview.tpl
index b3ff141a24fcca700f43445082f7e9b6169aa367..c71111ef8177aebe01e2c8062ee8f733c50a4feb 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Import/Form/Summary.tpl b/civicrm/templates/CRM/Activity/Import/Form/Summary.tpl
index 2da3ff56215a2121646f941cf7cdbfe82659c934..614ef3a1f5eb48aa947bb48661e7ee2999fba2de 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Page/Tab.tpl b/civicrm/templates/CRM/Activity/Page/Tab.tpl
index a7b4ed2774c15a2cc0c55aa427a01215dcfe30eb..e389d177c51a1c004b846b7d641f85692e5be048 100644
--- a/civicrm/templates/CRM/Activity/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Activity/Page/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Page/UserDashboard.tpl b/civicrm/templates/CRM/Activity/Page/UserDashboard.tpl
index 4d9de96e7584cf258bb8482ac7b7d2e5c1687e93..18fa9fcdee4b221d2a4938881cc9e671f69307e3 100644
--- a/civicrm/templates/CRM/Activity/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Activity/Page/UserDashboard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Selector/Activity.tpl b/civicrm/templates/CRM/Activity/Selector/Activity.tpl
index 84ea3e12d9817d630984d150df06ec589f2b72f3..c0598e934a5186375db130b173de9e1e4521b587 100644
--- a/civicrm/templates/CRM/Activity/Selector/Activity.tpl
+++ b/civicrm/templates/CRM/Activity/Selector/Activity.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Activity/Selector/Selector.tpl b/civicrm/templates/CRM/Activity/Selector/Selector.tpl
index 6cc3b32be39e43376eb4f63215bca59b6b335177..1b0be911e975b20136d2514795a12706b9fcd470 100644
--- a/civicrm/templates/CRM/Activity/Selector/Selector.tpl
+++ b/civicrm/templates/CRM/Activity/Selector/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/CMSUser.tpl b/civicrm/templates/CRM/Admin/Form/CMSUser.tpl
index 8652253d7ef2787bbebc42163e4917f763320802..e7d9130bee525fdcb908ac60855c745dec110d35 100644
--- a/civicrm/templates/CRM/Admin/Form/CMSUser.tpl
+++ b/civicrm/templates/CRM/Admin/Form/CMSUser.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/ContactType.tpl b/civicrm/templates/CRM/Admin/Form/ContactType.tpl
index 29b7dbf8c15380124c272770bcc78d4087f54848..e5c743cd65aa83b3202e2b5a127f553efbc40a5b 100644
--- a/civicrm/templates/CRM/Admin/Form/ContactType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/ContactType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Extensions.tpl b/civicrm/templates/CRM/Admin/Form/Extensions.tpl
index a55c3748d492abda932cfa5c4b86fbf981680f07..267b272251e7d393c9c31ba2c34e0121e376a077 100644
--- a/civicrm/templates/CRM/Admin/Form/Extensions.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Extensions.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Job.tpl b/civicrm/templates/CRM/Admin/Form/Job.tpl
index 576266e31340ac82f171c365321f50fa7f64b0ff..5bdb976990080cf2313cd84fa011863b8e4214c0 100644
--- a/civicrm/templates/CRM/Admin/Form/Job.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Job.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/LabelFormats.tpl b/civicrm/templates/CRM/Admin/Form/LabelFormats.tpl
index 34c48a0b37fe2e38829fb55153bf3d031190776d..c370eabac61061901a980c65dfaf7f4eeb290791 100644
--- a/civicrm/templates/CRM/Admin/Form/LabelFormats.tpl
+++ b/civicrm/templates/CRM/Admin/Form/LabelFormats.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/templates/CRM/Admin/Form/LocationType.tpl b/civicrm/templates/CRM/Admin/Form/LocationType.tpl
index cc6bbb250fcd26d9bc2a98dfe13447136319c9d2..3ba2c66118f1f264e0adfa71e22e96ed6e03a698 100644
--- a/civicrm/templates/CRM/Admin/Form/LocationType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/LocationType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/MailSettings.tpl b/civicrm/templates/CRM/Admin/Form/MailSettings.tpl
index b6d77db43d07bf21e69868c5717420a44da3dcb2..a1eb0695e991783d812873b7222f30da6d9e8844 100644
--- a/civicrm/templates/CRM/Admin/Form/MailSettings.tpl
+++ b/civicrm/templates/CRM/Admin/Form/MailSettings.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Mapping.tpl b/civicrm/templates/CRM/Admin/Form/Mapping.tpl
index 45ea2f1e5c1a20d0e85f38209843326af533624b..d39d9ad66b00d12ab59739696ff7d51a69d76552 100644
--- a/civicrm/templates/CRM/Admin/Form/Mapping.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Mapping.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl b/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl
index b2818d87f0c129131429a2f04ff1d801494b6d93..617aea8c55089783643b23132908484623cc8212 100644
--- a/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl
+++ b/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Navigation.hlp b/civicrm/templates/CRM/Admin/Form/Navigation.hlp
index c66f5b75266902c35c7459a612013d2d2aca722e..f8eb3ed8c6b12117a66ef8aed43ff7af34d43287 100644
--- a/civicrm/templates/CRM/Admin/Form/Navigation.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Navigation.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Navigation.tpl b/civicrm/templates/CRM/Admin/Form/Navigation.tpl
index 04de18f62c97fa97a84bc832b069ce1ac6d9377f..1d33aa45ad8919c1cba88552580746ab1bcc251a 100644
--- a/civicrm/templates/CRM/Admin/Form/Navigation.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Navigation.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/OptionGroup.tpl b/civicrm/templates/CRM/Admin/Form/OptionGroup.tpl
index 40ffd2f3079afa159961c2476d7ff7b70219d01b..a5f60ea67d9f0f71e805680828dddb5e81eddb55 100644
--- a/civicrm/templates/CRM/Admin/Form/OptionGroup.tpl
+++ b/civicrm/templates/CRM/Admin/Form/OptionGroup.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Options.tpl b/civicrm/templates/CRM/Admin/Form/Options.tpl
index cf06414e879be42e80f0de0a6bb38346d5ebbc33..38cf9e472b7d3ec3d4abfc44bc0646799db82016 100644
--- a/civicrm/templates/CRM/Admin/Form/Options.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Options.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/ParticipantStatusType.tpl b/civicrm/templates/CRM/Admin/Form/ParticipantStatusType.tpl
index 1831c999779611f6c6b7913160db95e80502db30..0911c0c2aaee41bd120d28f5d2a27d45132f00f9 100644
--- a/civicrm/templates/CRM/Admin/Form/ParticipantStatusType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/ParticipantStatusType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/PaymentProcessor.tpl b/civicrm/templates/CRM/Admin/Form/PaymentProcessor.tpl
index 4fd720e8f86d94f57dd882ac1db63587195bb4aa..eef8c774d4f816feeb462c6ac0067f07c70a3105 100644
--- a/civicrm/templates/CRM/Admin/Form/PaymentProcessor.tpl
+++ b/civicrm/templates/CRM/Admin/Form/PaymentProcessor.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/PaymentProcessorType.tpl b/civicrm/templates/CRM/Admin/Form/PaymentProcessorType.tpl
index 8cc89f58fa01bd9be49521df797d507282711c44..df35d750329597635e6979dd90e5486e2954a525 100644
--- a/civicrm/templates/CRM/Admin/Form/PaymentProcessorType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/PaymentProcessorType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/PdfFormats.tpl b/civicrm/templates/CRM/Admin/Form/PdfFormats.tpl
index 6f19fbc9f5498b68433c88756c12d10190f61daa..623c0252549c56621ec24049aa18da099bd1afe4 100644
--- a/civicrm/templates/CRM/Admin/Form/PdfFormats.tpl
+++ b/civicrm/templates/CRM/Admin/Form/PdfFormats.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp b/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp
index 2da099ab1164dfbc8dcf8052f7b897207e3faa95..acc538cd6225652e97407b860446cc870eed2453 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl
index 2ea927ed2232cf795452e3f1c2999a50141bbdb3..99a229e90dfaddeee82a9de10d481bb9c19bb79d 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Campaign.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Campaign.tpl
index 491ca38e9652845a7bca8bfba8df70872f58bcc1..9baa42d3f2740a939d950514fed9decb26bccf6f 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Campaign.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Campaign.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.hlp b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.hlp
index 8e36068e84daaa3c62f2bbe301ed3c0d602a1235..b352e8734dd8d2dbf79656f742ed0afa3b0fa386 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl
index 491ca38e9652845a7bca8bfba8df70872f58bcc1..9baa42d3f2740a939d950514fed9decb26bccf6f 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Display.hlp b/civicrm/templates/CRM/Admin/Form/Preferences/Display.hlp
index 3d2777dc9c53c5c72dea835062f7103d0eae7989..ff199d4a429a450c7c3edc249f261141453e1377 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Display.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Display.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Display.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Display.tpl
index 1ac6cb910cf8d0eeb0793c96c53ed3301d54c120..81a4fd73aaca409e045b43d5048c10713a95a780 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Event.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Event.tpl
index 491ca38e9652845a7bca8bfba8df70872f58bcc1..9baa42d3f2740a939d950514fed9decb26bccf6f 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Event.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Event.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Mailing.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Mailing.tpl
index 491ca38e9652845a7bca8bfba8df70872f58bcc1..9baa42d3f2740a939d950514fed9decb26bccf6f 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Mailing.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Mailing.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Member.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Member.tpl
index 491ca38e9652845a7bca8bfba8df70872f58bcc1..9baa42d3f2740a939d950514fed9decb26bccf6f 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Member.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Member.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Multisite.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Multisite.tpl
index 491ca38e9652845a7bca8bfba8df70872f58bcc1..9baa42d3f2740a939d950514fed9decb26bccf6f 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Multisite.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Multisite.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/PreferencesDate.tpl b/civicrm/templates/CRM/Admin/Form/PreferencesDate.tpl
index a5dbd44a27bd87e4334775751f3afac7b4cd9565..6abb7fee9df7e328cba637fb6c3d072c99c2c031 100644
--- a/civicrm/templates/CRM/Admin/Form/PreferencesDate.tpl
+++ b/civicrm/templates/CRM/Admin/Form/PreferencesDate.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/RelationshipType.tpl b/civicrm/templates/CRM/Admin/Form/RelationshipType.tpl
index 4de2bc249b5e151b1f83f38bcef88d9e0d70dce4..63b86f289e4e4c4b833318d9748ac022a610bb0a 100644
--- a/civicrm/templates/CRM/Admin/Form/RelationshipType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/RelationshipType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl b/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl
index 6e375712ba0280adf6203e5d4fb43bbc59464f67..7614164820b5c54ddd3eeb166a01c0b9b14184d0 100644
--- a/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl
+++ b/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -60,11 +60,11 @@
<tr id="repeatFields" class="crm-scheduleReminder-form-block-repeatFields"><td></td><td>
<table class="form-layout-compressed">
<tr class="crm-scheduleReminder-form-block-repetition_frequency_interval">
- <td class="label">{$form.repetition_frequency_interval.label} {$form.repetition_frequency_interval.html}</td>
+ <td class="label">{$form.repetition_frequency_interval.label} <span class="crm-marker">*</span> {$form.repetition_frequency_interval.html}</td>
<td>{$form.repetition_frequency_unit.html}</td>
</tr>
<tr class="crm-scheduleReminder-form-block-repetition_frequency_interval">
- <td class="label">{$form.end_frequency_interval.label} {$form.end_frequency_interval.html}
+ <td class="label">{$form.end_frequency_interval.label} <span class="crm-marker">*</span> {$form.end_frequency_interval.html}
<td>{$form.end_frequency_unit.html} {$form.end_action.html} {$form.end_date.html}</td>
</tr>
</table>
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Case.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Case.tpl
index 9eb9d2bd8d7d5dc792ee2dd1db859476ee75cbaa..fc2da06dd7eac70ea43c1432dc6649e991b33ae4 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Case.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Case.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Component.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Component.hlp
index aa212527a859bae4f65c908085a7b9b24b1b65c5..a8334b7f04b73e722cc18157f4ecfaf971147fd0 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Component.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Component.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Component.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Component.tpl
index 53854c913c9691dc2254ad26126a4e2a459c483e..f0fad766cda39bd9860afd62ec65c04e3e600c57 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Component.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Component.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Date.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Date.hlp
index 5fc76319dcacb81614fb444dae1d5473130c6cf7..9728d92f6a62ca02ded435cd09dfb33489578495 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Date.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Date.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Date.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Date.tpl
index 7eef5127cad11831a987e4abd05966eb9b46be06..16c9b80e0b206a44233cc511709473a464f4f239 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Date.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Date.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Debugging.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Debugging.hlp
index 35b9595ad50cdcf04f76c10bf56adae7668099fd..7c627a9dba9decb190621c621e67322edb5acf97 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Debugging.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Debugging.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Debugging.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Debugging.tpl
index 721d7ef13e9370a334c12cec0c55aaa65319291a..c2023e73ee923f9c59fa4311d9673b9a3f01487e 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Debugging.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Debugging.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Event.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Event.tpl
index fab4552f0c8cf549f3881683bf25d7fa38eab6a0..d9ce5cb364a131f2686e9941be231b9b934fb109 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Event.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Event.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Localization.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Localization.hlp
index 081d68b55f2018bd382f35151e32c3a6a94be1fb..84c857330a71001701760397876099e128fed6ad 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Localization.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Localization.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl
index 7089c61f2460f40351d0b6b076c90564d1eec605..7af27b9b7daa8205a126b1da290edcb0f9ed533c 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Mail.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Mail.tpl
index 8c9ae9c0b050d6f6acbe96f757c6c62377fce511..d7c3c017f88e38fd4a4af1d8982a59652b43f0a5 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Mail.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Mail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Mapping.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Mapping.hlp
index f353b8792a6b046d0ecf32763046ccb295f5093a..02e3f318ae7b6dc4fe98cff80d1a70badabdfc51 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Mapping.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Mapping.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Mapping.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Mapping.tpl
index 8088ed1d0ce2d001a65dc7a61a7c06e0b77ebb3b..498744d2130c40e436cc8e99ac79cf9ed90ba52e 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Mapping.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Mapping.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
index b0394429198298e248b2ed6aab78e6379ad8ab01..d232d739a837749c1ccafa327ab865dfc788a039 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Path.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Path.tpl
index 463b758c299ed41f50ef258bdcfc3604c9780311..6eaea576ca8948beb75b539861f2383c92fb6656 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Path.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Path.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl
index 000faab7446e224d4a3da37f3e853b2746b4f45c..3a704662ad12825a5b2d1388f1d2654a9796b36e 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/SettingForm.tpl b/civicrm/templates/CRM/Admin/Form/Setting/SettingForm.tpl
index cd36044efcfdebce05b5033bc782027f02a2eef1..18ab527465b24ffc124c4a995b5dca8a3a69d8d6 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/SettingForm.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/SettingForm.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Smtp.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Smtp.hlp
index aedfd8224fa400aab51e736d8f41cd914fd921e1..084abec6567f6803b25180bec4ef4bd455819c4d 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Smtp.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Smtp.hlp
@@ -1,5 +1,5 @@
{*--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Smtp.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Smtp.tpl
index cccc0eb97e03680295dc23b225130041e2030bf3..dde6d79e93521af505aa1b82e76a66c4998fadb2 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Smtp.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Smtp.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/UF.tpl b/civicrm/templates/CRM/Admin/Form/Setting/UF.tpl
index 68439d61a2da9b1c110568b3faba45f3f63de65a..a7d03ab4f8af3ba1ff352846006466861a0e0222 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/UF.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/UF.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl b/civicrm/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
index 59dfaf64d9cad629d55b7083c4248e8b53457c30..3808ba7b926f6f777c77416218a385d4b96afb11 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Url.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Url.hlp
index e16e34fe4678579c1f1b3b42be98abbc0d444188..79d5ef98ab28ed7792cd15eabd137691d4cc4880 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Url.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Url.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl
index d10cac3cab0c42a1cd8612af7c7c17ee19604c75..b854946893a04248edf86bf76d9d892d922a797f 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/WordReplacements.hlp b/civicrm/templates/CRM/Admin/Form/WordReplacements.hlp
index 86c67c7cd8e948918cac01daf9588971971c50df..d70e31e25b63cd832d8c738af341257d1eab0169 100644
--- a/civicrm/templates/CRM/Admin/Form/WordReplacements.hlp
+++ b/civicrm/templates/CRM/Admin/Form/WordReplacements.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Form/WordReplacements.tpl b/civicrm/templates/CRM/Admin/Form/WordReplacements.tpl
index d1f451b2fbe87e37fb67b463021c1decabe2ad1a..636db1595cfda4633e41815fe7ab5bbc5e6e12ae 100644
--- a/civicrm/templates/CRM/Admin/Form/WordReplacements.tpl
+++ b/civicrm/templates/CRM/Admin/Form/WordReplacements.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/APIExplorer.hlp b/civicrm/templates/CRM/Admin/Page/APIExplorer.hlp
index 9e9acf2e8f50887847f1d6a3983274202df21626..904b23ecf93668f0a4b61f9e480b464980789ae4 100644
--- a/civicrm/templates/CRM/Admin/Page/APIExplorer.hlp
+++ b/civicrm/templates/CRM/Admin/Page/APIExplorer.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl b/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl
index e7cd0181fd7c5c2f327b18c111173638f9782cb7..237c8f9757d0ada91a8f161cfe5694a805f180dd 100644
--- a/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -25,10 +25,6 @@
*}
<style>
{literal}
- #mainTabContainer {
- background: transparent;
- border: 0 none;
- }
#mainTabContainer pre {
line-height: 14px;
font-size: 11px;
@@ -226,6 +222,7 @@
{/literal}
</style>
+<div class="crm-block crm-content-block">
<div id="mainTabContainer">
<ul>
<li class="ui-corner-all" title="GUI to build and execute API calls">
@@ -240,7 +237,7 @@
</ul>
<div id="explorer-tab">
-
+ <div class="crm-block crm-form-block">
<form id="api-explorer">
<label for="api-entity">{ts}Entity{/ts}:</label>
<select class="crm-form-select big required" id="api-entity" name="entity">
@@ -308,13 +305,16 @@
<i class="crm-i fa-bolt"></i><input type="submit" value="{ts}Execute{/ts}" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}"/>
</span>
</div>
+
<pre id="api-result" class="linenums">
{ts}Results are displayed here.{/ts}
</pre>
</form>
</div>
+ </div>
<div id="examples-tab">
+ <div class="crm-block crm-form-block">
<form id="api-examples">
<label for="example-entity">{ts}Entity{/ts}:</label>
<select class="crm-form-select big required" id="example-entity" name="entity">
@@ -335,8 +335,10 @@
</pre>
</form>
</div>
+ </div>
<div id="docs-tab">
+ <div class="crm-block crm-form-block">
<form id="api-docs">
<label for="doc-entity">{ts}Entity{/ts}:</label>
<select class="crm-form-select big required" id="doc-entity" name="entity">
@@ -356,9 +358,10 @@
{ts}Results are displayed here.{/ts}
</div>
</form>
+ </div>
</div>
</div>
-
+</div>
{strip}
<script type="text/template" id="api-param-tpl">
<tr class="api-param-row">
diff --git a/civicrm/templates/CRM/Admin/Page/Access.tpl b/civicrm/templates/CRM/Admin/Page/Access.tpl
index 5759af62c4d0b9d558ee05844a7f367b65962a1a..bc70190a87c91ebc898128b577b6e34586ff398c 100644
--- a/civicrm/templates/CRM/Admin/Page/Access.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Access.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Admin.tpl b/civicrm/templates/CRM/Admin/Page/Admin.tpl
index a6d9e0b3ccc1afb2d27e3b233ace3f05f92bdca1..d3f24e5ffe8ea329fe69503186b23c362913148a 100644
--- a/civicrm/templates/CRM/Admin/Page/Admin.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Admin.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/CKEditorConfig.tpl b/civicrm/templates/CRM/Admin/Page/CKEditorConfig.tpl
index b92082c3bd3be1f86eb9206924a5bcf19e556e2a..e414deaa45177328d9405cb44c3d63e3497d792b 100644
--- a/civicrm/templates/CRM/Admin/Page/CKEditorConfig.tpl
+++ b/civicrm/templates/CRM/Admin/Page/CKEditorConfig.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/ConfigTaskList.tpl b/civicrm/templates/CRM/Admin/Page/ConfigTaskList.tpl
index 242eb8956a20017310d7879184fb0358cc547fb7..8caafcab468c9603023d8ebfa9942f3f071b4775 100644
--- a/civicrm/templates/CRM/Admin/Page/ConfigTaskList.tpl
+++ b/civicrm/templates/CRM/Admin/Page/ConfigTaskList.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/ContactType.hlp b/civicrm/templates/CRM/Admin/Page/ContactType.hlp
index e6b4f5079d983b6b07e08b3ce6a2f41b381e05f6..7d12b10b635885305b4d0bdc79a4b50017659b1b 100644
--- a/civicrm/templates/CRM/Admin/Page/ContactType.hlp
+++ b/civicrm/templates/CRM/Admin/Page/ContactType.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/ContactType.tpl b/civicrm/templates/CRM/Admin/Page/ContactType.tpl
index 067d503f64a775fe103754bc16ed71609951858d..e0d734d68caf38c7b9263f61eeb4fc018d61c567 100644
--- a/civicrm/templates/CRM/Admin/Page/ContactType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/ContactType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/EventTemplate.tpl b/civicrm/templates/CRM/Admin/Page/EventTemplate.tpl
index 5cb3ce91da2d3c2d7fbd475631ddd3aa70a26196..e8660c04e9a21bb7bd0db8ae0ec0f8dc8333513b 100644
--- a/civicrm/templates/CRM/Admin/Page/EventTemplate.tpl
+++ b/civicrm/templates/CRM/Admin/Page/EventTemplate.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Extensions.tpl b/civicrm/templates/CRM/Admin/Page/Extensions.tpl
index c802208a85e0826c9e481b9c0f69690802836de9..fbfcd84894c77b066c3236235fc6d2cbd81d2332 100644
--- a/civicrm/templates/CRM/Admin/Page/Extensions.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Extensions.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Job.tpl b/civicrm/templates/CRM/Admin/Page/Job.tpl
index a02830cf57f7ed01053d4da4b8b9fce2419cd9e1..8b5c233eb1072d2fe91973973cd8784e9e9727fb 100644
--- a/civicrm/templates/CRM/Admin/Page/Job.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Job.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/JobLog.tpl b/civicrm/templates/CRM/Admin/Page/JobLog.tpl
index 3f74f1df935dcb5865a606261854203428cd7b03..7194feb97d94fcf4cf0fcf93005d989f16a44e5f 100644
--- a/civicrm/templates/CRM/Admin/Page/JobLog.tpl
+++ b/civicrm/templates/CRM/Admin/Page/JobLog.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/LabelFormats.tpl b/civicrm/templates/CRM/Admin/Page/LabelFormats.tpl
index 3b92bd4b78250c02d98ba73ca7115a8b9fa6f4c1..2baf4ae13d4b707e75fd5cd8c975bfe96cf02de3 100644
--- a/civicrm/templates/CRM/Admin/Page/LabelFormats.tpl
+++ b/civicrm/templates/CRM/Admin/Page/LabelFormats.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/templates/CRM/Admin/Page/LocationType.tpl b/civicrm/templates/CRM/Admin/Page/LocationType.tpl
index 1cbbd6e0ad9ae77f90f51676d0397ac2bb12fc8c..0bbbfe98680f0af37a194e33e829efb24dea9eb0 100644
--- a/civicrm/templates/CRM/Admin/Page/LocationType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/LocationType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/MailSettings.tpl b/civicrm/templates/CRM/Admin/Page/MailSettings.tpl
index 19dcfee283c2a7fd3d1d665eca7e62564a31c67c..122d7729615b6f6a15a2b696ddee904a34627c13 100644
--- a/civicrm/templates/CRM/Admin/Page/MailSettings.tpl
+++ b/civicrm/templates/CRM/Admin/Page/MailSettings.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Mapping.tpl b/civicrm/templates/CRM/Admin/Page/Mapping.tpl
index 7688948d6afe5a08c264bb51c5caa850404794af..d6811607d03cbc34dec5bbaac60d66d9bb239725 100644
--- a/civicrm/templates/CRM/Admin/Page/Mapping.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Mapping.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/MessageTemplates.hlp b/civicrm/templates/CRM/Admin/Page/MessageTemplates.hlp
index fab9d1b8762914fe59793aadf9eb292e926fb829..474b3478514add526aa73807c336f685502fa8f4 100644
--- a/civicrm/templates/CRM/Admin/Page/MessageTemplates.hlp
+++ b/civicrm/templates/CRM/Admin/Page/MessageTemplates.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl b/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl
index cabc8ba2a336bdf3273bfaa532638c70c82dec71..e1b86a7ac5aceb69902621d62381547d24b0702b 100644
--- a/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Navigation.hlp b/civicrm/templates/CRM/Admin/Page/Navigation.hlp
index 57dc2097b5623ee4617ac83aa193f208c0ec8a87..9ef47591c07175bbd47548791bde3056bbf7ba76 100644
--- a/civicrm/templates/CRM/Admin/Page/Navigation.hlp
+++ b/civicrm/templates/CRM/Admin/Page/Navigation.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Navigation.tpl b/civicrm/templates/CRM/Admin/Page/Navigation.tpl
index 440a975df0db3fe9b188f3b94323d6127d519125..72ff7f90745193be87b06aaf7922e98463af8cf9 100644
--- a/civicrm/templates/CRM/Admin/Page/Navigation.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Navigation.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/OptionGroup.tpl b/civicrm/templates/CRM/Admin/Page/OptionGroup.tpl
index 38de6bd8ff16d5d5b3e9db475019a20c2e2a0af2..f33ba6ed422870619a6c43cbf45bea8046d94729 100644
--- a/civicrm/templates/CRM/Admin/Page/OptionGroup.tpl
+++ b/civicrm/templates/CRM/Admin/Page/OptionGroup.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Options.hlp b/civicrm/templates/CRM/Admin/Page/Options.hlp
index 236467022e211fe84cee1690cb229a40d0a529d4..b5c2f2febfd5dfac98ba8685cb4dfcb0df193f0c 100644
--- a/civicrm/templates/CRM/Admin/Page/Options.hlp
+++ b/civicrm/templates/CRM/Admin/Page/Options.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Options.tpl b/civicrm/templates/CRM/Admin/Page/Options.tpl
index d1e7af21c83a6028b6bad8b1c54ee5f2f99c4c5f..8a5936b6312beb782fbed3f5f507a37921d56eae 100644
--- a/civicrm/templates/CRM/Admin/Page/Options.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Options.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.hlp b/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.hlp
index 91c531dfad4d327949b141539fd8ea0e2c10a73c..b0baf4ae6a95c0c451d95a77a29754d692afb72b 100644
--- a/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.hlp
+++ b/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.tpl
index fe18f2e252947fb31e64444b85f64975328f476a..f48c74644bbc839cf31cbb4239d056ab6edee8d9 100644
--- a/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/PaymentProcessor.hlp b/civicrm/templates/CRM/Admin/Page/PaymentProcessor.hlp
index a3d030274e921c9146910e7fe4c2c4df96d82aa2..315529ba47862bf076b8cb9715a07c25c6275901 100644
--- a/civicrm/templates/CRM/Admin/Page/PaymentProcessor.hlp
+++ b/civicrm/templates/CRM/Admin/Page/PaymentProcessor.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/PaymentProcessor.tpl b/civicrm/templates/CRM/Admin/Page/PaymentProcessor.tpl
index 3176c492ec888a7c4f019994d788323151b65aaa..33e808c406ec059d34e60b89ce565cbeec2d1ff0 100644
--- a/civicrm/templates/CRM/Admin/Page/PaymentProcessor.tpl
+++ b/civicrm/templates/CRM/Admin/Page/PaymentProcessor.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/civicrm/templates/CRM/Admin/Page/PaymentProcessorType.tpl
index f70c19badcaf38226027fa4e29ee64479c95cb60..e3e6765966318b46133235de4f7dd7202f22c513 100644
--- a/civicrm/templates/CRM/Admin/Page/PaymentProcessorType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/PaymentProcessorType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/PdfFormats.tpl b/civicrm/templates/CRM/Admin/Page/PdfFormats.tpl
index a58d634864adee501e94f4505aa70fbcd4147290..5b58ded34b2a0221a04d7db720f556d9ff9a0142 100644
--- a/civicrm/templates/CRM/Admin/Page/PdfFormats.tpl
+++ b/civicrm/templates/CRM/Admin/Page/PdfFormats.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/templates/CRM/Admin/Page/PreferencesDate.tpl b/civicrm/templates/CRM/Admin/Page/PreferencesDate.tpl
index a5f89154a93ffa610d55a922797695224fea69c8..9ffaca8e5e5730bd364bc8d0aff544997e259399 100644
--- a/civicrm/templates/CRM/Admin/Page/PreferencesDate.tpl
+++ b/civicrm/templates/CRM/Admin/Page/PreferencesDate.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/RelationshipType.hlp b/civicrm/templates/CRM/Admin/Page/RelationshipType.hlp
index 4d034ecb4c0c4c4406b42d8301138a2027c8dafe..9a152f16d7c7351d8fd3f14fddd7bdbf2a71be01 100644
--- a/civicrm/templates/CRM/Admin/Page/RelationshipType.hlp
+++ b/civicrm/templates/CRM/Admin/Page/RelationshipType.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/RelationshipType.tpl b/civicrm/templates/CRM/Admin/Page/RelationshipType.tpl
index dc4a1a9a98b488936ba434dc9a1e35e655add9b2..67961c2982699c75f7406ffdf2cdfb04bc1e47c6 100644
--- a/civicrm/templates/CRM/Admin/Page/RelationshipType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/RelationshipType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Reminders.tpl b/civicrm/templates/CRM/Admin/Page/Reminders.tpl
index 498208502d1d2e4145f3ca5c7934b634de007e3b..e533bf45ce30fd8d68c03ac76126b585e4f0d73a 100644
--- a/civicrm/templates/CRM/Admin/Page/Reminders.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Reminders.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/ScheduleReminders.hlp b/civicrm/templates/CRM/Admin/Page/ScheduleReminders.hlp
index af36c4a4ab1d09e5a632e09edbdeaab2de1a1668..edc1ec3e454e2490d1f0f9e9cb5aaaedd43f38c2 100644
--- a/civicrm/templates/CRM/Admin/Page/ScheduleReminders.hlp
+++ b/civicrm/templates/CRM/Admin/Page/ScheduleReminders.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/ScheduleReminders.tpl b/civicrm/templates/CRM/Admin/Page/ScheduleReminders.tpl
index ef528e81ff222af08a7ee4e71b316833f16aeabf..f374591760286f02708b90c177afddebfaccfcae 100644
--- a/civicrm/templates/CRM/Admin/Page/ScheduleReminders.tpl
+++ b/civicrm/templates/CRM/Admin/Page/ScheduleReminders.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Admin/Page/Setting.tpl b/civicrm/templates/CRM/Admin/Page/Setting.tpl
index e156a2b42cc0a9bd48b1d7fe5028d0a21144aa26..f7b3201edbe93da184bb5ccb7dbb82460b699f74 100644
--- a/civicrm/templates/CRM/Admin/Page/Setting.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Setting.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Badge/Form/Layout.tpl b/civicrm/templates/CRM/Badge/Form/Layout.tpl
index 788a05800f325744c50be8aab226a7b8787fde3c..baa621d03e54d436c5835c58ba1ae92a34f6b270 100644
--- a/civicrm/templates/CRM/Badge/Form/Layout.tpl
+++ b/civicrm/templates/CRM/Badge/Form/Layout.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Badge/Page/Layout.hlp b/civicrm/templates/CRM/Badge/Page/Layout.hlp
index 90ef4226f371548f7013d4ddac03e2273a9619cc..ff53e167f1051384c0987ad14f712830f4471b81 100644
--- a/civicrm/templates/CRM/Badge/Page/Layout.hlp
+++ b/civicrm/templates/CRM/Badge/Page/Layout.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Badge/Page/Layout.tpl b/civicrm/templates/CRM/Badge/Page/Layout.tpl
index d426c1d78157b18f5d3d14fb1c3e867531153ad7..ff7d8630b04df00e748a314820ef03153600a46c 100644
--- a/civicrm/templates/CRM/Badge/Page/Layout.tpl
+++ b/civicrm/templates/CRM/Badge/Page/Layout.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Batch/Form/Batch.tpl b/civicrm/templates/CRM/Batch/Form/Batch.tpl
index ee625a297c774184b93354f8a635effea84ef15f..be98e28a74046e7be071235f38f01b063c29ab6a 100644
--- a/civicrm/templates/CRM/Batch/Form/Batch.tpl
+++ b/civicrm/templates/CRM/Batch/Form/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Batch/Form/Entry.tpl b/civicrm/templates/CRM/Batch/Form/Entry.tpl
index 1f97a2b21bd94697376a3fc62e4f3cd417dfc0ab..f2104f0d6c628d8c6d1e1f4a246abd44aa627448 100644
--- a/civicrm/templates/CRM/Batch/Form/Entry.tpl
+++ b/civicrm/templates/CRM/Batch/Form/Entry.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Batch/Form/Search.tpl b/civicrm/templates/CRM/Batch/Form/Search.tpl
index 7241500a49ab657d209cc3262288f27070be5a9a..e88a752a3bc0132978c437718e5c8ecf50ee3c7b 100644
--- a/civicrm/templates/CRM/Batch/Form/Search.tpl
+++ b/civicrm/templates/CRM/Batch/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Batch/Page/Batch.tpl b/civicrm/templates/CRM/Batch/Page/Batch.tpl
index bf7f4faa483d7f0fe653cc0248625b9e929f1b6a..00786e9e26faf0c21202cb5607d0c9b561af7f5f 100644
--- a/civicrm/templates/CRM/Batch/Page/Batch.tpl
+++ b/civicrm/templates/CRM/Batch/Page/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Block/Add.tpl b/civicrm/templates/CRM/Block/Add.tpl
index cec066bf29534df411d0fadd41d95ae0ab7cde91..a068f0506fef5519550a2c5836ebdd9773663249 100644
--- a/civicrm/templates/CRM/Block/Add.tpl
+++ b/civicrm/templates/CRM/Block/Add.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Block/CreateNew.tpl b/civicrm/templates/CRM/Block/CreateNew.tpl
index 2a5b6421937cc1be2eecc11e2a6f7b701d4de7c2..65245007c02ea08d7b37e45b7c38f363fa785882 100644
--- a/civicrm/templates/CRM/Block/CreateNew.tpl
+++ b/civicrm/templates/CRM/Block/CreateNew.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
diff --git a/civicrm/templates/CRM/Block/Dashboard.tpl b/civicrm/templates/CRM/Block/Dashboard.tpl
index cb7e906b52c6d5c6203e421e30e136f8f6d6b445..90f96cbd59c65e5ce82e1222bc9f598e6cb32738 100644
--- a/civicrm/templates/CRM/Block/Dashboard.tpl
+++ b/civicrm/templates/CRM/Block/Dashboard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Block/Event.tpl b/civicrm/templates/CRM/Block/Event.tpl
index 75f7af708bd4566e170f75ab1c7cf1853ee79280..283ca7a851d7d443519c66d6ade1bef583774f94 100644
--- a/civicrm/templates/CRM/Block/Event.tpl
+++ b/civicrm/templates/CRM/Block/Event.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Block/FullTextSearch.tpl b/civicrm/templates/CRM/Block/FullTextSearch.tpl
index fd3d3ba97a423e2e54811b2d5a224a49137761af..01c7a46aff86c7c31210147001d0400196b1bd69 100644
--- a/civicrm/templates/CRM/Block/FullTextSearch.tpl
+++ b/civicrm/templates/CRM/Block/FullTextSearch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Block/LangSwitch.tpl b/civicrm/templates/CRM/Block/LangSwitch.tpl
index 9bb253c0a4281628af8e744c6b380b989fa7c1e3..dcf5fa7b7ece902bd2ba79fc8ca76a7cca8493dc 100644
--- a/civicrm/templates/CRM/Block/LangSwitch.tpl
+++ b/civicrm/templates/CRM/Block/LangSwitch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Block/Mail.tpl b/civicrm/templates/CRM/Block/Mail.tpl
index 2d7f37429e87a154f97564678b06c7e5e1d96f4e..51b3f5ac36a0d1e95b0cde722d03f201b2419734 100644
--- a/civicrm/templates/CRM/Block/Mail.tpl
+++ b/civicrm/templates/CRM/Block/Mail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Block/RecentlyViewed.tpl b/civicrm/templates/CRM/Block/RecentlyViewed.tpl
index 3de450d55af5dc637f125a0eef49e917820a142e..bcaa89f4d18ddff5f2bd39bbf4ab1362b8272c7d 100644
--- a/civicrm/templates/CRM/Block/RecentlyViewed.tpl
+++ b/civicrm/templates/CRM/Block/RecentlyViewed.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Block/Subject.tpl b/civicrm/templates/CRM/Block/Subject.tpl
index b005cd380a221f8a24c38b58922163a0a28fdca4..c312089e829adebbc7af2ca5afc7e2316278fc87 100644
--- a/civicrm/templates/CRM/Block/Subject.tpl
+++ b/civicrm/templates/CRM/Block/Subject.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Block/blocks.tpl b/civicrm/templates/CRM/Block/blocks.tpl
index bef56240785ae2b08e67f3fe2dbb496bd1268390..b80b673bef3324bde14a1bc6c8d9537f5685964d 100644
--- a/civicrm/templates/CRM/Block/blocks.tpl
+++ b/civicrm/templates/CRM/Block/blocks.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Campaign.tpl b/civicrm/templates/CRM/Campaign/Form/Campaign.tpl
index c8745a408775223c73fe2a9b8bb25d82209b47d7..1126a041ab78b1fea346f0912178041f1ef09fcb 100644
--- a/civicrm/templates/CRM/Campaign/Form/Campaign.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Campaign.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Gotv.tpl b/civicrm/templates/CRM/Campaign/Form/Gotv.tpl
index 415a8c159442ab07a87b6506e1339f4b9d7bc001..68776dbebbcc6d9620da596e43f8ea43dabc1f28 100644
--- a/civicrm/templates/CRM/Campaign/Form/Gotv.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Gotv.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Petition.tpl b/civicrm/templates/CRM/Campaign/Form/Petition.tpl
index 7d06418585d5b07bcece50c92620136d492ae594..b7221646cb7c3d49b940eeb08ab9c88349835239 100644
--- a/civicrm/templates/CRM/Campaign/Form/Petition.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Petition.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Petition/Signature.tpl b/civicrm/templates/CRM/Campaign/Form/Petition/Signature.tpl
index 804165020480c9aaf1375094ae33020d8e7fa2b8..43f669ec1970f228f5be82f503fba0205e7db295 100644
--- a/civicrm/templates/CRM/Campaign/Form/Petition/Signature.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Petition/Signature.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/ResultOptions.tpl b/civicrm/templates/CRM/Campaign/Form/ResultOptions.tpl
index 3150296f8416084938d454a0316660c95216bd7c..b809d343e6acdcf469e553d29cd2fe3a4bb88a11 100644
--- a/civicrm/templates/CRM/Campaign/Form/ResultOptions.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/ResultOptions.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Search.tpl b/civicrm/templates/CRM/Campaign/Form/Search.tpl
index 3799799538b53dcbe9ef20c99f48cb298e63441e..e1811f96d54c0cd63e9e1dad2ac9be345dad1610 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl
index d2a792a869076fbf2a23554e1d0689b160587803..51096b1f97040b13f0d6e70a514edce048c67f25 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl
index 9c3b2c789161dbd4a4d476987fda472dddea12d1..03e8dac96fcd2657601fa4d4ab10d380bfc305a3 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Campaign/Form/Search/EmptyResults.tpl
index 93c6b82b96dcc9904069c6f27a0b7fcee9e020ed..91f740f4e640782b27a8dbab6f4dba6eb0db3411 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl
index ff43a3d9319aceb4438ba1792510523f24a323c4..33556057c3de10a6dfd4124566ab425f9e1853af 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl
index ae6b84317aafac4a3d5d290918a8fc1b8f345955..c87eb5e54e4d47b12cb2445b868837c67dbfc25c 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Selector.tpl b/civicrm/templates/CRM/Campaign/Form/Selector.tpl
index ab42135866aef508878de2842ad3775e7e03aa89..c6644de2d155358ee00a3ee87695c4d383928287 100644
--- a/civicrm/templates/CRM/Campaign/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Delete.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Delete.tpl
index b222f39e0c3aeb34909b09776e809f1ba43057de..58bfd9a146e5760fc4fcba00fcb268e716123ee9 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Delete.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl
index bafe38402a376a05d272d8e50abc2a35d62882cd..3606762588562d3419ff211250dc2ad21a01deb7 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Questions.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Questions.tpl
index e8d9201443dd87668ce90e6ea55dbde190c73af2..c6ae05f4742ff7b9f83e528bb314bbee7652d7fc 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Questions.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Questions.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl
index 95424e10f4f828977234825481c8ec052de11fad..16b033512b7e81c5d544d04a8eb8dc3732ce5922 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Tab.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Tab.tpl
index 20e69d9267638eccce48352d625da232fbfc80f9..123dbebca979c9cfa7b735e85047d6d7cdb62788 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Tab.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Interview.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Interview.tpl
index 6661217d8f4c9958668db7ee2b7691f113ca4d65..0910c52194d4578b3eeb5ce220a3e2689e06751d 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Interview.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Interview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Print.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Print.tpl
index a538e12efae55bfbc98a960c8dd681b389e79455..13c5b65818de96f223329b973a4aaf438394d0bf 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Release.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Release.tpl
index 316755747b990c47d903a7ee2c79112bf8549d5f..8b9ff81f987dd25e5dcd1e91985f9b1ba7bf6ef8 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Release.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Release.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl
index 305815b639dbb2790578922b78089cf2fc0e2dec..85718614dc4b34448fbcad2304bd55757da42329 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Result.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Result.tpl
index 466bee7e8df2335e671f321a005d411d0fca4b34..7b86bba85f13f5d713a87010efaeb4de71cfa8db 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Result.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Form/addCampaignToComponent.hlp b/civicrm/templates/CRM/Campaign/Form/addCampaignToComponent.hlp
index 0f3fb85d8a7cd8af4fbd5b6c4ddec6459e925f66..3715d0af39cf79b0aabd67ac290fc4f2419d5232 100644
--- a/civicrm/templates/CRM/Campaign/Form/addCampaignToComponent.hlp
+++ b/civicrm/templates/CRM/Campaign/Form/addCampaignToComponent.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Page/DashBoard.tpl b/civicrm/templates/CRM/Campaign/Page/DashBoard.tpl
index db652698dea3ed0e8c1164e1b90dbd6290429c39..42605df4d0e0bd6e0d27027f81f1a1568c3b5c1d 100644
--- a/civicrm/templates/CRM/Campaign/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/DashBoard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Page/Petition.tpl b/civicrm/templates/CRM/Campaign/Page/Petition.tpl
index af10925dcadf36cba45c78077b9e9c20e25f6477..2eef400166dd4b0f958c359eb23a57e4b21ff8d1 100644
--- a/civicrm/templates/CRM/Campaign/Page/Petition.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/Petition.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Page/Petition/Confirm.tpl b/civicrm/templates/CRM/Campaign/Page/Petition/Confirm.tpl
index 67cf67ef19169423c448385b47b46be307eb8101..13898068bba1b592abea2f3109ff02ff29d190f8 100644
--- a/civicrm/templates/CRM/Campaign/Page/Petition/Confirm.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/Petition/Confirm.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Page/Petition/ThankYou.tpl b/civicrm/templates/CRM/Campaign/Page/Petition/ThankYou.tpl
index d05ed19df0385251372d52bf52e20953a1837a4a..cd518c558cb7bf041a00b9a715e998af512c8826 100644
--- a/civicrm/templates/CRM/Campaign/Page/Petition/ThankYou.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/Petition/ThankYou.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Campaign/Page/Vote.tpl b/civicrm/templates/CRM/Campaign/Page/Vote.tpl
index 3e9879c8f0c87dfb373f2763b0606a9d377d1b11..c892af8d55747cce37857c88374572946fe9d604 100644
--- a/civicrm/templates/CRM/Campaign/Page/Vote.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/Vote.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Audit/Audit.tpl b/civicrm/templates/CRM/Case/Audit/Audit.tpl
index 7590a03286c40c280657b042b75f301d8c2eb927..0a39bfb6f2da55608dd78500ff2524157e0f0b24 100644
--- a/civicrm/templates/CRM/Case/Audit/Audit.tpl
+++ b/civicrm/templates/CRM/Case/Audit/Audit.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Audit/Report.tpl b/civicrm/templates/CRM/Case/Audit/Report.tpl
index a610e9ea9ab96eabaf9e058a60d416ac61ddf7b7..c6d33fa3398cf4484e7a7655fe80ca0b2497a602 100644
--- a/civicrm/templates/CRM/Case/Audit/Report.tpl
+++ b/civicrm/templates/CRM/Case/Audit/Report.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Activity.tpl b/civicrm/templates/CRM/Case/Form/Activity.tpl
index c30c34f1438ea43513b65be85ca7ae8f1897a71d..c23f052a0e11c66e38a96044931202bd36c4756b 100644
--- a/civicrm/templates/CRM/Case/Form/Activity.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStartDate.tpl b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStartDate.tpl
index e07aebd8a265d0dd80a06d81d1c2262e97140df1..928cf460ac9b7353a58e188aa66a4678d3d74993 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStartDate.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStartDate.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStatus.tpl b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStatus.tpl
index 4eee6962163bb4431dcbb85492422500ee8e1e7c..7ccb54d4dd061794db1c8031670218be4661ee86 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStatus.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStatus.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseType.tpl b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseType.tpl
index 09427e9d99e41d4ac72df2e0fb3679096998ee28..24065ba62989542f02e5a87fd994b1452b286562 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseType.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Activity/LinkCases.tpl b/civicrm/templates/CRM/Case/Form/Activity/LinkCases.tpl
index 69bd93d9f440773247fd2567772fd6335f430878..84ea45a75fff647a6a60643b3f4ecc23f4229e5e 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/LinkCases.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/LinkCases.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Activity/OpenCase.tpl b/civicrm/templates/CRM/Case/Form/Activity/OpenCase.tpl
index d2675f99b3a341a106578b1d83f89584bdb9baf7..724b9eebba47fc2295148150faf7d72d2a069912 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/OpenCase.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/OpenCase.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/ActivityTab.tpl b/civicrm/templates/CRM/Case/Form/ActivityTab.tpl
index 14796de4616231fc3368d632a70fdbb3c483dd1f..132ecbdb92d9def6d95528e4994ba7617e3070f8 100644
--- a/civicrm/templates/CRM/Case/Form/ActivityTab.tpl
+++ b/civicrm/templates/CRM/Case/Form/ActivityTab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/ActivityToCase.tpl b/civicrm/templates/CRM/Case/Form/ActivityToCase.tpl
index 2a24cf7639597566e56cc8cb58ef205cdb8927de..938e2d817fd4674824b8dc35e7400a3e57726d07 100644
--- a/civicrm/templates/CRM/Case/Form/ActivityToCase.tpl
+++ b/civicrm/templates/CRM/Case/Form/ActivityToCase.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/ActivityView.tpl b/civicrm/templates/CRM/Case/Form/ActivityView.tpl
index 0d4194dd27a1ed145cd5dc300821b12c74261d35..d7236069ce73d7e987eb0a286e942768cce20ae3 100644
--- a/civicrm/templates/CRM/Case/Form/ActivityView.tpl
+++ b/civicrm/templates/CRM/Case/Form/ActivityView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Case.hlp b/civicrm/templates/CRM/Case/Form/Case.hlp
index d9fbedebf7eaaaa860c6ece9fb9970e06df470eb..c9cdf6a484c29ad68ee5ab4127a1170dd68d87b9 100644
--- a/civicrm/templates/CRM/Case/Form/Case.hlp
+++ b/civicrm/templates/CRM/Case/Form/Case.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Case.tpl b/civicrm/templates/CRM/Case/Form/Case.tpl
index 8f1339ce6644ca16972cbc15439f812d81fad50b..b577aa9c70042a2444de77e310925a2a1fd0c723 100644
--- a/civicrm/templates/CRM/Case/Form/Case.tpl
+++ b/civicrm/templates/CRM/Case/Form/Case.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/CaseFilter.tpl b/civicrm/templates/CRM/Case/Form/CaseFilter.tpl
index b2b7ce348e530d0011452894748120a99f1cb69c..129c1e72e40c771b4f3337165f28778870fe0b2b 100644
--- a/civicrm/templates/CRM/Case/Form/CaseFilter.tpl
+++ b/civicrm/templates/CRM/Case/Form/CaseFilter.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/CaseView.tpl b/civicrm/templates/CRM/Case/Form/CaseView.tpl
index 21704601c81818d05127950a5517cbeaf00ffded..f15819318a3ca021d6fb780b8b6ca1b832f48b5b 100644
--- a/civicrm/templates/CRM/Case/Form/CaseView.tpl
+++ b/civicrm/templates/CRM/Case/Form/CaseView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/CustomData.tpl b/civicrm/templates/CRM/Case/Form/CustomData.tpl
index 9bb2efe5661605be726a9f9a31bbd401454a5271..c3691b6a5f074f70048a8eadc40feda74883f205 100644
--- a/civicrm/templates/CRM/Case/Form/CustomData.tpl
+++ b/civicrm/templates/CRM/Case/Form/CustomData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/EditClient.tpl b/civicrm/templates/CRM/Case/Form/EditClient.tpl
index 57304bf9268966a1b2ea3d9ca6deb8fce411cc12..17feaab333b590f81646a77b456828cb403563ac 100644
--- a/civicrm/templates/CRM/Case/Form/EditClient.tpl
+++ b/civicrm/templates/CRM/Case/Form/EditClient.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Report.tpl b/civicrm/templates/CRM/Case/Form/Report.tpl
index b0ffe221d28f1730adee384d54adb9dbc6012f4b..26b8ba42c06d0ce1c756d072bac9f481d872721b 100644
--- a/civicrm/templates/CRM/Case/Form/Report.tpl
+++ b/civicrm/templates/CRM/Case/Form/Report.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Search.tpl b/civicrm/templates/CRM/Case/Form/Search.tpl
index b3f9c6f9a80a7b68a7a23c546c2435a15bd42a27..deb84add83f6954c396cba03f3acecc2cae0efcf 100644
--- a/civicrm/templates/CRM/Case/Form/Search.tpl
+++ b/civicrm/templates/CRM/Case/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl
index 1744c25ac1c2e9f7f0a50aaf2c332b301f85ccb1..bc2313e603e2670b1af4ce287f9477cf2d470794 100644
--- a/civicrm/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Search/Common.tpl b/civicrm/templates/CRM/Case/Form/Search/Common.tpl
index 9050c4dc169647907d03123f28bbd0de973b8d8e..ca1da45317478aa0d1a11c1c911aca537f427661 100644
--- a/civicrm/templates/CRM/Case/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Case/Form/Search/Common.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Case/Form/Search/EmptyResults.tpl
index 01181d11d7ecba1c2ea31d11250c405a0f8b36d3..2e0091fea6e08e66cb24a9e28f58f85c8ae70589 100644
--- a/civicrm/templates/CRM/Case/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Case/Form/Search/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Selector.tpl b/civicrm/templates/CRM/Case/Form/Selector.tpl
index b465a5ef9d888d645dfd9ea7c8b3a3dc533dbc3e..7316fd32db9bd251bf2ad5867db91faf6814337c 100644
--- a/civicrm/templates/CRM/Case/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Case/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Task.tpl b/civicrm/templates/CRM/Case/Form/Task.tpl
index c8703ed02075a10e39bd69da09f0ee8203bff54d..44e38cb3051a9f29566be6d9b7ab49e689a8b032 100644
--- a/civicrm/templates/CRM/Case/Form/Task.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Task/Batch.tpl b/civicrm/templates/CRM/Case/Form/Task/Batch.tpl
index cb492e4c430c64d4c1505d269d224c4ede639e6f..13febccab52a72c5d4c437cd4b0ad0548f094d48 100644
--- a/civicrm/templates/CRM/Case/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Task/Delete.tpl b/civicrm/templates/CRM/Case/Form/Task/Delete.tpl
index c5e75b66f744ae5120773c8730244031343e1bdb..93bdb45c2104a37510f660bd4956e869f08b9915 100644
--- a/civicrm/templates/CRM/Case/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Task/PDF.tpl b/civicrm/templates/CRM/Case/Form/Task/PDF.tpl
index 2969b3b8a0868ac50fe9de865c7fa9c74d133185..81e3bb3b0f218591e0818a2d026615dcb96b1942 100644
--- a/civicrm/templates/CRM/Case/Form/Task/PDF.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task/PDF.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Case/Form/Task/PickProfile.tpl
index 76ef91896a6025dbe52b2b753c2a8a9156256e71..a03e4a1ed74bf7ebd0d546a3853431ec13259167 100644
--- a/civicrm/templates/CRM/Case/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task/PickProfile.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Task/Print.tpl b/civicrm/templates/CRM/Case/Form/Task/Print.tpl
index 813405f0cbea66374f3d396afb26b9b33ef4a101..d1914dba0f0ca3e7d324e57a449a89fbbe164177 100644
--- a/civicrm/templates/CRM/Case/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/Task/Restore.tpl b/civicrm/templates/CRM/Case/Form/Task/Restore.tpl
index 264d4991662c44d1ce706a8f44edfa3b6d05c155..ffabcaa1187d0023a0d4dcd981c1ccab00c0786a 100644
--- a/civicrm/templates/CRM/Case/Form/Task/Restore.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task/Restore.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Form/ViewRelatedCases.tpl b/civicrm/templates/CRM/Case/Form/ViewRelatedCases.tpl
index 493087853f6b17a89434019859104849708f67c0..7fb3a2ae092d62430e0dd2e3eedf968534eefbf8 100644
--- a/civicrm/templates/CRM/Case/Form/ViewRelatedCases.tpl
+++ b/civicrm/templates/CRM/Case/Form/ViewRelatedCases.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Page/CaseDetails.tpl b/civicrm/templates/CRM/Case/Page/CaseDetails.tpl
index eeee9e8e176f3f50fc1331517d8cc5277fbae879..f6d58cc9e0c652e7eb8ffbf2dbd33d9166d0abfe 100644
--- a/civicrm/templates/CRM/Case/Page/CaseDetails.tpl
+++ b/civicrm/templates/CRM/Case/Page/CaseDetails.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Page/ConfigureError.tpl b/civicrm/templates/CRM/Case/Page/ConfigureError.tpl
index 6e16d6457e5af28a659d57b0ac6ac86ed93e0e05..b653d11c1843e2996df462ce9d0179b6a197391e 100644
--- a/civicrm/templates/CRM/Case/Page/ConfigureError.tpl
+++ b/civicrm/templates/CRM/Case/Page/ConfigureError.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Page/CustomDataView.tpl b/civicrm/templates/CRM/Case/Page/CustomDataView.tpl
index e00108d734f245873cbdb6056e10f7ae3d55d468..95cdbd487ab5d70460e833f838a456addb1df2c8 100644
--- a/civicrm/templates/CRM/Case/Page/CustomDataView.tpl
+++ b/civicrm/templates/CRM/Case/Page/CustomDataView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Page/DashBoard.tpl b/civicrm/templates/CRM/Case/Page/DashBoard.tpl
index e42331b5296159ce597218fbcb5467117dad24a8..3653468a6c694e8affa46b43ebca81e4a4dfb1cf 100644
--- a/civicrm/templates/CRM/Case/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Case/Page/DashBoard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Page/DashboardSelector.tpl b/civicrm/templates/CRM/Case/Page/DashboardSelector.tpl
index 4681a7fb5073de0c96f8a3c16229c6b31112ca3d..9fd5b1f1f1c03d463fdc49ed1c99c5ee2ebe6c93 100644
--- a/civicrm/templates/CRM/Case/Page/DashboardSelector.tpl
+++ b/civicrm/templates/CRM/Case/Page/DashboardSelector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/Page/Tab.tpl b/civicrm/templates/CRM/Case/Page/Tab.tpl
index 465feefdbc376b487214e0918b0166ea8cca97de..3e7a67db9599c1f367f053c418c1727774088398 100644
--- a/civicrm/templates/CRM/Case/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Case/Page/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Case/XMLProcessor/Report.tpl b/civicrm/templates/CRM/Case/XMLProcessor/Report.tpl
index 53a5d66c9ee3c3efe4be727d72e00fa3c020a073..6d78c5716d4c9afa6a041a7aedab6ef4fd5f2c6c 100644
--- a/civicrm/templates/CRM/Case/XMLProcessor/Report.tpl
+++ b/civicrm/templates/CRM/Case/XMLProcessor/Report.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Contact.hlp b/civicrm/templates/CRM/Contact/Form/Contact.hlp
index 584e7336ae4d95d96aa2a057d6ad1274249f2834..54f9695d2e6f5450608aa0abbe96ad176df393c6 100644
--- a/civicrm/templates/CRM/Contact/Form/Contact.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Contact.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Contact.tpl b/civicrm/templates/CRM/Contact/Form/Contact.tpl
index 6b59ec94f83e2c7815590033e9cfabf855351fec..a72929461a29ef630fa4367ad048c899a014bbec 100644
--- a/civicrm/templates/CRM/Contact/Form/Contact.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Contact.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/CustomData.tpl b/civicrm/templates/CRM/Contact/Form/CustomData.tpl
index fe03951dbad5e5f9602c9626fa3b282e2eab05aa..b6300f6d72c047e4803f203ba9432fa696b3fa34 100644
--- a/civicrm/templates/CRM/Contact/Form/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Form/CustomData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/DedupeFind.tpl b/civicrm/templates/CRM/Contact/Form/DedupeFind.tpl
index 90570703f812ec76169e8ecb1c75b1637bce7525..2b5aed7ff59a112fde4917eaf241f33038a1a4ac 100644
--- a/civicrm/templates/CRM/Contact/Form/DedupeFind.tpl
+++ b/civicrm/templates/CRM/Contact/Form/DedupeFind.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -23,13 +23,13 @@
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
-<div class="crm-block crm-form-block crm-dedupe-find-form-block">
<div class="help">
{ts}You can search all contacts for duplicates or limit the results for better performance.
If you limit by group then it will look for matches with that group both inside and outside of the group.
You can also limit the contacts in the group to be matched by specifying the number of contacts to match. This can be done in conjunction with a group or separately and is recommended for performance reasons.
{/ts}
</div>
+<div class="crm-block crm-form-block crm-dedupe-find-form-block">
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-dedupe-find-form-block-group_id">
diff --git a/civicrm/templates/CRM/Contact/Form/DedupeRules.tpl b/civicrm/templates/CRM/Contact/Form/DedupeRules.tpl
index 97e87f6cf8529a3b3af048db0547f3f868c467d6..8eabbb746a3c5c2fdec48b0fe7b05fe315dd974b 100644
--- a/civicrm/templates/CRM/Contact/Form/DedupeRules.tpl
+++ b/civicrm/templates/CRM/Contact/Form/DedupeRules.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Domain.hlp b/civicrm/templates/CRM/Contact/Form/Domain.hlp
index 1487060b4f9bfd2681d4737343c12a03b938f75d..f3aa1fcef06be116aafdf2d8295b9d8fcf1cac30 100644
--- a/civicrm/templates/CRM/Contact/Form/Domain.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Domain.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Domain.tpl b/civicrm/templates/CRM/Contact/Form/Domain.tpl
index 614820741ad4724975d2d2d747fc8a69ae684de1..70875e7e25afcb81778299f5dab06b627c536ce0 100644
--- a/civicrm/templates/CRM/Contact/Form/Domain.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Domain.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl
index f349211b2fe52bf6bf8abc11e75c864b51652123..44280729f0e60ae42d238469b12a6e405d2d47a9 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl
index feaa7c09882c9a0d7e119b509467fa24913a08b7..02459a20b3ac81dc3f0a23c2730ce0a5d8998907 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/address_name.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/address_name.tpl
index c880bd91c6aa6e01206c16735e2edf78cee5c9fe..2a5aab31824754dbb7d17e0f94d9e78d1fb41de4 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/address_name.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/address_name.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl
index dcc3a6c4773eb5b2331c2847a24b14858a452336..c93b94035552e9d109a0ece0f75a289b57293280 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/country_state_province.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/country_state_province.tpl
index d5e563b9b98e6a3e5536c785bc3e8c7ced3603d1..8dec96926c873d0ea7f301bee7dde76ff1749b1c 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/country_state_province.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/country_state_province.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/county.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/county.tpl
index 137f74ac1d458388f1d5a5bb17d056e1902d451b..28d9d05e2ee8eb04fce598111eaceb769f593eff 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/county.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/county.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl
index 052d4cc86b0840621193585a12361a911eac5caa..5a20303f14c2a5b29b4b0be217c3474fce0d122c 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/street_address.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/street_address.tpl
index d635797bab8517419835687a523b665bf7342db4..c531468967f14f9f38e480a0195c010be4101618 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/street_address.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/street_address.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_1.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_1.tpl
index 871edb93b8de9a6e25a8c78298c5813b223b4090..295f2d72f366a5c8d0ae516beb0f75fb69ca81ba 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_1.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_1.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_2.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_2.tpl
index 36c44a361f7143fb667cff353941f535f692d006..9253d05a662cf3034bb129b3ddf99a9f9e0fd5fc 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_2.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_2.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_3.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_3.tpl
index 2c98345031a36ec52b823b382c021f3e08e8ddd7..b826f3c0e17822cefef2677794739e1094a6541e 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_3.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/supplemental_address_3.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl b/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl
index a6d8c8b4d926ccb1f2554bb6a8699c4ee89fba23..1db9d2cad9fea033a34c85d4e4f9b84c5554d559 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl b/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
index e9c4e3c3a92f3b5428244f4b89a13f1a5d95f7f1..bee3ef158535f37ce5aed278f4a396cdc78ea4ce 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl b/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl
index 8b5606a8ab33ba9efe85e4ced228b6ad92e6ba51..98ca2b8b1a589a3c60d66acb98bba2145aa1cfc1 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
index afcb2731c2599d7fb92a56d01a41c0f8414772c2..dd0afbacbecfd692d1487b303074eda84bee40a7 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
index c0a9021f2a72fb2a7933dbfed2468759f18baacb..c810f2a3cb562fe98ff4ef6faa915606b1b5b988 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Household.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Household.tpl
index 20adf26f8313b645164a0de58e7a4a4b7e38891e..1b40a005f1eb91c8b20f4947e6b575fc5408bbc3 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Household.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Household.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/IM.tpl b/civicrm/templates/CRM/Contact/Form/Edit/IM.tpl
index 996133e1225f35ab6bdeb72a1226cfb8019bd355..a334dafbf4a8e1f6b0566a3921abb846661ce9ef 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/IM.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/IM.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Individual.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Individual.tpl
index 75e64e8e03baea9a762cc6c59bd89e0367296e4c..25cfef12ff3de182ae65143e0def5ccb2a40c276 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Individual.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Individual.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl
index 60e80f9387eea523b9ead98bd444ce78f7878939..0787c61ffd6d4e8b3e8386a97fa98fae97bc2d51 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/OpenID.tpl b/civicrm/templates/CRM/Contact/Form/Edit/OpenID.tpl
index d5f286a4e38af1fca2def00007cc1ab7497cb02a..1ebc92e2a6dc6af4e6b8bd02be350f202585e12b 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/OpenID.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/OpenID.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Organization.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Organization.tpl
index c42419fac9c2ea118c44f6118ae57d8aa6932d16..90fbc4370365780f16cd01d485e46d5ac680b751 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Organization.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Organization.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Phone.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Phone.tpl
index 91b4923fabae3105cffac699067186ec541d34c8..04b710bde37d8d71bcc2742134b9a512db19581a 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Phone.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Phone.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index 134528e776211d2cae50270eb644c7515a9ae7e6..f6da78e9c1d571bcb49963c5b24593ee27a9305d 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Tagtree.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Tagtree.tpl
index 7866184299b16964a7f4c9bcfef8c587d359245b..3037ca0f0e686fd05fe32405c1da36dafaf5656f 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Tagtree.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Tagtree.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Website.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Website.tpl
index f4cae01a1fb5f78f4d86ee06411a853952a2a115..e810a3d6fb9ca095e8d9e0cd3e722c1bed701ab0 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Website.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Website.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/GroupContact.tpl b/civicrm/templates/CRM/Contact/Form/GroupContact.tpl
index 95e2eb37d95e0862368c434201363f1ac14e4e63..900c14a9871da04cb6d267e6a3e440f3047dd5e4 100644
--- a/civicrm/templates/CRM/Contact/Form/GroupContact.tpl
+++ b/civicrm/templates/CRM/Contact/Form/GroupContact.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Address.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Address.tpl
index 75042ca6ece42c85a221d05112d8122106d0c75d..2f00a60984a757900f417074a4dcb24d4e741d62 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Address.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Address.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl b/civicrm/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
index ff8b07cd60cd5d268d7a524c404955110139280c..2b02f6be95c3f57debd2231aad74d64f8b8b1500 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/ContactInfo.tpl b/civicrm/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
index e91e157f7e87cfbdcc01447317b5234696f3c860..e518866865afac33508d6df09f96f004d6f47518 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/ContactName.tpl b/civicrm/templates/CRM/Contact/Form/Inline/ContactName.tpl
index d2f8ebe784ee60c7b77cd7d36062e257a80fb030..d2230b920a7b0c8d0c3afb3e987842e0ec27a459 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/ContactName.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/ContactName.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/CustomData.tpl b/civicrm/templates/CRM/Contact/Form/Inline/CustomData.tpl
index 02d657b2fe77e83479ec52199e962c05bc1756b4..0b62b0d9751bc38727c0dd1ae8d2c57fe808d494 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/CustomData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl
index 2e6605f9f08d184f4db0d9c67e31823bae3d4fc4..0466307214d1353dd5883bed8331b3a884dacdca 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Email.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Email.tpl
index ccbfd1d54a0a7df73ca613b90459c716bda038b0..2d534df3deeac5c6c3d067eb13391ee743589e2d 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Email.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/IM.tpl b/civicrm/templates/CRM/Contact/Form/Inline/IM.tpl
index 22a6b2424cc1e17ad7fa0f4a109dd7b7701a565d..13a9d96bdb1e0db69a27f07eb9728e14d04c132e 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/IM.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/IM.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/OpenID.tpl b/civicrm/templates/CRM/Contact/Form/Inline/OpenID.tpl
index 972e280ad67093530e0104b28275ef4042527f7e..590feb23d0ecb67b93e44fb76f951c6f300e61f6 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/OpenID.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/OpenID.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Phone.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Phone.tpl
index 16cec53a76c2cf176ed3f6e41e9f187a47cdfbf1..8eebfebe2496f1066f895fb7c365416fcceaacc1 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Phone.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Phone.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Website.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Website.tpl
index a3060909caabd88e52816837cd7dfd4452157670..8057d46ddde4adf86c8fc13148cdba85f0d2b3a7 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Website.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Website.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Merge.hlp b/civicrm/templates/CRM/Contact/Form/Merge.hlp
index 8a39a0c98b62acf0d6881a8fe66ce39320590c2d..1898e57360ae318d4e0f64213a4becc5218d90b9 100644
--- a/civicrm/templates/CRM/Contact/Form/Merge.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Merge.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Merge.tpl b/civicrm/templates/CRM/Contact/Form/Merge.tpl
index ce3a6ebd3b1bcee685492a138c1964a07248c9fd..1b772359609aedd15eda3085da828d486c13e07c 100644
--- a/civicrm/templates/CRM/Contact/Form/Merge.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Merge.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/OnBehalfOf.tpl b/civicrm/templates/CRM/Contact/Form/OnBehalfOf.tpl
index 84f107ad204cfadf018d3ec4adc279a7b8a1c264..49240cd674af823ca557da342eab0fac1a2480e2 100644
--- a/civicrm/templates/CRM/Contact/Form/OnBehalfOf.tpl
+++ b/civicrm/templates/CRM/Contact/Form/OnBehalfOf.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/RelatedContact.tpl b/civicrm/templates/CRM/Contact/Form/RelatedContact.tpl
index 947bac84c9e1585bd4e82a118ea4f0f7e2f5eb79..ca28db0857066f29aa30a44c5aeff5ddc3925e01 100644
--- a/civicrm/templates/CRM/Contact/Form/RelatedContact.tpl
+++ b/civicrm/templates/CRM/Contact/Form/RelatedContact.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Relationship.tpl b/civicrm/templates/CRM/Contact/Form/Relationship.tpl
index 77a3244014735d9a69e69071cc47b124be11895f..d921c211a760473832101d47f5fef87b8dff007b 100644
--- a/civicrm/templates/CRM/Contact/Form/Relationship.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Relationship.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -144,10 +144,88 @@
CRM.$(function($) {
var
$form = $("form.{/literal}{$form.formClass}{literal}"),
- relationshipData = {/literal}{$relationshipData|@json_encode}{literal};
- $('[name=relationship_type_id]', $form).change(function() {
+ $relationshipTypeSelect = $('[name=relationship_type_id]', $form),
+ relationshipData = {},
+ contactTypes = {/literal}{$contactTypes|@json_encode}{literal};
+
+ (function init () {
+ // Refresh options if relationship types were edited
+ $('body').on('crmOptionsEdited', 'a.crm-option-edit-link', refreshRelationshipData);
+ // Initial load and trigger change on select
+ refreshRelationshipData().done(function() {
+ $relationshipTypeSelect.change();
+ });
+ $relationshipTypeSelect.change(function() {
+ var $select = $(this);
+
+ // ensure we have relationship data before changing anything
+ getRelationshipData().then(function() {
+ updateSelect($select);
+ })
+ });
+ })();
+
+ /**
+ * Fetch contact types and reset relationship data
+ */
+ function refreshRelationshipData() {
+ // reset
+ relationshipData = {};
+
+ return getRelationshipData();
+ }
+
+ /**
+ * Fetches the relationship data using latest relationship types
+ */
+ function getRelationshipData() {
+ var defer = $.Deferred();
+
+ if (!$.isEmptyObject(relationshipData)) {
+ defer.resolve(relationshipData);
+ }
+
+ CRM.api3("RelationshipType", "get", {"options": {"limit":0}})
+ .done(function (data) {
+ $.each(data.values, function (key, relType) {
+ // Loop over the suffixes for a relationship type
+ $.each(["a", "b"], function (index, suffix) {
+ var subtype = relType["contact_subtype_" + suffix];
+ var type = subtype || relType["contact_type_" + suffix];
+ var label = getContactTypeLabel(type) || "Contact";
+ label = label.toLowerCase();
+ relType["placeholder_" + suffix] = "- select " + label + " -";
+ });
+
+ relationshipData[relType["id"]] = relType;
+ });
+
+ defer.resolve(relationshipData);
+ });
+
+ return defer.promise();
+ }
+
+ /**
+ * Gets a contact type label based on a provided name
+ * @param {String} name - the name of the contact type
+ */
+ function getContactTypeLabel(name) {
+ var label = "";
+
+ $.each(contactTypes, function(index, contactType) {
+ if (contactType.name === name) {
+ label = contactType.label;
+ return false;
+ }
+ });
+
+ return label;
+ }
+
+ function updateSelect($select) {
var
- val = $(this).val(),
+ val = $select.val(),
$contactField = $('#related_contact_id[type=text]', $form);
if (!val && $contactField.length) {
$contactField
@@ -190,7 +268,7 @@
CRM.buildCustomData('Relationship', rType);
}
- }).change();
+ }
});
{/literal}
</script>
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Advanced.hlp b/civicrm/templates/CRM/Contact/Form/Search/Advanced.hlp
index b183ab6b852bfc4b490b59a85f3086ec6a2aa885..153b8b05342fd961787544ad8ba1234f03e116b9 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Advanced.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Advanced.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl b/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl
index a9a3f61a479f14c55da4527dc792ef7fdfc64495..5b5d515dfe53da7b166e4274299b3a7ee11e646e 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index 47e8915dd7a43ab4f7b4e05e328bdc1bcfa7fbfa..3cb71262a0740d418e5903dc46dd98ac8f739f85 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Basic.hlp b/civicrm/templates/CRM/Contact/Form/Search/Basic.hlp
index d7580546b21dd62fd755e60214121c9d40e5462a..9969d59df8e36c9cd4d80d2a9cb206693bf01ec5 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Basic.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Basic.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Basic.tpl b/civicrm/templates/CRM/Contact/Form/Search/Basic.tpl
index ea9c89326107c3c9e318520c8af28736eeb01d7f..1b6b650b1d3192511c2aa5c0cc849a58bcac789c 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Basic.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Basic.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl b/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
index 0e48d148c66bb4a7893812b77c21bbf45ffdf37c..78379a6ffaf12c98102ba476e4fd3be3f7197ae3 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Builder.hlp b/civicrm/templates/CRM/Contact/Form/Search/Builder.hlp
index 3a7d844650d490e8883fd2d74d30b606e4f23103..e2cd37c19534e3b4d93f775260b97c26e95a4da1 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Builder.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Builder.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Builder.js b/civicrm/templates/CRM/Contact/Form/Search/Builder.js
index 171ccf39668210d122ecdf14178a9c8deb858238..7ec210b2b99f613d9764cce62cca1ab72f326dc0 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Builder.js
+++ b/civicrm/templates/CRM/Contact/Form/Search/Builder.js
@@ -1,5 +1,5 @@
// http://civicrm.org/licensing
-(function($, CRM) {
+(function($, CRM, _) {
'use strict';
/* jshint validthis: true */
@@ -14,16 +14,19 @@
var field = $('select[id^=mapper][id$="_1"]', row).val();
var operator = $('select[id^=operator]', row);
var op = operator.val();
-
+
var patt = /_1$/; // pattern to check if the change event came from field name
if (field !== null && patt.test(this.id)) {
- if ($.inArray(field, CRM.searchBuilder.stringFields) >= 0) {
- // string operators
- buildOperator(operator, CRM.searchBuilder.stringOperators);
- } else {
- // general operators
- buildOperator(operator, CRM.searchBuilder.generalOperators);
+ // based on data type remove invalid operators e.g. IS EMPTY doesn't work with Boolean type column
+ if ((field in CRM.searchBuilder.fieldTypes) === true) {
+ if (CRM.searchBuilder.fieldTypes[field] == 'Boolean') {
+ CRM.searchBuilder.generalOperators = _.omit(CRM.searchBuilder.generalOperators, ['IS NOT EMPTY', 'IS EMPTY']);
+ }
+ else if (CRM.searchBuilder.fieldTypes[field] == 'String') {
+ CRM.searchBuilder.generalOperators = _.omit(CRM.searchBuilder.generalOperators, ['>', '<', '>=', '<=']);
+ }
}
+ buildOperator(operator, CRM.searchBuilder.generalOperators);
}
// These Ops don't get any input field.
@@ -43,11 +46,13 @@
buildSelect(row, field, op);
}
- if ($.inArray(field, CRM.searchBuilder.dateFields) < 0) {
- removeDate(row);
+ if ((field in CRM.searchBuilder.fieldTypes) === true &&
+ CRM.searchBuilder.fieldTypes[field] == 'Date'
+ ) {
+ buildDate(row, op);
}
else {
- buildDate(row, op);
+ removeDate(row);
}
}
@@ -296,4 +301,4 @@
$('select[id^=mapper][id$="_1"]', '#Builder').each(handleUserInputField);
}
});
-})(cj, CRM);
+})(cj, CRM, CRM._);
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl b/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl
index 0c86a8ef1c81aad9a6bc7ecc7a0c6da73a6b11a1..640bf68a435051fcd3291b068532d941aebcd28a 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Activity.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Activity.tpl
index 931405104f28ffd20127340131431878d8ee992c..e732921a69f0bedda70b0b6ee4031e8b7e392ffb 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Activity.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Activity.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
index 212655dd57eabffb7a81c7b098ab45c35f5df8f2..ba59ec4468c90a8595bc2c3d7799eb5577e4c9d5 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
index 42d294d6ada09a0aeb51122ccb985b200d69d7e9..f056589569865a705baa36d758d0349c914db16e 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Custom.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Custom.tpl
index c6b1f4fc35eac43a38697346adfa96405f0cabdb..022ed3e42732589c6d38b33cd8682033de1f87db 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Custom.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Custom.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
index fe16f5163adbeab0663fb8250fe5e0d30ff6fa32..ac00fd81f73f9314b696e3998c900e889cc67c07 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7
+ | CiviCRM version 5
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.hlp b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.hlp
index a3014e3e6aba22227ee6533a91e44f0b77496ded..9ef15b64759e48a3ddf9a6f702a4b9d3f18b8156 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
index 6d72f6ba121077f5599efb0bf501cf8e18376d4d..8ce783b6df572f8d75c2bfd4805f53981b01e901 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Notes.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Notes.tpl
index 44c8367eee949470c8cb2b8471bee65024394063..c5e544d6e0082a802c9548f1e581d42a7974a366 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Notes.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Notes.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl
index 21f68c2696b25da3aa8d4d3ec1f40a39b726cdbd..297b8eb7d22ebcfee2ff24f32a1b631e6481e5a5 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Task.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Task.tpl
index 8c4c533324769f41bbb7d59d92ce19718ff0c040..ee82613c4716d6cff5da1b76dd686690a6bcc309 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Task.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom.tpl
index a47c940c2b8b01b1e745259c3932cd7aa1075e26..2e01271c56adc5d244807604849fcf27a20ecb03 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
index fbab9251ee2e0cff7982a65a0a59c1eee2715f4b..edbafd542895aaddc67f5769b8118832c2e1b520 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
index a9bd1cc5492cafb6432a2d0703466b84d62454ad..bcf977c848f1cf082745caa6d0bfc644e8358faf 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
index 77e905180c4785626b3677155e456b93aadac564..949ee104571bf6b379b59c1122be86ee4226bfde 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl
index c1c045a85f8b5f2d53f2b629da93ffa7defe822f..e338b7a4f94f064c0c2bf0ea5ba0fce6c3825063 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl
index 939cc87446e9cdfe562f51942335dce6a5b9c04b..bf0a2ebe125d04201005056e01ee0f88b15c27ec 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.hlp b/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.hlp
index ca4cee3d36f996eeaa2f14258c8778e7d375cb57..4010ca2f73798b97acf162019345880f3cfc4d95 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
index 57c42b6da617afe21b72bd5b22052c39eeba71bb..5760ea7d6d5c75e2ef0dc032e493328f086dbe97 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValues.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValues.tpl
index c3e4e9bc7d53fc4b81f958688842502f923b8892..8ccc15734716cf143c6c89c9dfad2f98337a79db 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValues.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValues.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
index f7a479e9be02f4961b4d7e22fff07919ac516faf..2360372cacedefde8c42b450d3bd4585b2dc46ed 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
index cf0f376ca51023063a2b753bd09199cb13500f81..453ac588f2004036fd13d96db93cef826aa009f3 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/Sample.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/Sample.tpl
index 692c245c1632ac13c5bb3ef074f387a17185ae3f..80033c0624ff62a759fa258c8f98eb271d2ceca3 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/Sample.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/Sample.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Contact/Form/Search/EmptyResults.tpl
index 8e16a4a2d2e9da7e42cb76631e5559a9d4afbada..5e706b46cbd93c069c476ba76997d9e4dee950c2 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl b/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl
index c75a1729777f5546a38e575a25552645425f8ea7..2bd021faafe0827768bf8a0d72b5bb05f54cedef 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/ResultTasks.tpl b/civicrm/templates/CRM/Contact/Form/Search/ResultTasks.tpl
index e50d86464e8fd03612d19ab05b2093a99b96bcd3..48e56aa85aa97872e3132b9ab91c03d6398e4cf0 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/ResultTasks.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/ResultTasks.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Search/table.tpl b/civicrm/templates/CRM/Contact/Form/Search/table.tpl
index 777f54525d08ca31e955f827effca1d7c644e7a5..ff4b855fe2aabaaec4d03d6ab1f9279d33e6fb94 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/table.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/table.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Selector.tpl b/civicrm/templates/CRM/Contact/Form/Selector.tpl
index e90648834ae92d1360357c604f5f54c6ac4592b5..7129105fcaa67b70b24050457a9ece2cdc2ae84c 100644
--- a/civicrm/templates/CRM/Contact/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/ShareAddress.tpl b/civicrm/templates/CRM/Contact/Form/ShareAddress.tpl
index d74f44b43db5615427ea5e729fdefde265338958..af34e82c017d3c5bb0877e2ce9494df5a3058307 100644
--- a/civicrm/templates/CRM/Contact/Form/ShareAddress.tpl
+++ b/civicrm/templates/CRM/Contact/Form/ShareAddress.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task.tpl b/civicrm/templates/CRM/Contact/Form/Task.tpl
index 170096b790a8b278514dd25737ce7a8a085810d2..0efcdcc2f2d52c2262bcb2e1442781bdf2ba782a 100644
--- a/civicrm/templates/CRM/Contact/Form/Task.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl
index 9973398771e6dc6f40a3e07ab9372aa389ffbf74..b10a859113b09f5a8c866a3911ae1cbf947832d1 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToHousehold.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToHousehold.tpl
index a11a6c950769fc99fc64ada0611a749f9786c3c7..408eb2e97c862093339f4dbc34d0193d21d2c17f 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToHousehold.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToHousehold.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToIndividual.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToIndividual.tpl
index ad75b414f9c9376e9652586ad028b8437175eeea..7f562f393082948d2714b2413959399c0e9210fd 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToIndividual.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToIndividual.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToOrganization.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToOrganization.tpl
index a11a6c950769fc99fc64ada0611a749f9786c3c7..408eb2e97c862093339f4dbc34d0193d21d2c17f 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToOrganization.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToOrganization.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToParentClass.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToParentClass.tpl
index 9b903698f9fe1f473cb921b71115fc8be275671d..f312e84bf72c09125e747e5bffc84fe987e6047e 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToParentClass.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToParentClass.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToTag.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToTag.tpl
index 9dbf3a06b18287870bc1949f3fc40f80af86d4d6..f1e9230e8257f5779c5264d67669586249d9ea7b 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToTag.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToTag.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AlterPreferences.tpl b/civicrm/templates/CRM/Contact/Form/Task/AlterPreferences.tpl
index b9dd0fb7c8b54c112cb4aaadd36249ba38b4c20d..6f31990201d9691c29a71ea8af8e0361932dad3a 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AlterPreferences.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AlterPreferences.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl b/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl
index c21611add9c171bfea35103af16efed80afe8869..f19c4119cb01c6e87665ac8be23a69f9fb5fdc04 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Delete.tpl b/civicrm/templates/CRM/Contact/Form/Task/Delete.tpl
index 1a0c95e7b5946a9ad9cebe28ae5e43d4b4db3a43..764e4d1431c6d2ff78c1caf12e2d81491362b5c0 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Email.hlp b/civicrm/templates/CRM/Contact/Form/Task/Email.hlp
index 37a5ddecfae96b7b57b8bccbd936205c35a1b14c..472f6cfbe7e753f22f3d5137635a3be3201554f5 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Email.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Task/Email.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Email.tpl b/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
index 107d23f7dc4e78ef0d9f4a597ed8e6ecf62d1905..337c71256b8fae94f33168fc89c4e1174cddfbb1 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl b/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl
index 6a8c4f10d4148f3d0f72f506422c334d2250174d..e5c8b0c9c916465113eebe7d395a89bb8866969f 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/GMapsInput.tpl b/civicrm/templates/CRM/Contact/Form/Task/GMapsInput.tpl
index dc9b5b74e90763755704bd7b44910a46aea63442..434ad7e7ebbc88b4afab178f87c3a04f15710a81 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/GMapsInput.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/GMapsInput.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/HookSample.tpl b/civicrm/templates/CRM/Contact/Form/Task/HookSample.tpl
index da42f18dd1d64d7ee8ddc6848ecc38089eda26b9..b23c21c9c87e109b18eddfce88ab335f98e2c0a8 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/HookSample.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/HookSample.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Label.hlp b/civicrm/templates/CRM/Contact/Form/Task/Label.hlp
index baa52849908952af3552310131f8af2d5e0910cc..15e81a19cf4c7a01f34e4972cda514fe42d5d126 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Label.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Task/Label.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Label.tpl b/civicrm/templates/CRM/Contact/Form/Task/Label.tpl
index e92df216f558c5bd527fd21b7801730965a98f74..8efac251e92f9d62b373f2e315599e44eeeb0b98 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Label.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Label.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Map.tpl b/civicrm/templates/CRM/Contact/Form/Task/Map.tpl
index bbb001f165fa5567b409ed15f82686cb194be638..3715d01efdeb2158f1dbe901e6951dffb1307c7b 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Map.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Map.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Map/Google.tpl b/civicrm/templates/CRM/Contact/Form/Task/Map/Google.tpl
index 6de47fef8f714ba7a2669a6dae13cbd08736a68c..2edd8ef0b37efa2507a9b6ac53291ec4fe251ad8 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Map/Google.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Map/Google.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl b/civicrm/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
index b306ffb692bf085843937722185835e1031382b1..81b9e06aa454ce59a6c99c0f520b21134f6e7676 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/PDF.tpl b/civicrm/templates/CRM/Contact/Form/Task/PDF.tpl
index 45b59cfd4d121c4ae5426e40c81bfff8e4928244..f5e8e9ccd9de94336a34877b97394e2e7440160a 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/PDF.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/PDF.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.hlp b/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.hlp
index 8ccf0e5543c06f02d7287e94b31a49bc3c50cb43..7542fbdb6198fe558198642b33e7d71aeea78e01 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright (C) 2011 Marty Wright |
| Licensed to CiviCRM under the Academic Free License version 3.0. |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl b/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
index caec3822383770e3450c20a514bfc781ca6cf2ac..34d3dbeea2df04489a280ecbab67524b6ed3e1d9 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Contact/Form/Task/PickProfile.tpl
index 4c1e0b961b498ed160f6889b4537689652aa47a4..fe5e40afd30ab6cf5b2d13ab969b9e2a46dd3269 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/PickProfile.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Print.tpl b/civicrm/templates/CRM/Contact/Form/Task/Print.tpl
index a93b7712b0687944ed7251a5f8e045471aa525fc..1315fdea8a7025b89aaf96c436f37778209bfa62 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -32,7 +32,7 @@
<br />
<table>
<tr class="columnheader">
-{if $id}
+{if $id OR $customSearchID}
{foreach from=$columnHeaders item=header}
<th>{$header}</th>
{/foreach}
@@ -63,13 +63,16 @@
{foreach from=$rows item=row}
<tr class="{cycle values="odd-row,even-row"}">
{if $id}
- <td>{$row.sort_name}</td>
- {foreach from=$row item=value key=key}
- {if ($key neq "checkbox") and ($key neq "action") and ($key neq "contact_type") and ($key neq "status") and ($key neq "contact_id") and ($key neq "sort_name")}
- <td>{$value}</td>
- {/if}
- {/foreach}
-
+ <td>{$row.sort_name}</td>
+ {foreach from=$row item=value key=key}
+ {if ($key neq "checkbox") and ($key neq "action") and ($key neq "contact_type") and ($key neq "status") and ($key neq "contact_id") and ($key neq "sort_name")}
+ <td>{$value}</td>
+ {/if}
+ {/foreach}
+{elseif $customSearchID}
+ {foreach from=$columnHeaders item=header key=name}
+ <td>{$row.$name}</td>
+ {/foreach}
{else}
<td>{$row.sort_name}</td>
{if !empty($columnHeaders.street_address)}
diff --git a/civicrm/templates/CRM/Contact/Form/Task/ProximityCommon.tpl b/civicrm/templates/CRM/Contact/Form/Task/ProximityCommon.tpl
index 8d1f9d60b76bc1fd6e380b994f55eef42992c963..80013fd26109c770cc3b3c75f1641968ba811786 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/ProximityCommon.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/ProximityCommon.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl b/civicrm/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl
index e31c5da22417becdc38d38f476bfca6b0d973645..eecf5fa18b52f8e1ab810fbfd8d79e66b6abc679 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl b/civicrm/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl
index cddbdd3cb0f444d94d525fb0899773e9eccdeadd..2b3fdbd4759c0014c46c722936a71ba6c120135e 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Result.tpl b/civicrm/templates/CRM/Contact/Form/Task/Result.tpl
index f8d68676380328d24bb14fe1b6bc88a59862cd34..d9481cf807c4f946b9088354f9d8ac5e308419ab 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Result.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SMS.hlp b/civicrm/templates/CRM/Contact/Form/Task/SMS.hlp
index 13b28ce4b762a25c0504b89a180786c4508bcf6e..b0961fab2c00f6abe71cd84d8692c6bc262a78d0 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SMS.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Task/SMS.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl b/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl
index 7dc476b172b1187578a439a0f57ca21d1f28daf1..236a37b4f8181a9da31025a76f86a25449a86658 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl b/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
index 7bddfed1ab0a78c9c68dcdc0313bda29906bbd96..91fc6e8c0344337b380ff967893b40c4aa577aaa 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl b/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl
index 8ddbd87a3fa8cfac3694f1d72f571d06e6c9e035..02e98d58bdcd0e2b46221a570431df5c6974ab0f 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SaveSearch/Update.tpl b/civicrm/templates/CRM/Contact/Form/Task/SaveSearch/Update.tpl
index e1dd8981d1e8586b0f433fe0a3294625cf04a698..b8d51a3b6ca7a51b31ba8a26b3277271a7dac078 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SaveSearch/Update.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/SaveSearch/Update.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Unhold.tpl b/civicrm/templates/CRM/Contact/Form/Task/Unhold.tpl
index 99cc1c57d7b7839a067b00a7694fe42e0cbb4f53..61f76c04334da355c8b7a32ed681062406a321bc 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Unhold.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Unhold.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Import/Form/CSV.tpl b/civicrm/templates/CRM/Contact/Import/Form/CSV.tpl
index 670b08ace0bab4a7863de3aa9b7317c0e09a5ec4..d1b3119c62ae44ae333c58f284338c8f6a54374e 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/CSV.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/CSV.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Contact/Import/Form/DataSource.hlp
index 6d9ecc8b7b892acccdb6f6f05a111801fa7fa40c..418202cc5cd430f4e52ae2ab0971b7208f8eaca8 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Contact/Import/Form/DataSource.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Contact/Import/Form/DataSource.tpl
index 451c23ae03f53e95b8910125ae8d337f37323c8c..9cb28f07d103e57675202a23109344fcf75e9d22 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/DataSource.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Import/Form/MapField.tpl b/civicrm/templates/CRM/Contact/Import/Form/MapField.tpl
index e46f313a30a7cb31ba0f1d50ffb9c8f646acef85..546d79ac3827948060e673acc69098e7ded1ff92 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/MapField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Contact/Import/Form/MapTable.tpl
index bc9566fdba3a2953ecd8161ac2e5053ee9cf4a27..9f11ba212f6f1eb6d7afdbc9950db801f157bbfa 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/MapTable.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Import/Form/Mapper.tpl b/civicrm/templates/CRM/Contact/Import/Form/Mapper.tpl
index 336041f9c9f00d3109f7c74bc4106d60336ef65f..555cbf974652364a3b0226b0a7b097be16267902 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/Mapper.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/Mapper.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl b/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl
index 41311a389d39109c172034824f19e38295075933..a2ab5af0186b6f35768cd7d2325f47a305e0f60e 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Import/Form/SQL.tpl b/civicrm/templates/CRM/Contact/Import/Form/SQL.tpl
index da703a12ad0fc4fdb9f226305febbd3578284799..0a49eb1a90cfdfa4771d7d804801cd40371c2e74 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/SQL.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/SQL.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Import/Form/Summary.tpl b/civicrm/templates/CRM/Contact/Import/Form/Summary.tpl
index 63951daa6126cb7db80465f351921c1798a36380..503dd3c8b530d5d4262b98cc815e04b0ef97f0c4 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/ContactImage.tpl b/civicrm/templates/CRM/Contact/Page/ContactImage.tpl
index 7ccc2ae3a21f0068a8a32e8611cdff000382af09..0f5f45243102d5aead29376a4491327c80384515 100644
--- a/civicrm/templates/CRM/Contact/Page/ContactImage.tpl
+++ b/civicrm/templates/CRM/Contact/Page/ContactImage.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/CustomSearch.hlp b/civicrm/templates/CRM/Contact/Page/CustomSearch.hlp
index 0837c6be665dbe2d194b0c80e1486605816508e8..7ec48a5c7280a1f5e6d51a03073ce422974b01cd 100644
--- a/civicrm/templates/CRM/Contact/Page/CustomSearch.hlp
+++ b/civicrm/templates/CRM/Contact/Page/CustomSearch.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/CustomSearch.tpl b/civicrm/templates/CRM/Contact/Page/CustomSearch.tpl
index f6b405c1c7f4eeb04d724b198d1fd2af143a5727..8f3a4fd85e471d7212a783b9300543f279e16f71 100644
--- a/civicrm/templates/CRM/Contact/Page/CustomSearch.tpl
+++ b/civicrm/templates/CRM/Contact/Page/CustomSearch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/DashBoard.tpl b/civicrm/templates/CRM/Contact/Page/DashBoard.tpl
index 9cab7b26ee392c073aae2284354da615ea854e5d..12333284877ec08b961108a40626ca19749af7e2 100644
--- a/civicrm/templates/CRM/Contact/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DashBoard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/DashBoardDashlet.tpl b/civicrm/templates/CRM/Contact/Page/DashBoardDashlet.tpl
index 811c9a72432b69cb36c02f177f36f0fcfcd1322d..d37fd8462503db28b5d8c774c91639d84a1a45cb 100644
--- a/civicrm/templates/CRM/Contact/Page/DashBoardDashlet.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DashBoardDashlet.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Dashboard.hlp b/civicrm/templates/CRM/Contact/Page/Dashboard.hlp
index 6256458ad8bcc3ec4f03d435db00fcae6437223d..d611c204fe9f23b532efd4d86c476470a27b1a18 100644
--- a/civicrm/templates/CRM/Contact/Page/Dashboard.hlp
+++ b/civicrm/templates/CRM/Contact/Page/Dashboard.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Dashlet.tpl b/civicrm/templates/CRM/Contact/Page/Dashlet.tpl
index 9d9d6f5b3ff8e3f08be757ff8a5df414c95ddc07..9d8d27eb550ac8f66abfafc747f9011bdb032434 100644
--- a/civicrm/templates/CRM/Contact/Page/Dashlet.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Dashlet.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeException.tpl b/civicrm/templates/CRM/Contact/Page/DedupeException.tpl
index aea2cd1f7af9fb5304266a3970ccba5ac1ffe0c5..189a1ef215b9a884b570fddcab975df9990eec2d 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeException.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DedupeException.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl b/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl
index 7e3a10d6a14a97d1c02d860ea24ea1999a6f3606..465acb44369b3721a7e48d8f93c46478177082f4 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -324,6 +324,9 @@
var is_selected = CRM.$('.crm-dedupe-select-all').prop('checked') ? 1 : 0;
}
+ var criteria = {/literal}'{$criteria|escape}'{literal};
+ criteria = criteria.length > 0 ? criteria : 0;
+
var dataUrl = {/literal}"{crmURL p='civicrm/ajax/toggleDedupeSelect' h=0 q='snippet=4'}"{literal};
var rgid = {/literal}"{$rgid}"{literal};
var gid = {/literal}"{$gid}"{literal};
@@ -331,7 +334,7 @@
rgid = rgid.length > 0 ? rgid : 0;
gid = gid.length > 0 ? gid : 0;
- CRM.$.post(dataUrl, {pnid: id, rgid: rgid, gid: gid, is_selected: is_selected}, function (data) {
+ CRM.$.post(dataUrl, {pnid: id, rgid: rgid, gid: gid, is_selected: is_selected, criteria : criteria}, function (data) {
// nothing to do for now
}, 'json');
}
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeMerge.tpl b/civicrm/templates/CRM/Contact/Page/DedupeMerge.tpl
index e362ce913e4320cc6836e60fbf367e662b39ffb5..cdc0c3af6627be0e60678de176158f7feb222968 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeMerge.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DedupeMerge.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeRules.hlp b/civicrm/templates/CRM/Contact/Page/DedupeRules.hlp
index 26e6a817a64f71214928e68560b73ce2a95a4712..467edc6d09d5b8629f3a75b9544a290511ff5ee7 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeRules.hlp
+++ b/civicrm/templates/CRM/Contact/Page/DedupeRules.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeRules.tpl b/civicrm/templates/CRM/Contact/Page/DedupeRules.tpl
index ad53b5eb680d91db01cf49221f9dbe68ae3dc6ba..0e874e0872ef91e02620e59dac4a94b108627df2 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeRules.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DedupeRules.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Actions.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Actions.tpl
index fdd790a1077d235ddcb0877314fcf5ed1a09114e..89667f50c8745836980f8f4d568471d183569239 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Actions.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Actions.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl
index 195a6d8414a6c489ba47ad8a3cc4b0d729c2ee45..10439c08e043c3d847cb07a8fe48436e220fa51e 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl b/civicrm/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl
index 85585db1b2d3587c442190861a7e52a1f6463730..2ad5268d93b644c94b98b4501cb4e1df710b190a 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/ContactInfo.tpl b/civicrm/templates/CRM/Contact/Page/Inline/ContactInfo.tpl
index 02f31adab1f8975a23261fcb524e6382a5484865..e6cdbfc18eb00d4d7659af67b90a2191115b79b1 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/ContactInfo.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/ContactInfo.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/ContactName.tpl b/civicrm/templates/CRM/Contact/Page/Inline/ContactName.tpl
index ddb734b353379a061d03acf204b3a8560727a5cd..57f3ee05bdeff4743e87e59f1cdb9c451cd4275c 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/ContactName.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/ContactName.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/CustomData.tpl b/civicrm/templates/CRM/Contact/Page/Inline/CustomData.tpl
index d3b80bdc2186288c5971aa6d1e6669bc7135ebf6..348302e6a15d6a1a596f2ac4f11f5206f546af19 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/CustomData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl
index 0953b70c96b3e801949ce2c79457988f2d06f75a..9567d74c7b3faf0d1ca3a1002fd472f0b6859680 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl
index 20bd83720915eb032f8082aaba253866b7b13134..2c471cb05df7a140fb7292eb9135dc217cee42df 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/IM.tpl b/civicrm/templates/CRM/Contact/Page/Inline/IM.tpl
index 2a59796c5d929dadea5a258baaacb12c6b162e9b..947146fc478598c8c01394bfed1bfd6716d8ba2b 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/IM.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/IM.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/OpenID.tpl b/civicrm/templates/CRM/Contact/Page/Inline/OpenID.tpl
index 0310a7c6bf21c7ab87314177b4775c8b05fedb3b..df35244b7ecbbcee20547f49a7ce7972201f116d 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/OpenID.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/OpenID.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Phone.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Phone.tpl
index cc81dcc87321b5a7c6e9208dd8387b3f0aa3eaf6..dc3451e45f11a0948efa1b5b406bf910f2d5c643 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Phone.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Phone.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Website.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Website.tpl
index 622ba32c516f338152e2e8d600fef18e80847243..774b211e5a4426af86a09c5f1cfd568c97ce5aea 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Website.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Website.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/SavedSearch.tpl b/civicrm/templates/CRM/Contact/Page/SavedSearch.tpl
index f75810e15e6551e4e3916c55b32a221b17402da1..1f93e9490b1a9f4488145cae699f1b830d17365a 100644
--- a/civicrm/templates/CRM/Contact/Page/SavedSearch.tpl
+++ b/civicrm/templates/CRM/Contact/Page/SavedSearch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/ContactSmartGroup.tpl b/civicrm/templates/CRM/Contact/Page/View/ContactSmartGroup.tpl
index 42b4c3add5510255b9068f3043a5852bb02f9181..3fff37899088d45cff8ebb5781d55410bd1896cc 100644
--- a/civicrm/templates/CRM/Contact/Page/View/ContactSmartGroup.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/ContactSmartGroup.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/CustomData.tpl b/civicrm/templates/CRM/Contact/Page/View/CustomData.tpl
index 3fc2f1c8477c89a6db7fd505e385865057a48a17..ba51fae17e2a8067ea1996305c805b7ee686c587 100644
--- a/civicrm/templates/CRM/Contact/Page/View/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/CustomData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl b/civicrm/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl
index 26f28865e2acbfe5951dd0b4fb06ea3c178922cb..b1d9eb76b30269b013c0c1178c140d74e9d37e69 100644
--- a/civicrm/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl b/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl
index 22a9dd43c5a94c630c274aeec7cb6d5bbc24a235..8ee47a4b8c5bd9b1bffa9fb7906b3c546270f76e 100644
--- a/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Delete.tpl b/civicrm/templates/CRM/Contact/Page/View/Delete.tpl
index 7bc43b4fd88111bf796db75209ad6cc2159cf2e9..55f67956026501be59bc457c99fe0afb86f2221a 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Delete.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Email.tpl b/civicrm/templates/CRM/Contact/Page/View/Email.tpl
index 7fb9fb0c217b854e6c3ce2c80592e3628a5e7af7..247976f45cb6446e3d0f4c330531cb15b7ddd2ae 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Email.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Group.tpl b/civicrm/templates/CRM/Contact/Page/View/Group.tpl
index e9552edf91c198350609768dd36c7c2f5978ec07..bce5a20d85cbb9daf3d568e3eb72f1e53bed3938 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Group.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Group.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl b/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl
index a674411f9cdcd633470596521e266338a8766e53..0dde17cde247a9ad20b2012fc0bbfbb2690079a1 100644
--- a/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Log.tpl b/civicrm/templates/CRM/Contact/Page/View/Log.tpl
index fbe116c23eaded221046bdbc3a326c2bde230f98..b1a0a334f302dae2fd44e7c305fd78df0ca7b7cb 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Log.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Log.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Note.tpl b/civicrm/templates/CRM/Contact/Page/View/Note.tpl
index b568da406e2ef6b02433fb0f6f1b7dceeb17c72c..8875c3f2691fef2cc0b937589057a0e074b71a1e 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Note.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Note.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Print.tpl b/civicrm/templates/CRM/Contact/Page/View/Print.tpl
index 52e23f36727226d2f56bf59513ff7039f5e8cee1..87363ba60621b720b8e8b65f06867a148d1829fc 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Print.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Relationship.tpl b/civicrm/templates/CRM/Contact/Page/View/Relationship.tpl
index b59356d63b8cf1212cefa3d90fa41dacf3532ddd..fa315a6360942d358c812ff59d96cfa0a97dce3b 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Relationship.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Relationship.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/RelationshipSelector.tpl b/civicrm/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
index 6bd2fc793e1fac7f05484eb54f6aa88de0395a06..b25efcc50f1e981e34cf118211ecb0060fb6d88b 100644
--- a/civicrm/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/SMS.tpl b/civicrm/templates/CRM/Contact/Page/View/SMS.tpl
index 0b041e49da11779153b63b3613815e1c6e0ec641..e1ca9b8b8b2b12f7a3f7b9e5bdc80a47345c31d3 100644
--- a/civicrm/templates/CRM/Contact/Page/View/SMS.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/SMS.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Summary.hlp b/civicrm/templates/CRM/Contact/Page/View/Summary.hlp
index c1487ec4cac931ea8dcd8023c07978be0b8bf6d4..355c1e4e7ed8eafb77d344a0f54c6c7b0e59dc67 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Summary.hlp
+++ b/civicrm/templates/CRM/Contact/Page/View/Summary.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Summary.tpl b/civicrm/templates/CRM/Contact/Page/View/Summary.tpl
index b5f953c8e38608694add44c6881a165935b0d7b2..b8a7a2238129d1c3a7a3c6a259b072d6365812ea 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Summary.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/SummaryHook.tpl b/civicrm/templates/CRM/Contact/Page/View/SummaryHook.tpl
index dd4a7f7eb9e61241ad34fa4710fd47ab5bd24379..8d522b160d2df2844427797a16a2dcbad6f7c0f9 100644
--- a/civicrm/templates/CRM/Contact/Page/View/SummaryHook.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/SummaryHook.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Tag.tpl b/civicrm/templates/CRM/Contact/Page/View/Tag.tpl
index ddff9679dd22d7fb3b2bd86f8bee74b0745af1e7..216a1bc98a2968bab814f4f9dd9ef6e246fc9aa5 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Tag.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Tag.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/UserDashBoard.tpl b/civicrm/templates/CRM/Contact/Page/View/UserDashBoard.tpl
index c10a9f832cde65e11f09bbf41a07772400289deb..bb786396f8b7498a509cc31071cad24433f239d4 100644
--- a/civicrm/templates/CRM/Contact/Page/View/UserDashBoard.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/UserDashBoard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl b/civicrm/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
index 11ebb6f8121c95b51071373f4a5e34ae01b803c7..30db0fee691f635ed61aab0123adaa107501f844 100644
--- a/civicrm/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Page/View/Useradd.tpl b/civicrm/templates/CRM/Contact/Page/View/Useradd.tpl
index daf305c586d793830a3b4b0d7b4318a3b8a76b01..00484e0b1a042cacd936cb8d3183361d1a5754e8 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Useradd.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Useradd.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contact/Selector.tpl b/civicrm/templates/CRM/Contact/Selector.tpl
index c59077b3757315b35166ab7a2bd71c74fb22861d..cfad0ff138cd8bb3105c8f711ad6ded653ef1f33 100644
--- a/civicrm/templates/CRM/Contact/Selector.tpl
+++ b/civicrm/templates/CRM/Contact/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/AcceptCreditCard.tpl b/civicrm/templates/CRM/Contribute/Form/AcceptCreditCard.tpl
index 99e241fda9f14b74c57094c7bc7fe259e7349329..3b6b197609a20d3382c1bb5d102218e0559c50f1 100644
--- a/civicrm/templates/CRM/Contribute/Form/AcceptCreditCard.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AcceptCreditCard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl
index 394ebeae08d777a009b20fa346085d6aedd9458b..cb1e683a1af896072618ce500d9cd608b1b72439 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
index d3b103ef8f8087c32e02fba814cb5ddc84092530..369eb292fa21ade341faaf5932cf3def5349bd92 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl
index 848661c874867e3a37b31aa1d3818a284436ca45..d8c608f4e42f6a382e0f8ff31f13e8b661b15476 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/PaymentReminders.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/PaymentReminders.tpl
index ba95ee588a73e3d24d3e2f08b3b23ac02f87b3f4..a3c80bafb496afde423792891e4a2dceb6504ef6 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/PaymentReminders.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/PaymentReminders.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl
index 7cb5d1f39054fd04924b6e9bbbcdd821af317374..7ca1ce69fee9ceaf1f1752052e5d5719635d5a25 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.hlp b/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.hlp
index a4b8306c045021d233ae557dc82da976274e69bf..2fbbe70dbdfefe2052406816ba385b4712a8cd2c 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl
index 754c786f614cdd8a28e72462dbbcd5ab2bd4cb2a..4bc6dc0be0c16166341b79ea75338729d7cc32ed 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/CancelSubscription.tpl b/civicrm/templates/CRM/Contribute/Form/CancelSubscription.tpl
index 9b08f22d1c73408903fb34a116e8aceae1d3e5c4..49a26db601a4b31b478e00aca1fceac789b1f2d7 100644
--- a/civicrm/templates/CRM/Contribute/Form/CancelSubscription.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/CancelSubscription.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
index 9b12de3e0b3e8a595fa6f28ba3218a183d39176e..2f7d27fc15fea5b28560065d63fa55bc07264fda 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -345,25 +345,17 @@
<div id="customData" class="crm-contribution-form-block-customData"></div>
{/if}
- {*include custom data js file*}
- {include file="CRM/common/customData.tpl"}
+ {include file="CRM/Custom/Form/Edit.tpl"}
- {literal}
- <script type="text/javascript">
- CRM.$(function($) {
+ {literal}
+ <script type="text/javascript">
+ CRM.$(function($) {
{/literal}
- CRM.buildCustomData( '{$customDataType}' );
- {if $customDataSubType}
- CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
- {/if}
-
- {if $buildPriceSet}{literal}buildAmount( );{/literal}{/if}
+ {if $buildPriceSet}{literal}buildAmount();{/literal}{/if}
{literal}
- });
// bind first click of accordion header to load crm-accordion-body with snippet
// everything else taken care of by cj().crm-accordions()
- CRM.$(function($) {
cj('#adjust-option-type').hide();
cj('.crm-ajax-accordion .crm-accordion-header').one('click', function() {
loadPanes(cj(this).attr('id'));
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl
index f367fd30ca896f793ed072ed3eeb47ea11b4c266..6d01a480a902cd93b31943d1a2601efd6c062bbc 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
index 9fed548865d4a12541d524735a4183f9f112028e..92c95693a57deecd0b3e47f686228aadee359656 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
index 3e65035b7bed35edc680f0ab06af3bce49e94777..9612842736c044d89c790a7dee1c7ee90af64844 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index 641d8132e9eb324bfaafc671be0b4ec6567b29df..9a4a24d8576176fd7996394fafc8e3088095618f 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
index 0cfc9a5bc3f3bc42bd004d9f135d8d0b31b3a68a..4757a3131e3d9e513337ae09945d32fcb20963f8 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
index e482bf0ab2c2e5e1a2202c9adee7e0e9446cbf65..1bd9dda81b09ceed5136f986c834ed275a17bd14 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl
index 76988f10e203f77ed4cb7df532ddda50828ac66f..380f76578df3e38b518be35acf35504bed4d30b5 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index da1b3385214de5069fc7873943acc037f9b391d2..8520b458b5398ca894d23a676fcb8a7ea72c55ee 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionCharts.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionCharts.tpl
index d35e5093103db7cb88b87fa21673fa85893c9df7..c89590ce92df51d6b70bbc2cec734bee7237a105 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionCharts.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionCharts.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.hlp
index 5df4783565c1f677b012b40fbd38543b7216f492..c00ad8de84340a7671de80dd969fef5a6f618539 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
index d05b937d9f65429af81aaedd2c6d7ad1fd5c444d..a97f0f6b8b40e490eb3ab0c0a0da069c030cbb66 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
index ffdf1f82b94ddab658d3b599065c2c357e7df585..67547046811f3e05fdc02131fd16362458939259 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp
index 07bff15b3038e352624febd0943d8fe9f1b3397b..39252d8708965eca27e69f459231f1d70e564db5 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl
index d25dc7e62cb298ed05d9f5c981b8bdc9499d67c0..04144ec464db6a4693e638bf51ed479765898ac1 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl
index eb00cfb265ec3b540f047fe347fb0d38d1b877a3..025ba577857f69a1fc1cdf669a4951208501edca 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp
index 2732ec772df8d44b7c8e275f47a360b1b55bebb3..e3349913bf73b57ec86d93891ad7f358e528470e 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
index 6892b00ea9ecac069cb40a8d54344daf0a83ef0a..7d3f7c4505b996937d10124a752cc5eab732c564 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp
index 36dafc03c47fa2dd878575076a91f26b9f86e82d..6a136adb411b607ad7e58912572ebd475dba713d 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
index eb85deaa443567c2dec0e81bbe9d82ac449a2d9a..b869e14eb965100c8395eac784a0b6c9a13ea4e0 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
@@ -1,7 +1,7 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp
index d9b4ab8fabb107e193e868c43c090e618d61dc65..b0dcbc7319fb0c3c6c24bb04e1ef917b86a78487 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl
index 82e897b44d1e417dc77fe9901837592d02bfd10e..1e9a6e4e55b1c9d0e8c5d6ae6027b9fb1e8e1a3f 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp
index 35ba31b686af6fee10f18d89b2b734f9bc5c7afc..59acbff17b54062fb0707f669829b3b5a98c0bca 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
index b1a25f34b8aebd4ae120e606762ed212a36ff316..b7198de433beda9875e65bf47ff47c4c6aca2908 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.hlp
index 25a831a5cfb5c374757bf446aa2a81363fed108a..2c2748bfcae658c2ce72c05417b668fff52d7a89 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
index c7b1819b12eaea4314a53d5665c5f97b60f179f4..d32391961fa34d280b6ea58a96f6bb8971a318c1 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -66,7 +66,7 @@
{ts}Click <strong>Save & Preview</strong> to save your settings and preview the widget on this page.{/ts}<br />
</div>
{/if}
- <div style="text-align: center;width:260px">{$form._qf_Widget_refresh.html}</div>
+ <div>{$form._qf_Widget_refresh.html}</div>
</div>
<div class="col2">
{* Include "get widget code" section if widget has been created for this page and is_active. *}
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
index d3b4b42f188d46557eb7ff1049fc171616a3640f..f6c2799e05012b862f808c0704f4b055e65ae92b 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl b/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl
index 062cfd8c6cefe1d93db9bb251e0f4c6cf1a41c69..e9a2f0d54bcca186786020f2dac9398fe6c853e8 100644
--- a/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP.js.tpl b/civicrm/templates/CRM/Contribute/Form/PCP.js.tpl
index 12ba501a7cc6cae6e92e4f4cfe588e7282dfddde..6218872c0f58a7cb13e818e07ceef6a09cedce96 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP.js.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP.js.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP/Campaign.tpl b/civicrm/templates/CRM/Contribute/Form/PCP/Campaign.tpl
index 0bf01f12a5c3bc39877fc8d4bfde3c73da42c049..2c0f8b946ca73eff53068eeee6d7ce1ef5926470 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP/Campaign.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP/Campaign.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP/Delete.tpl b/civicrm/templates/CRM/Contribute/Form/PCP/Delete.tpl
index 38541162b758829f13797d289ebe0c02ab712d76..8f79bec0a18466958e84f0b4da838bfa615d8c69 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP/Delete.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP/PCP.tpl b/civicrm/templates/CRM/Contribute/Form/PCP/PCP.tpl
index ed9a751285b9682fc8df888b11606bfe10394ae3..af33076cb41b3c241670af08dfeba2b1ba6d6c14 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP/PCP.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP/PCP.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl b/civicrm/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
index 4c4930e86f352a065cfb8cdbfe09dde9be202f55..52446c70c8880bc8a788761e98f28145ceba1b5d 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl b/civicrm/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl
index 0b9cf79c39dcbabc51262efd2c7256cdf4942e8f..88edf82bc9930eebde4aa15808a14aa0ab4feb8a 100644
--- a/civicrm/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/PaymentInstrument.tpl b/civicrm/templates/CRM/Contribute/Form/PaymentInstrument.tpl
index e56c7409d92becf47a245e5a5e0c2808931eab66..8a4cf537749c82b82de5cd0275f5d0ac77294e4b 100644
--- a/civicrm/templates/CRM/Contribute/Form/PaymentInstrument.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PaymentInstrument.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Preview.tpl b/civicrm/templates/CRM/Contribute/Form/Preview.tpl
index effab15708787504fca536ad2c5f190608a2e38a..6c91e3a48a96ebe371677d51df43f7780435dc7f 100644
--- a/civicrm/templates/CRM/Contribute/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Search.tpl b/civicrm/templates/CRM/Contribute/Form/Search.tpl
index 7cc4c89bb44f5ca73967a80bca19cfa63c102302..ce8693a20d56ca13a4c9abb3a05934eca1e827bf 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Contribute/Form/Search/AdvancedSearchPane.tpl
index 0c3bf9554584fd7c4183ce574bdc31b577b32914..e7b9c83bdd569dba34ba80049558a9364a36052a 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search/AdvancedSearchPane.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl b/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl
index 01295160d5dd181e0d4e0d16efdc561a4cdb2c53..4412dac0a4cf33a8fa7b3df03770a8c517c2cbd9 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl b/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
index 831c8c5fb7f825606d1d5653d4c6aac752ec0323..6e696f3f7c2a418df5c9002f9514e5af8cde7b8d 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Contribute/Form/Search/EmptyResults.tpl
index 12dfc8e790d689694db87eeb6b17ce2707796806..2723c5596f3df3070f40726a231c40a51418f6b3 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/SearchContribution.tpl b/civicrm/templates/CRM/Contribute/Form/SearchContribution.tpl
index bdc4f25ea68840e2d2d0a5d8aa90160a4d0a216b..02d9df98d5f221667e70ed59bc40203e51c77485 100644
--- a/civicrm/templates/CRM/Contribute/Form/SearchContribution.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/SearchContribution.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Selector.tpl b/civicrm/templates/CRM/Contribute/Form/Selector.tpl
index cc88a89e9b0e6e608a2615b9a050313845b6923f..5709eed02f9063f40c5a7c24f03bbbe97f328365 100644
--- a/civicrm/templates/CRM/Contribute/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/SoftCredit.tpl b/civicrm/templates/CRM/Contribute/Form/SoftCredit.tpl
index a5db4a6a1f1f8d0157a5082815bcd5c2da05549d..e7a6564bff6d27dd369b2fe9e4135dd1338068a1 100644
--- a/civicrm/templates/CRM/Contribute/Form/SoftCredit.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/SoftCredit.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task.tpl b/civicrm/templates/CRM/Contribute/Form/Task.tpl
index 71851c3d913c031a95618ceed2c52bbd487105a7..d65d612320e1ffd0f91ed7397f15b115a72301d2 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Batch.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Batch.tpl
index d32045069bb8d67da4c05e640629f3aeccb1391b..4917a93437d89efceec4eb435eeee779da2a868c 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Delete.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Delete.tpl
index cbd820a813dd4668788fb84c54c8acbdb8dc789c..5b5fd6d2aded1d703e26fdc1b55b2591c043628c 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Email.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Email.tpl
index 9b7a13ada8bd503c9f100352fed2af347406aecd..b67407fbc1b479008e589658a5c04c4c2dd9e1f4 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Email.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Invoice.hlp b/civicrm/templates/CRM/Contribute/Form/Task/Invoice.hlp
index 243d06e4ebea590b54732fd3f38c77b86c075a33..63c422d3bb221ba16748e345333d3f9256d4325b 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Invoice.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Invoice.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl
index 9ef3b0cc8c22ae3822cffaf798c69343068d7773..e3cf9127a3d9696286ddd7f494725ab3c4b5efad 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl b/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl
index 897d88a2847d0ee691801486933fd3fbd846d55d..dbbc6c76c2cf88b9559da68d2907c99bff706273 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.hlp b/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.hlp
index aafc8bb6a005779daa8ea5f89f841dc6c9a43ce1..6186b5a30d2d4171d02d6968aeae5dd7ce452b41 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl b/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl
index d3ea86506c4e76fccbff16a80a07e75dea3947da..67a067193b46b34e87f7362740d17d73f0c2c898 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Contribute/Form/Task/PickProfile.tpl
index 6a78ba526f8c0e31a5d7ba82269382683efae710..3bcfe17f45e47983c3026f04fb9d3df0ade9f72b 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/PickProfile.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Print.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Print.tpl
index c33fde8f94f45628b0f8b3e566246e90e23dd427..c1c473506b9e9dc831bc4b52b30d15a68b9d99dd 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Result.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Result.tpl
index 87c0cca0e2335e299097609f569f3a866b732156..f0659032df96073a95405a8d18b82efa4f58bb06 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Result.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Status.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Status.tpl
index 3e15ecf1df0212e646f59302f56e81c919f8b9a1..1e6a81fae0b217596e2621044bc11078b2a6e27d 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Status.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Status.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/UpdateBilling.tpl b/civicrm/templates/CRM/Contribute/Form/UpdateBilling.tpl
index 88b4a40f8af5f5804d430999d4920448d9a4b191..ca7ce7d2b2f80025714bc7172f11fcd046fcf7ff 100644
--- a/civicrm/templates/CRM/Contribute/Form/UpdateBilling.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/UpdateBilling.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl b/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl
index e5961bad1276198e33e9738a1cb58a541d09e672..1d4ea231ff7c181992a0b494eccf438d1362c1c5 100644
--- a/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Contribute/Import/Form/DataSource.hlp
index c4963e8089ae19173582a0997f00826591dc51aa..92e3d5cb5da4a1a42077f1b3a01b9e6e9c591d54 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Contribute/Import/Form/DataSource.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Contribute/Import/Form/DataSource.tpl
index ec80b0e014ab6ba52b8c3571f020abb98d020f4f..aacd5e1e06ebaeae0c119c7376e6901f4d3ab6a8 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/DataSource.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/MapField.tpl b/civicrm/templates/CRM/Contribute/Import/Form/MapField.tpl
index 4fa94d704f86bf3b5735bfe5802245ce5c2bbb9f..e2ff62c70d3985a99e88d179e1733f36cec4a019 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/MapField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Contribute/Import/Form/MapTable.tpl
index 4648d6a8d87efcc5780e34106ed91df33b8f5b0e..ca378fe62af22fad38459a9856c0ee9a8c152ab0 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/MapTable.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/Preview.tpl b/civicrm/templates/CRM/Contribute/Import/Form/Preview.tpl
index f69fc1f9ecb853cc472305af5215c70147fc07af..a7b12ca87ffc9c422f6d88793d64fb86812e851f 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/Summary.tpl b/civicrm/templates/CRM/Contribute/Import/Form/Summary.tpl
index eb39d80748773a775134a027882369ee1a32768b..869f42b6cff2433f3bcb8ca0a0e68e658d5f44ee 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionPage.hlp b/civicrm/templates/CRM/Contribute/Page/ContributionPage.hlp
index b349636cc7393445021305d21dc420953c20988c..77b173af43a8bdd93d53c39874d764e9f8937128 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionPage.hlp
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionPage.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl
index 02506aef6e76bf895550da3dd6d0b0d01883b1f2..75404e370594253d1a97dbb3a1c3ed42975436b0 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionRecur.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionRecur.tpl
index 6821532484f404a47f1d040e4e41c9bbe1d4e4c8..3d4368acb94551d3d350a48849ee2a3d10d9b867 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionSoft.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionSoft.tpl
index 714195c1cd4edcf22d2a147dc5f02bc17f2b6457..cf142340c86a93dd7838eeae54b4a1e1a22d87a8 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionSoft.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionSoft.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionTotals.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionTotals.tpl
index 888d06c025477e19b2e60b28b533610dedf0a522..aacbdae765022dcc8812d7233420676ecd5ac8ad 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionTotals.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionTotals.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionType.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionType.tpl
index 0e101fb2ed74e30445594c2704d967c766a59c6d..063f39038b32125253f5ca91562bf1b15e7551eb 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionType.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/DashBoard.hlp b/civicrm/templates/CRM/Contribute/Page/DashBoard.hlp
index d034589210a28002d35e954544909de4f1fa9e6c..27be84d416e5708b3cc72df7fa7f75391b753281 100644
--- a/civicrm/templates/CRM/Contribute/Page/DashBoard.hlp
+++ b/civicrm/templates/CRM/Contribute/Page/DashBoard.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/DashBoard.tpl b/civicrm/templates/CRM/Contribute/Page/DashBoard.tpl
index 0062ea8308efaac771a7d070f2dc7780df9cf684..6debd847b2e949b8552fd420e525faba85891ff7 100644
--- a/civicrm/templates/CRM/Contribute/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/DashBoard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/ManagePremiums.tpl b/civicrm/templates/CRM/Contribute/Page/ManagePremiums.tpl
index 9c5a68f81c57434bdc8dffb5e26b3cd191e2d90a..e85be285f3d9013f021d753cca940108e3a3c8ad 100644
--- a/civicrm/templates/CRM/Contribute/Page/ManagePremiums.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ManagePremiums.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/PaymentInfo.tpl b/civicrm/templates/CRM/Contribute/Page/PaymentInfo.tpl
index 039eacaa9d3ddf4d55d9542b1259f1e494beb8a0..0a4ffacecb2bc2810271766cfcd9974f545c4eab 100644
--- a/civicrm/templates/CRM/Contribute/Page/PaymentInfo.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/PaymentInfo.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/PcpUserDashboard.tpl b/civicrm/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
index 6a519d0228904bcf1160e12b9ca2dcd6434ee3aa..7cb4577645ec505296ce1f06dbec3b447cf3633f 100644
--- a/civicrm/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/Premium.tpl b/civicrm/templates/CRM/Contribute/Page/Premium.tpl
index ac2ddb78efc4a61807bf525f0e312444ff2cba4f..9abb647652b7842f6e475c996f0b9f9fd49075fd 100644
--- a/civicrm/templates/CRM/Contribute/Page/Premium.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/Premium.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/SubscriptionStatus.tpl b/civicrm/templates/CRM/Contribute/Page/SubscriptionStatus.tpl
index 19bfa2cef2fff205ae5994bf938e31d8ba017dff..93fc5135bb9de2a499cde3150aaff712f102e901 100644
--- a/civicrm/templates/CRM/Contribute/Page/SubscriptionStatus.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/SubscriptionStatus.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/Tab.hlp b/civicrm/templates/CRM/Contribute/Page/Tab.hlp
index 630a0fb4c753d1c96316c3e30d91d8a6945138c6..13e4a2c9adcc5adcb922f185bdc829afe08a31dd 100644
--- a/civicrm/templates/CRM/Contribute/Page/Tab.hlp
+++ b/civicrm/templates/CRM/Contribute/Page/Tab.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/Tab.tpl b/civicrm/templates/CRM/Contribute/Page/Tab.tpl
index cd38ffa634c0e5c8b75c1c5c6e8dba76e491b3a4..6d910f93995b61e47891014f0160c0219217de0f 100644
--- a/civicrm/templates/CRM/Contribute/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl b/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl
index 9012101ebfb189f1a704f6b3734dec7ed55d66ef..d4c7323cd385480d71951032656d7e02da64abc9 100644
--- a/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/AgeRange.tpl b/civicrm/templates/CRM/Core/AgeRange.tpl
index b7ac7496a3bcd6a5c5fac63a3dba777e843fa41d..367897c60ffa5c32cb6da35ce2daea913c312ba0 100644
--- a/civicrm/templates/CRM/Core/AgeRange.tpl
+++ b/civicrm/templates/CRM/Core/AgeRange.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/BillingBlock.tpl b/civicrm/templates/CRM/Core/BillingBlock.tpl
index 57a0bf8fda9e942d23aa69d9f4d5741eff67790b..1e7c56782e610ca2ec7c3ef1a05423df54cdc83d 100644
--- a/civicrm/templates/CRM/Core/BillingBlock.tpl
+++ b/civicrm/templates/CRM/Core/BillingBlock.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/BillingBlockWrapper.tpl b/civicrm/templates/CRM/Core/BillingBlockWrapper.tpl
index 318de176cf16c1cab6c264104785d855b9e775a3..354b2b03b4076dcb14f22f8730fa327d7e9f8e69 100644
--- a/civicrm/templates/CRM/Core/BillingBlockWrapper.tpl
+++ b/civicrm/templates/CRM/Core/BillingBlockWrapper.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Calendar/GData.tpl b/civicrm/templates/CRM/Core/Calendar/GData.tpl
index c519c7778e7e22ee4876dde0fc5081f2d482d4ad..988b6bc0c0b3c96e8c070fd24e8a33a3741dd219 100644
--- a/civicrm/templates/CRM/Core/Calendar/GData.tpl
+++ b/civicrm/templates/CRM/Core/Calendar/GData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Calendar/ICal.tpl b/civicrm/templates/CRM/Core/Calendar/ICal.tpl
index b576a317d9e63535b877150351b6d447baf36ed5..75acabe5c3fe0d6705cc0de251a5195c9cf75ec4 100644
--- a/civicrm/templates/CRM/Core/Calendar/ICal.tpl
+++ b/civicrm/templates/CRM/Core/Calendar/ICal.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Calendar/Rss.tpl b/civicrm/templates/CRM/Core/Calendar/Rss.tpl
index 7f0a1bc82f85bae3433e4a787a12bba53d6dbaec..bd1e79066f948303047c3b0a0616e1cd04082ffd 100644
--- a/civicrm/templates/CRM/Core/Calendar/Rss.tpl
+++ b/civicrm/templates/CRM/Core/Calendar/Rss.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Date.tpl b/civicrm/templates/CRM/Core/Date.tpl
index df0afc92cfe9715652ada5f22fc92399a7d8ef36..0a00eb2c739f9117e7b8aafe18eb12455cabc41f 100644
--- a/civicrm/templates/CRM/Core/Date.tpl
+++ b/civicrm/templates/CRM/Core/Date.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/DateRange.tpl b/civicrm/templates/CRM/Core/DateRange.tpl
index 60b6419f165c66295615292d3ec8e67757769c7c..ed25fe4b03a826903a90b2fd7f067094f88c0733 100644
--- a/civicrm/templates/CRM/Core/DateRange.tpl
+++ b/civicrm/templates/CRM/Core/DateRange.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp b/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp
index e25bd79a14a3ee232c71246081238bb8b1e29682..dfe6c4d7a4e14664ed5c94920032f041860113e7 100644
--- a/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp
+++ b/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl b/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl
index d697566ad84fdd48b5458a432c7bf6b5930627e0..0824767dbf9928e16d1cf9931f1c71b732a162ac 100644
--- a/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl
+++ b/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Form/ShortCode.tpl b/civicrm/templates/CRM/Core/Form/ShortCode.tpl
index 741c04f62d3ff7b386232f4f8c7ba5554b921c67..48b4af33fc3e927f9cde959c10990563fdfb8671 100644
--- a/civicrm/templates/CRM/Core/Form/ShortCode.tpl
+++ b/civicrm/templates/CRM/Core/Form/ShortCode.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Form/Task/Batch.tpl b/civicrm/templates/CRM/Core/Form/Task/Batch.tpl
index ecb06368601f9309003b6d5c4b3714800669933a..e54f701ce7c8b379bad035c419f967f4efbc16f4 100644
--- a/civicrm/templates/CRM/Core/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Core/Form/Task/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Core/Form/Task/PickProfile.tpl
index e1c021788eb870e2ce13a0973b37cbc7e9846d22..30ebae3457716ef266fc672ce5d148d93f65f66d 100644
--- a/civicrm/templates/CRM/Core/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Core/Form/Task/PickProfile.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/I18n/Dialog.tpl b/civicrm/templates/CRM/Core/I18n/Dialog.tpl
index 0108e8b12380f6b8b031db6ee7b7d0a8f3823b89..bd541ece207976ec3e80b6b48dda7f6258f7b836 100644
--- a/civicrm/templates/CRM/Core/I18n/Dialog.tpl
+++ b/civicrm/templates/CRM/Core/I18n/Dialog.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/I18n/Form.tpl b/civicrm/templates/CRM/Core/I18n/Form.tpl
index 3553ec99091f64f264085e6bfd2dfdaaaa8f73e0..8c80c6b6b47465ead347053c7c7bb69f528d0a23 100644
--- a/civicrm/templates/CRM/Core/I18n/Form.tpl
+++ b/civicrm/templates/CRM/Core/I18n/Form.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Core/Page/RecurringEntityPreview.tpl b/civicrm/templates/CRM/Core/Page/RecurringEntityPreview.tpl
index ccbf5dc3cec14e4cb25fe3f85033e1c4e6a9bfbd..a9dcbfbb187b19c8237e1d4754744880ded9fdf8 100644
--- a/civicrm/templates/CRM/Core/Page/RecurringEntityPreview.tpl
+++ b/civicrm/templates/CRM/Core/Page/RecurringEntityPreview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/ChangeFieldType.tpl b/civicrm/templates/CRM/Custom/Form/ChangeFieldType.tpl
index da356565608f88abaf19dbec7f1f37f4b73ea4e7..a2a90253cd595722380f50e3f6d4407445857976 100644
--- a/civicrm/templates/CRM/Custom/Form/ChangeFieldType.tpl
+++ b/civicrm/templates/CRM/Custom/Form/ChangeFieldType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/ContactReference.tpl b/civicrm/templates/CRM/Custom/Form/ContactReference.tpl
index c92b1967ba9f74521590f1badedf8fe3efe95b2e..ab464693eb9449e5a316781e012f2bdbf4df3fda 100644
--- a/civicrm/templates/CRM/Custom/Form/ContactReference.tpl
+++ b/civicrm/templates/CRM/Custom/Form/ContactReference.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/CustomData.tpl b/civicrm/templates/CRM/Custom/Form/CustomData.tpl
index c0de8e0b75daa94fa9d23416e473b78b2620a9ad..b1205e81f2451bcf920166c9a755dcc841cc5370 100644
--- a/civicrm/templates/CRM/Custom/Form/CustomData.tpl
+++ b/civicrm/templates/CRM/Custom/Form/CustomData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/CustomField.hlp b/civicrm/templates/CRM/Custom/Form/CustomField.hlp
index 7f1e3bde972a756ad2345c63011b536092013c6c..9ccbf7d8783a7b17104add7252ca47087da63204 100644
--- a/civicrm/templates/CRM/Custom/Form/CustomField.hlp
+++ b/civicrm/templates/CRM/Custom/Form/CustomField.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/CustomField.tpl b/civicrm/templates/CRM/Custom/Form/CustomField.tpl
index 0ef7da5dd70a555a54119ce05c1701c32e4df66a..1a458d983834099a062f362d7364acb0d848b26e 100644
--- a/civicrm/templates/CRM/Custom/Form/CustomField.tpl
+++ b/civicrm/templates/CRM/Custom/Form/CustomField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/DeleteField.tpl b/civicrm/templates/CRM/Custom/Form/DeleteField.tpl
index f37ff90c6c36c5688cce9f3ddc8920e6cfe0efcf..38b653648715104637e2921a7c247f565c9f4a65 100644
--- a/civicrm/templates/CRM/Custom/Form/DeleteField.tpl
+++ b/civicrm/templates/CRM/Custom/Form/DeleteField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/DeleteFile.tpl b/civicrm/templates/CRM/Custom/Form/DeleteFile.tpl
index 1fdbb440c8080dd45e0350150b9bc1463c9a80df..86c2aa2344e4383806d8d005c00dd772fa39cfda 100644
--- a/civicrm/templates/CRM/Custom/Form/DeleteFile.tpl
+++ b/civicrm/templates/CRM/Custom/Form/DeleteFile.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/DeleteGroup.tpl b/civicrm/templates/CRM/Custom/Form/DeleteGroup.tpl
index a66b17c7ac4ea507b0dc3aae58a90a70d2684ddf..e23bf552d9784893a312b5de771d4703d2a87d87 100644
--- a/civicrm/templates/CRM/Custom/Form/DeleteGroup.tpl
+++ b/civicrm/templates/CRM/Custom/Form/DeleteGroup.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/Edit.tpl b/civicrm/templates/CRM/Custom/Form/Edit.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..84e41a4a3c40b543e3b9bc7f08507729f89fc0a8
--- /dev/null
+++ b/civicrm/templates/CRM/Custom/Form/Edit.tpl
@@ -0,0 +1,16 @@
+{* Edit custom data on Edit entity forms *}
+{* Requires <div id="customData"></div> on the form *}
+{*include custom data js file*}
+{include file="CRM/common/customData.tpl"}
+{literal}
+<script type="text/javascript">
+ CRM.$(function($) {
+ {/literal}
+ CRM.buildCustomData( '{$customDataType}' );
+ {if $customDataSubType}
+ CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
+ {/if}
+ {literal}
+ });
+</script>
+{/literal}
\ No newline at end of file
diff --git a/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl b/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl
index 9b345a10a46eb29d81484094dc8e57db61ab6fa0..c97f169d4ced04fc4b54ab687f2558a4be0b7014 100644
--- a/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/Field.hlp b/civicrm/templates/CRM/Custom/Form/Field.hlp
index 0cb6f112eac203972bf46417f2978c37e8b6195d..89234e8eccb77bdc86200dc28ada709107fc266c 100644
--- a/civicrm/templates/CRM/Custom/Form/Field.hlp
+++ b/civicrm/templates/CRM/Custom/Form/Field.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/Field.tpl b/civicrm/templates/CRM/Custom/Form/Field.tpl
index 040c3d786be596ae7b893bb763083bc69514ab5c..ae9d1b4808af7dfeaa2e6027ded35b4e292ef200 100644
--- a/civicrm/templates/CRM/Custom/Form/Field.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Field.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/Group.tpl b/civicrm/templates/CRM/Custom/Form/Group.tpl
index 9381bd39bf2e38bd7d2ce22369ddd6a8699107b6..d59a8b1e695688f73363a84ce975f597b059c47d 100644
--- a/civicrm/templates/CRM/Custom/Form/Group.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Group.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/MoveField.tpl b/civicrm/templates/CRM/Custom/Form/MoveField.tpl
index 40ba0c022b7646d6bedd28d1cbb9477ead19ccbc..ebc1c48456f73454eb8b152c2ce218a54085e588 100644
--- a/civicrm/templates/CRM/Custom/Form/MoveField.tpl
+++ b/civicrm/templates/CRM/Custom/Form/MoveField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/MultiValueSearch.js.tpl b/civicrm/templates/CRM/Custom/Form/MultiValueSearch.js.tpl
index dabc57c1c013a58a5c6f292d55e83392c2c6d245..e433559c8c6695f9b095e7011251ef9ad4ec67a9 100644
--- a/civicrm/templates/CRM/Custom/Form/MultiValueSearch.js.tpl
+++ b/civicrm/templates/CRM/Custom/Form/MultiValueSearch.js.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/Option.tpl b/civicrm/templates/CRM/Custom/Form/Option.tpl
index 2f869d71143f5dbd2c3166c1b80102b9ea48e69a..23d8514a9a3fdee13a55aeae6f83bb09f2624551 100644
--- a/civicrm/templates/CRM/Custom/Form/Option.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Option.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/Optionfields.tpl b/civicrm/templates/CRM/Custom/Form/Optionfields.tpl
index 076cc6175385db8a2efb9de36e32f620c85356cd..1f17c0dddc131e350dd8bba0d1dc03017a14808f 100644
--- a/civicrm/templates/CRM/Custom/Form/Optionfields.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Optionfields.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/Preview.tpl b/civicrm/templates/CRM/Custom/Form/Preview.tpl
index 7d5d9620139d1ab0102e941c6d3ed33a269c44ab..15881fa0f0af5a038d802af695bac19bbe239fa1 100644
--- a/civicrm/templates/CRM/Custom/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Form/Search.tpl b/civicrm/templates/CRM/Custom/Form/Search.tpl
index 345b4019b54014d3f824c5e27c908302e072235d..cc6c1fb4b2f38109a76fa4eac016dafd3278cd77 100644
--- a/civicrm/templates/CRM/Custom/Form/Search.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Custom/Import/Form/DataSource.hlp
index 98eb6f8de45f4e227de52894641369b2255eebbd..78dc4ddc6ec28addfd24fed7b477e961213b9bc9 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Custom/Import/Form/DataSource.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Custom/Import/Form/DataSource.tpl
index 2c4a750b5f0a5904e4f6f0a45e5163df9f5a2885..a3718a32fd56a5b95c1a2cfc632ee1fa01f4b167 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Custom/Import/Form/DataSource.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Import/Form/MapField.tpl b/civicrm/templates/CRM/Custom/Import/Form/MapField.tpl
index ba9c298cd57b734bc29af220a8bf3923ccdbdee1..b6abdafed22c83d47b53cd388e7fd0e2de36381c 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Custom/Import/Form/MapField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Import/Form/Preview.tpl b/civicrm/templates/CRM/Custom/Import/Form/Preview.tpl
index 6b1b6c02e0967d2a625163614740e61bd9f1cbc3..d7b40c3c15c15f88141849d052bc0a45c81bbb48 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Custom/Import/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Import/Form/Summary.tpl b/civicrm/templates/CRM/Custom/Import/Form/Summary.tpl
index 76b0a81ceb355eb1aad02f512d223eb6f40107fc..bbb0c3bcb289663fa4fee95c838bacb17986a129 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Custom/Import/Form/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl b/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl
index 021c3ae5d2eade495d0e44e1058e0b409f92e254..68298fcfe800861155902882c8b837bafacedbb3 100644
--- a/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl
+++ b/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Page/Field.tpl b/civicrm/templates/CRM/Custom/Page/Field.tpl
index 2bb4e2fddadd51f3178786e87cce7ad533888a3e..d0a7ec86750668eebb2f30734dea39b0e8f4cca0 100644
--- a/civicrm/templates/CRM/Custom/Page/Field.tpl
+++ b/civicrm/templates/CRM/Custom/Page/Field.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Page/Group.hlp b/civicrm/templates/CRM/Custom/Page/Group.hlp
index fd54d36ce30f6c5f3c2a9753f0686d79e1ac5d18..60ee2c581fe85e3434327e37d7b769fb3c4d143f 100644
--- a/civicrm/templates/CRM/Custom/Page/Group.hlp
+++ b/civicrm/templates/CRM/Custom/Page/Group.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Page/Group.tpl b/civicrm/templates/CRM/Custom/Page/Group.tpl
index b5710cd13b450bd18593c31f857602969e8913ba..443b5bd008071262556a66437546dd34ae3485f1 100644
--- a/civicrm/templates/CRM/Custom/Page/Group.tpl
+++ b/civicrm/templates/CRM/Custom/Page/Group.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Custom/Page/Option.tpl b/civicrm/templates/CRM/Custom/Page/Option.tpl
index 2322e6a3d83b933b9392867be05b6d20a78b6b5d..ccd3d460eef859250bae560cf02f9257cea6a84a 100644
--- a/civicrm/templates/CRM/Custom/Page/Option.tpl
+++ b/civicrm/templates/CRM/Custom/Page/Option.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Dashlet/Page/Activity.tpl b/civicrm/templates/CRM/Dashlet/Page/Activity.tpl
index 458d17488ab809de4d4e4cfb793c33c4743cc339..a7b47d753f75ecd5c1aee3d6de5101042f2f6d42 100644
--- a/civicrm/templates/CRM/Dashlet/Page/Activity.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/Activity.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Dashlet/Page/AllCases.tpl b/civicrm/templates/CRM/Dashlet/Page/AllCases.tpl
index ba881f178f124ffe42f295db803900d30baa870d..933c42fbe2a21306c2583f9d414d961fa8b89b97 100644
--- a/civicrm/templates/CRM/Dashlet/Page/AllCases.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/AllCases.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Dashlet/Page/Blog.tpl b/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
index 6eeab135bcdf71117db22dd1b5d627b96ba8b191..477e931684a85d1d89047622125d0aa37ebb2986 100644
--- a/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Dashlet/Page/CaseDashboard.tpl b/civicrm/templates/CRM/Dashlet/Page/CaseDashboard.tpl
index 2795b321d84dbf4b5a4fa01e77cfcaf3f9920554..7aab8aba9babfae6d895b689756e15607b3b2784 100644
--- a/civicrm/templates/CRM/Dashlet/Page/CaseDashboard.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/CaseDashboard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Dashlet/Page/GettingStarted.tpl b/civicrm/templates/CRM/Dashlet/Page/GettingStarted.tpl
index 9892b72214e5c8604086e12d8da0d1e45b6e3223..70fc558ea524e47f0683740fa28d973e9abc9b1d 100644
--- a/civicrm/templates/CRM/Dashlet/Page/GettingStarted.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/GettingStarted.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Dashlet/Page/MyCases.tpl b/civicrm/templates/CRM/Dashlet/Page/MyCases.tpl
index 5636bc47b0307d413cdd777d1592ebdcdfdc1b6a..620606a9bf060597594ed4cc40979d279f2572c9 100644
--- a/civicrm/templates/CRM/Dashlet/Page/MyCases.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/MyCases.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/EventFees.tpl b/civicrm/templates/CRM/Event/Form/EventFees.tpl
index 3a8a6ccccfbc7852e090cc8c1b7d4a876eac1763..93887cb5d94452abbf90ee7c8db896148cec4652 100644
--- a/civicrm/templates/CRM/Event/Form/EventFees.tpl
+++ b/civicrm/templates/CRM/Event/Form/EventFees.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -24,6 +24,7 @@
+--------------------------------------------------------------------+
*}
{assign var=isRecordPayment value=1 }
+{assign var=isShowBillingBlock value=($action neq 2)}
{if $paid} {* We retrieve this tpl when event is selected - keep it empty if event is not paid *}
<table class="form-layout">
{if $priceSet}
@@ -33,41 +34,42 @@
<tr class="crm-event-eventfees-form-block-discount_id"><td class="label"> {$form.discount_id.label}</td><td>{$form.discount_id.html}</td></tr>
{/if}
{if $action eq 2 and $hasPayment} {* Updating *}
- {if $lineItem}
- <tr class="crm-event-eventfees-form-block-line_items">
- <td class="label">{ts}Selections{/ts}</td>
- <td>{include file="CRM/Price/Page/LineItem.tpl" context="Event"}</td>
- </tr>
- {else}
- <tr class="crm-event-eventfees-form-block-event_level">
- <td class="label">{ts}Event Level{/ts}</td>
- <td>{$fee_level} {if $fee_amount}- {$fee_amount|crmMoney:$fee_currency}{/if}</td>
- </tr>
- {/if}
- <tr>
- <td></td>
- <td>
- <a class="action-item crm-hover-button" href='{crmURL p="civicrm/event/participant/feeselection" q="reset=1&id=`$participantId`&cid=`$contactId`&action=update"}'><i class="crm-i fa-pencil"></i> {ts}Change Selections{/ts}</a>
- </td>
+ {if $lineItem}
+ <tr class="crm-event-eventfees-form-block-line_items">
+ <td class="label">{ts}Selections{/ts}</td>
+ <td>{include file="CRM/Price/Page/LineItem.tpl" context="Event"}</td>
</tr>
- {else} {* New participant *}
- {if $priceSet.fields}
- <fieldset id="priceset" class="crm-group priceset-group">
+ {else}
+ <tr class="crm-event-eventfees-form-block-event_level">
+ <td class="label">{ts}Event Level{/ts}</td>
+ <td>{$fee_level} {if $fee_amount}- {$fee_amount|crmMoney:$fee_currency}{/if}</td>
+ </tr>
+ {/if}
+ <tr>
+ <td></td>
+ <td>
+ <a class="action-item crm-hover-button" href='{crmURL p="civicrm/event/participant/feeselection" q="reset=1&id=`$participantId`&cid=`$contactId`&action=update"}'><i class="crm-i fa-pencil"></i> {ts}Change Selections{/ts}</a>
+ </td>
+ </tr>
+ {else} {* New participant *}
+ {if $priceSet.fields}
+ <fieldset id="priceset" class="crm-group priceset-group">
<tr class="crm-event-eventfees-form-block-price_set_amount">
<td class="label" style="padding-top: 10px;">{$form.amount.label}</td>
- <td class="view-value"><table class="form-layout">{include file="CRM/Price/Form/PriceSet.tpl" extends="Event"}</td>
- </fieldset>
+ <td class="view-value"><table class="form-layout">{include file="CRM/Price/Form/PriceSet.tpl" extends="Event"}</td>
+ </fieldset>
{else}
- {assign var=isRecordPayment value=0 }
- <div class='messages status'>{ts}No active price fields found for this event!{/ts}</div>
- {/if}
- </table>
+ {assign var=isRecordPayment value=0 }
+ <div class='messages status'>{ts}No active price fields found for this event!{/ts}</div>
+ {/if}
+ </table>
+ {/if}
+ </td>
+ </tr>
{/if}
- </td>
- </tr>
- {/if}
{if $accessContribution and ! $participantMode and ($action neq 2 or !$rows.0.contribution_id or $onlinePendingContributionId) and $isRecordPayment and ! $registeredByParticipantId }
+ {assign var=isShowBillingBlock value=true}
<tr class="crm-event-eventfees-form-block-record_contribution">
<td class="label">{$form.record_contribution.label}</td>
<td>{$form.record_contribution.html}<br />
@@ -87,11 +89,11 @@
<td class="label" >{$form.receive_date.label}</td>
<td>{include file="CRM/common/jcalendar.tpl" elementName=receive_date}</td>
</tr>
- <tr class="crm-event-eventfees-form-block-payment_instrument_id"><td class="label">{$form.payment_instrument_id.label}<span class="crm-marker"> *</span></td><td>{$form.payment_instrument_id.html} {help id="payment_instrument_id" file="CRM/Contribute/Page/Tab.hlp"}</td></tr>
{if $showTransactionId }
<tr class="crm-event-eventfees-form-block-trxn_id"><td class="label">{$form.trxn_id.label}</td><td>{$form.trxn_id.html}</td></tr>
{/if}
<tr class="crm-event-eventfees-form-block-contribution_status_id"><td class="label">{$form.contribution_status_id.label}</td><td>{$form.contribution_status_id.html}</td></tr>
+ <tr class="crm-event-eventfees-form-block-payment_instrument_id"><td class="label">{$form.payment_instrument_id.label}<span class="crm-marker"> *</span></td><td>{$form.payment_instrument_id.html} {help id="payment_instrument_id" file="CRM/Contribute/Page/Tab.hlp"}</td></tr>
</table>
</fieldset>
</td>
@@ -101,14 +103,14 @@
{/if}
-{if $action neq 2}
+{if $isShowBillingBlock}
{include file='CRM/Core/BillingBlockWrapper.tpl'}
{/if}
{if ($email OR $batchEmail) and $outBound_option != 2}
<fieldset id="send_confirmation_receipt"><legend>{if $paid}{ts}Registration Confirmation and Receipt{/ts}{else}{ts}Registration Confirmation{/ts}{/if}</legend>
<table class="form-layout" style="width:auto;">
- <tr class="crm-event-eventfees-form-block-send_receipt">
+ <tr class="crm-event-eventfees-form-block-send_receipt">
<td class="label">{if $paid}{ts}Send Confirmation and Receipt{/ts}{else}{ts}Send Confirmation{/ts}{/if}</td>
<td>{$form.send_receipt.html}<br>
{if $paid}
@@ -117,17 +119,17 @@
<span class="description">{ts 1=$email}Automatically email a confirmation to %1?{/ts}</span></td>
{/if}
</tr>
- <tr id="from-email" class="crm-event-eventfees-form-block-from_email_address">
- <td class="label">{$form.from_email_address.label}</td>
- <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Email.hlp" isAdmin=$isAdmin}</td>
- </tr>
+ <tr id="from-email" class="crm-event-eventfees-form-block-from_email_address">
+ <td class="label">{$form.from_email_address.label}</td>
+ <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Email.hlp" isAdmin=$isAdmin}</td>
+ </tr>
<tr id='notice' class="crm-event-eventfees-form-block-receipt_text">
- <td class="label">{$form.receipt_text.label}</td>
- <td><span class="description">
- {ts}Enter a message you want included at the beginning of the confirmation email. EXAMPLE: 'Thanks for registering for this event.'{/ts}
- </span><br />
- {$form.receipt_text.html|crmAddClass:huge}
- </td>
+ <td class="label">{$form.receipt_text.label}</td>
+ <td><span class="description">
+ {ts}Enter a message you want included at the beginning of the confirmation email. EXAMPLE: 'Thanks for registering for this event.'{/ts}
+ </span><br />
+ {$form.receipt_text.html|crmAddClass:huge}
+ </td>
</tr>
</table>
</fieldset>
@@ -135,25 +137,25 @@
<fieldset id="email-receipt" style="display:none;"><legend>{if $paid}{ts}Registration Confirmation and Receipt{/ts}{else}{ts}Registration Confirmation{/ts}{/if}</legend>
<table class="form-layout" style="width:auto;">
<tr class="crm-event-eventfees-form-block-send_receipt">
- <td class="label">{if $paid}{ts}Send Confirmation and Receipt{/ts}{else}{ts}Send Confirmation{/ts}{/if}</td>
- <td>{$form.send_receipt.html}<br>
- {if $paid}
- <span class="description">{ts 1='<span id="email-address"></span>'}Automatically email a confirmation and receipt to %1?{/ts}</span>
- {else}
- <span class="description">{ts 1='<span id="email-address"></span>'}Automatically email a confirmation to %1?{/ts}</span>
- {/if}
- </td>
- </tr>
- <tr id="from-email" class="crm-event-eventfees-form-block-from_email_address">
- <td class="label">{$form.from_email_address.label}</td>
- <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Email.hlp" isAdmin=$isAdmin}</td>
+ <td class="label">{if $paid}{ts}Send Confirmation and Receipt{/ts}{else}{ts}Send Confirmation{/ts}{/if}</td>
+ <td>{$form.send_receipt.html}<br>
+ {if $paid}
+ <span class="description">{ts 1='<span id="email-address"></span>'}Automatically email a confirmation and receipt to %1?{/ts}</span>
+ {else}
+ <span class="description">{ts 1='<span id="email-address"></span>'}Automatically email a confirmation to %1?{/ts}</span>
+ {/if}
+ </td>
</tr>
- <tr id='notice' class="crm-event-eventfees-form-block-receipt_text">
+ <tr id="from-email" class="crm-event-eventfees-form-block-from_email_address">
+ <td class="label">{$form.from_email_address.label}</td>
+ <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Email.hlp" isAdmin=$isAdmin}</td>
+ </tr>
+ <tr id='notice' class="crm-event-eventfees-form-block-receipt_text">
<td class="label">{$form.receipt_text.label}</td>
- <td><span class="description">
- {ts}Enter a message you want included at the beginning of the confirmation email. EXAMPLE: 'Thanks for registering for this event.'{/ts}
- </span><br />
- {$form.receipt_text.html|crmAddClass:huge}</td>
+ <td><span class="description">
+ {ts}Enter a message you want included at the beginning of the confirmation email. EXAMPLE: 'Thanks for registering for this event.'{/ts}
+ </span><br />
+ {$form.receipt_text.html|crmAddClass:huge}</td>
</tr>
</table>
</fieldset>
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Conference.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Conference.tpl
index 581009d461a1ab3a891a9f852d660d9b5f15dcfd..0483a57c2b4ba543eba06a3b55c47698102ea38c 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Conference.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Conference.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
index 791a8b1167f59a0c74f8ea8fdf455d4ec7b272fe..09cf695365a031704dd621c1fc38ecf03bbba769 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Delete.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Delete.tpl
index 82cd829aafe4e55331b356b08a8eaca853e4a783..9864ccb4b09a7071f0458d97864ccfad1ef9777d 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Delete.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp b/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp
index 1f97ec54fc28a42a6bc148a4370ba9c22d6a3f1a..e26cf0569470077626d64c0f666580c5580b4c21 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index aa3ee18c39452cb1e603c9c603775f6bb040941d..c848ae7bb8c4269ef0a948f0dbfafc29c6b367d3 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Fee.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Fee.tpl
index b3dcbce4f7f091224ed2ad1d46c29d8ec29bfa42..dbca7feb87eeb17c1bc9086775fa6121bd6d4d7e 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Fee.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Fee.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Location.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Location.tpl
index 628c6f92a71d817d34c3b2e47f3a39e44df85e69..9e45c8fae5c4b56fc7cf1b0d6d90d246af76f8fe 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Location.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Location.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.hlp b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.hlp
index edd0d4484788917e7a8df60fce5929b0fa72e6a3..5b9b08c7433db795284da574c3942000c7540368 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.hlp
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
index 3d4471891feb17d7fd6e57d0aa7572d2175d773f..20e52fd53f87ed314d2960297aeb774dcc6c339e 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
index 3b43da41a6cc28c58d17522bdf17c5aafd0ed36b..6a31f709f6c77106a0cf0596f5c5ba3d5ec29781 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.hlp b/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.hlp
index d011a91297b3396c3c568a2e5f956ca4564de47c..971441dd5120f297e5afb85286a194c785888ae1 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.hlp
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.tpl
index a29fba4f98f61c3f8af021043e0d1dcf777befe9..63baa84349980a4fb4b7797cd9f4098bcf47afc4 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Participant.tpl b/civicrm/templates/CRM/Event/Form/Participant.tpl
index eef62491ecc04d1746c490c5149bce7f109fc1db..07de7971f3300e276cf604d24d0d50cb9d555aad 100644
--- a/civicrm/templates/CRM/Event/Form/Participant.tpl
+++ b/civicrm/templates/CRM/Event/Form/Participant.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index 8cb1428c5405109e2e323fb66fab1c777bfc2cc7..0244b6e7b81aa7721b63bc89045610c543042d09 100644
--- a/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/ParticipantView.tpl b/civicrm/templates/CRM/Event/Form/ParticipantView.tpl
index 4fcada8dafe34183516cc85c623e85ca3dc11d0e..52a98def95105ff37f38509a23b502f145dd6db0 100644
--- a/civicrm/templates/CRM/Event/Form/ParticipantView.tpl
+++ b/civicrm/templates/CRM/Event/Form/ParticipantView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -117,6 +117,9 @@
{if $hasPayment or $parentHasPayment}
<a class="action-item crm-hover-button" href='{crmURL p="civicrm/event/participant/feeselection" q="reset=1&id=`$participantId`&cid=`$contactId`&action=update"}'><i class="crm-i fa-pencil"></i> {ts}Change Selections{/ts}</a>
{/if}
+ {if $transferOrCancelLink}
+ <a class="action-item crm-hover-button" href={$transferOrCancelLink}><i class="crm-i fa-times"></i> {ts}Transfer or Cancel{/ts}</a>
+ {/if}
{/if}
</td>
{else}
diff --git a/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
index be11d597954e9ca362f9092385795e47ec8b4798..72bb0046853f593137fa7e1cc20e35392c46ee97 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl b/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl
index df82d7e575807817333c4bbe3261c0e81c3fd231..e9a47733184899f63aaa4662980159dd2b91bf00 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl b/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl
index 8f58cdbd8d651c2e971bfde0bde4c548b9dd0231..62e7cc4c4ac876b73c4e461c2d7b22b782ca2ffc 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl b/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
index d675f8a1f7c412a974f54f6d3046bae5afccf7db..8241fe3f51e4127abb448971ad9a654b631cd5c4 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl b/civicrm/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl
index 15a4df44a7b44ee71f7ab6b66f7074e5670f9d33..2638e19a5460cec9716fa0b254b94fb292faf486 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Registration/PreviewHeader.tpl b/civicrm/templates/CRM/Event/Form/Registration/PreviewHeader.tpl
index cf426ce7a149de7f729de8b4b19452075294b825..470c476af36173b2dd2d34f3dc09e5ec5ba1dc85 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/PreviewHeader.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/PreviewHeader.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Registration/Register.tpl b/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
index 24d684b1bdc120ec22a0071f4cd2d8b4681d4885..e43cbdb10e616a83fcb6d6dcef6d0373ccd6005e 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl b/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl
index a5f659f0600571c1ca892d1c0b029bbbf3b9a058..af3cb1955785d7097cff06abfe0fdb54fdc9b61c 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Search.tpl b/civicrm/templates/CRM/Event/Form/Search.tpl
index 5ab1d084dc1ce6c7cc50bcf7d389054fee6a24cc..5d682152860538ceb6894d81fe3cfa513e87af28 100644
--- a/civicrm/templates/CRM/Event/Form/Search.tpl
+++ b/civicrm/templates/CRM/Event/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Event/Form/Search/AdvancedSearchPane.tpl
index b58d7a836f809d68339f4ad3675bee51cd4bfebe..b6a000720d2a921be84095384ad1526e2cfb86e1 100644
--- a/civicrm/templates/CRM/Event/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Event/Form/Search/AdvancedSearchPane.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Search/Common.tpl b/civicrm/templates/CRM/Event/Form/Search/Common.tpl
index db08ceaee88d31f66007356c9896f2ab5e9c51cb..bdb1e7530fc2ba73959bf940a4c44bc1c5a133df 100644
--- a/civicrm/templates/CRM/Event/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Event/Form/Search/Common.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Event/Form/Search/EmptyResults.tpl
index d020050c7716ad8d153452f322752da3d5c6f0bc..7e7939e69bc6436188e0135ee06d02a89dae864f 100644
--- a/civicrm/templates/CRM/Event/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Event/Form/Search/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Search/Results.hlp b/civicrm/templates/CRM/Event/Form/Search/Results.hlp
index 26ef592a86ca62f321b70068419dd2bba1f0af74..d2214c6803f8b8dfd600c01503882f48aaca3116 100644
--- a/civicrm/templates/CRM/Event/Form/Search/Results.hlp
+++ b/civicrm/templates/CRM/Event/Form/Search/Results.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/SearchEvent.tpl b/civicrm/templates/CRM/Event/Form/SearchEvent.tpl
index b7b103a9e42f5ef5d6444a20c6aade6c32bd052c..58ee86483ffe0fbdc5a6bbde1a83d58704631e8f 100644
--- a/civicrm/templates/CRM/Event/Form/SearchEvent.tpl
+++ b/civicrm/templates/CRM/Event/Form/SearchEvent.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Selector.tpl b/civicrm/templates/CRM/Event/Form/Selector.tpl
index 3c89dbee760e1ec7c4136e3a6a1249f8f781c8c3..289c3803cd68855d29e1a252f9f96bd4a14761de 100644
--- a/civicrm/templates/CRM/Event/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Event/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/SelfSvcTransfer.tpl b/civicrm/templates/CRM/Event/Form/SelfSvcTransfer.tpl
index 0481a84b5521244c4f0b1e209645a8b33a069cc4..ad737e95b41a6c9136b2c6719629c1e5de54c896 100644
--- a/civicrm/templates/CRM/Event/Form/SelfSvcTransfer.tpl
+++ b/civicrm/templates/CRM/Event/Form/SelfSvcTransfer.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -44,22 +44,32 @@
<td class="crm-participant-participant_role">{$details.role}</td>
</tr>
</table>
- <div class="crm-public-form-item crm-section selfsvctransfer-section">
- <div class="crm-public-form-item crm-section selfsvctransfer-firstname-section">
- <div class="label">{$form.first_name.label}</div>
- <div class="content">{$form.first_name.html}</div>
- <div class="clear"></div>
+ {if $form.contact_id}
+ <div class="crm-public-form-item crm-section selfsvctransfer-section">
+ <div class="crm-public-form-item crm-section selfsvctransfer-contact_id-section">
+ <div class="label">{$form.contact_id.label}</div>
+ <div class="content">{$form.contact_id.html}</div>
+ <div class="clear"></div>
+ </div>
</div>
- <div class="crm-public-form-item crm-section selfsvctransfer-lastname-section">
- <div class="label">{$form.last_name.label}</div>
- <div class="content">{$form.last_name.html}</div>
- <div class="clear"></div>
- </div>
- <div class="crm-public-form-item crm-section selfsvctransfer-email-section">
- <div class="label">{$form.email.label}</div>
- <div class="content">{$form.email.html}</div>
- <div class="clear"></div>
- </div>
- </div>
+ {else}
+ <div class="crm-public-form-item crm-section selfsvctransfer-section">
+ <div class="crm-public-form-item crm-section selfsvctransfer-firstname-section">
+ <div class="label">{$form.first_name.label}</div>
+ <div class="content">{$form.first_name.html}</div>
+ <div class="clear"></div>
+ </div>
+ <div class="crm-public-form-item crm-section selfsvctransfer-lastname-section">
+ <div class="label">{$form.last_name.label}</div>
+ <div class="content">{$form.last_name.html}</div>
+ <div class="clear"></div>
+ </div>
+ <div class="crm-public-form-item crm-section selfsvctransfer-email-section">
+ <div class="label">{$form.email.label}</div>
+ <div class="content">{$form.email.html}</div>
+ <div class="clear"></div>
+ </div>
+ </div>
+ {/if}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
</div>
diff --git a/civicrm/templates/CRM/Event/Form/SelfSvcUpdate.tpl b/civicrm/templates/CRM/Event/Form/SelfSvcUpdate.tpl
index d1937b59c75436a17ba1d6309d246586f2844c8c..cd46b2bab140d10577bab42dd0d9ffaf944037e5 100644
--- a/civicrm/templates/CRM/Event/Form/SelfSvcUpdate.tpl
+++ b/civicrm/templates/CRM/Event/Form/SelfSvcUpdate.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task.tpl b/civicrm/templates/CRM/Event/Form/Task.tpl
index bdc8970337513bf00d8914761a06074db7146ad4..d909bd87fff1eb85e09c14cc8870192ddf098de4 100644
--- a/civicrm/templates/CRM/Event/Form/Task.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/AddToGroup.tpl b/civicrm/templates/CRM/Event/Form/Task/AddToGroup.tpl
index 02361f80a738cbabf72387f91bec1f61b9f8eab7..f739a527d19bb5cb9fea6365c0a6791408d87e5d 100644
--- a/civicrm/templates/CRM/Event/Form/Task/AddToGroup.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/AddToGroup.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/Badge.tpl b/civicrm/templates/CRM/Event/Form/Task/Badge.tpl
index b319bbd3bdbf09a86b113d35a2ac30f094674d62..b29f9b50590e5f1f97f1da55a741dcfdb9362aed 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Badge.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Badge.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/Batch.tpl b/civicrm/templates/CRM/Event/Form/Task/Batch.tpl
index f70eec3fae85b67461c507df0101982adc8c0138..ca72bc20f2cdaa511ecba1a6d0acc719e9aace0b 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/Cancel.tpl b/civicrm/templates/CRM/Event/Form/Task/Cancel.tpl
index 33949de20adada00228e86506a5280c512918ac1..e00f99013a74930cb3b5b0deff376a1a2cc6b6a4 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Cancel.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Cancel.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/Delete.tpl b/civicrm/templates/CRM/Event/Form/Task/Delete.tpl
index dba6b54405c3d384ff6a860164167ace60a20e2d..d46f37d02c393605dbf0cbbd6af8d2b1e0e8a502 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/Email.tpl b/civicrm/templates/CRM/Event/Form/Task/Email.tpl
index 9b7a13ada8bd503c9f100352fed2af347406aecd..b67407fbc1b479008e589658a5c04c4c2dd9e1f4 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Email.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/PDF.tpl b/civicrm/templates/CRM/Event/Form/Task/PDF.tpl
index 536d3e01ab459007e8d7008fe3901e246895f105..09f50cba1fc879be234b996d7442a09160331f85 100644
--- a/civicrm/templates/CRM/Event/Form/Task/PDF.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/PDF.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.hlp b/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.hlp
index 0a97e667e173e16707d6a1e1c9b2d1c469e5eb9f..7beb65b9bdd96706cdc111e336aeee23815ab007 100644
--- a/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.hlp
+++ b/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.tpl b/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.tpl
index 36011596a393134da7555e8fa95242c29cd84ba3..948f1b2d179498761347d03b1075e7bd6846c40a 100644
--- a/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Event/Form/Task/PickProfile.tpl
index 2264fd06cfc8303cfd87d915eb112837a325be36..0f1bcb26272213606b2bd0cc2774e027d2621182 100644
--- a/civicrm/templates/CRM/Event/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/PickProfile.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/Print.tpl b/civicrm/templates/CRM/Event/Form/Task/Print.tpl
index ede308a548955b07d4c6a6d2994e5644ca877bb7..6bf7013039c91cf7a869af5482e09eeabfac17b4 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/Result.tpl b/civicrm/templates/CRM/Event/Form/Task/Result.tpl
index 9c7830d7938841682df8eeda7e6e4d9712300025..a06c78ee581ea2f2ffe34832c2d9b3efd9f05429 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Result.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/SaveSearch.tpl b/civicrm/templates/CRM/Event/Form/Task/SaveSearch.tpl
index d05ef2468f2fa315720e9a8e7e50e5d0d153a9cb..25651191590316797d4fc5aa16bba4451f78bfa1 100644
--- a/civicrm/templates/CRM/Event/Form/Task/SaveSearch.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/SaveSearch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Form/Task/SaveSearch/Update.tpl b/civicrm/templates/CRM/Event/Form/Task/SaveSearch/Update.tpl
index ce1d6fb33294d755bf648f4763de3b5dead7e73b..7b120152dad92f99444e7dc6e89ea919601f4dc9 100644
--- a/civicrm/templates/CRM/Event/Form/Task/SaveSearch/Update.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/SaveSearch/Update.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Event/Import/Form/DataSource.hlp
index 206e5b062c4452fbc18d111d42b2a40ba586e68e..7d2243cb2b3a0527d624d061558247e597717e8a 100644
--- a/civicrm/templates/CRM/Event/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Event/Import/Form/DataSource.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Event/Import/Form/DataSource.tpl
index 7b75ae8002fef0a8fd3241ffc0d2c90f8e13b4d1..7861bbcb7e11497b49b0acc4b81b4373f750db4c 100644
--- a/civicrm/templates/CRM/Event/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/DataSource.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Import/Form/MapField.tpl b/civicrm/templates/CRM/Event/Import/Form/MapField.tpl
index 2056e8171e8ee11c1eb89374ec66c82086f1b260..010c90f1dd4ae08e8639ef4a67e3d695392d0d9f 100644
--- a/civicrm/templates/CRM/Event/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/MapField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Event/Import/Form/MapTable.tpl
index 4c5857170a901b2d4e57ea36e8b32f980f38eec6..3068ece6e67d3b27c8f262a938f5686ba2fd5f40 100644
--- a/civicrm/templates/CRM/Event/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/MapTable.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Import/Form/Preview.tpl b/civicrm/templates/CRM/Event/Import/Form/Preview.tpl
index f9a6ff245bd0bba5929047622f23c4cf0e26f399..2eee02b10dca5656e1dacc6cc3fc4ad5478f4015 100644
--- a/civicrm/templates/CRM/Event/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Import/Form/Summary.tpl b/civicrm/templates/CRM/Event/Import/Form/Summary.tpl
index 875de68cc28bb2ce643d480617ee146907bc8b2a..c8e13e3829f38ef8abf2aeb6c680aa5db6b85a4f 100644
--- a/civicrm/templates/CRM/Event/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/DashBoard.hlp b/civicrm/templates/CRM/Event/Page/DashBoard.hlp
index 4f8af44d5e872d26a1d1b637794a64fb8d5a21d0..c0d81c6e3bb47a9a2f29055afe19c0a666b8a5bd 100644
--- a/civicrm/templates/CRM/Event/Page/DashBoard.hlp
+++ b/civicrm/templates/CRM/Event/Page/DashBoard.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/DashBoard.tpl b/civicrm/templates/CRM/Event/Page/DashBoard.tpl
index edd1cbee822e599466a6b540a4de6ff869e29e0a..ade3298dc9f679ab10d58c90837ccd7ae751d1d0 100644
--- a/civicrm/templates/CRM/Event/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Event/Page/DashBoard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/EventInfo.tpl b/civicrm/templates/CRM/Event/Page/EventInfo.tpl
index 0e7d677b211e21b87f8a559c3dc76c4c5457abdf..23d1b9e31414b6c24372302f791c325ef45c054a 100644
--- a/civicrm/templates/CRM/Event/Page/EventInfo.tpl
+++ b/civicrm/templates/CRM/Event/Page/EventInfo.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/ICalendar.tpl b/civicrm/templates/CRM/Event/Page/ICalendar.tpl
index ae44eaa9a408c65e8e175cadc253efc92060ee26..3234cc7c55e368fa4196bb797274b9b356747703 100644
--- a/civicrm/templates/CRM/Event/Page/ICalendar.tpl
+++ b/civicrm/templates/CRM/Event/Page/ICalendar.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/ManageEvent.hlp b/civicrm/templates/CRM/Event/Page/ManageEvent.hlp
index ea344c2b48e6da5b68699ed5f273b33367303fc9..d837becd836a70f5bc2362ff7346ae3cee618d67 100644
--- a/civicrm/templates/CRM/Event/Page/ManageEvent.hlp
+++ b/civicrm/templates/CRM/Event/Page/ManageEvent.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/ManageEvent.tpl b/civicrm/templates/CRM/Event/Page/ManageEvent.tpl
index cd65971797288acb0952929d68cf2d46ec3c4119..6e96831f12146db6189fc741ed2d4b514024953b 100644
--- a/civicrm/templates/CRM/Event/Page/ManageEvent.tpl
+++ b/civicrm/templates/CRM/Event/Page/ManageEvent.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/ParticipantListing/Name.tpl b/civicrm/templates/CRM/Event/Page/ParticipantListing/Name.tpl
index 23f0036d84434ee52a5665496a39b93ec89957c9..ddf2a6304d6a418c395c1166ff2ba747ce32d7d2 100644
--- a/civicrm/templates/CRM/Event/Page/ParticipantListing/Name.tpl
+++ b/civicrm/templates/CRM/Event/Page/ParticipantListing/Name.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/ParticipantListing/NameAndEmail.tpl b/civicrm/templates/CRM/Event/Page/ParticipantListing/NameAndEmail.tpl
index d4d6ad0459e3098585a7a65480c6c8e6c8c69643..abf67f31c89ab7a0150641fa5a43bcbb64f88e7a 100644
--- a/civicrm/templates/CRM/Event/Page/ParticipantListing/NameAndEmail.tpl
+++ b/civicrm/templates/CRM/Event/Page/ParticipantListing/NameAndEmail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/ParticipantListing/NameStatusAndDate.tpl b/civicrm/templates/CRM/Event/Page/ParticipantListing/NameStatusAndDate.tpl
index 23f0b19091e6faf45922aec475ac30dd00f33b56..71636d276cf01f0ec5663636853336bc61ea9df2 100644
--- a/civicrm/templates/CRM/Event/Page/ParticipantListing/NameStatusAndDate.tpl
+++ b/civicrm/templates/CRM/Event/Page/ParticipantListing/NameStatusAndDate.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/Tab.tpl b/civicrm/templates/CRM/Event/Page/Tab.tpl
index df3edc32b06143d2b04c52b86fa6d3bf465ba5ad..859b325d47edcdbf3424f6faecdf1b5564d50c2f 100644
--- a/civicrm/templates/CRM/Event/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Event/Page/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/UserDashboard.tpl b/civicrm/templates/CRM/Event/Page/UserDashboard.tpl
index a120d51e1c349c9e03237f0b0656ec2b64223748..d0a0fb6b6328c0e1643370819c1ab089b1118210 100644
--- a/civicrm/templates/CRM/Event/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Event/Page/UserDashboard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Event/Page/iCalLinks.tpl b/civicrm/templates/CRM/Event/Page/iCalLinks.tpl
index fe602ccbba5deb1afa05fdedf123109a99824c59..6500e860f2028411bda4c244516a11f44fe24bac 100644
--- a/civicrm/templates/CRM/Event/Page/iCalLinks.tpl
+++ b/civicrm/templates/CRM/Event/Page/iCalLinks.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Export/Form/Map.tpl b/civicrm/templates/CRM/Export/Form/Map.tpl
index 2a65eddd8822c545b5d1ac7a9ebbe3d451f62c77..a4f76df01cdfb79d727723ee791914ebc5e339bc 100644
--- a/civicrm/templates/CRM/Export/Form/Map.tpl
+++ b/civicrm/templates/CRM/Export/Form/Map.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Export/Form/Select.tpl b/civicrm/templates/CRM/Export/Form/Select.tpl
index c84d30be7638cf8c95e2b37735a7f39bdd92b075..07c5c005fc528682e128e50783039b76d8fcfc81 100644
--- a/civicrm/templates/CRM/Export/Form/Select.tpl
+++ b/civicrm/templates/CRM/Export/Form/Select.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Export/Form/table.tpl b/civicrm/templates/CRM/Export/Form/table.tpl
index 768cc884e1323d36909fa06b55bff4f8754a30fb..461190e0bafcc50feb0820926d746e0c25f953e9 100644
--- a/civicrm/templates/CRM/Export/Form/table.tpl
+++ b/civicrm/templates/CRM/Export/Form/table.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/ExportFormat/IIF.tpl b/civicrm/templates/CRM/Financial/ExportFormat/IIF.tpl
index 148eac9c875f10d8887a47f4a1d909f2001edc6f..9fd7ceea4c2792d0799ca14452e23e7425901258 100644
--- a/civicrm/templates/CRM/Financial/ExportFormat/IIF.tpl
+++ b/civicrm/templates/CRM/Financial/ExportFormat/IIF.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl b/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl
index 3e62c4453017f57f1d35b1c741d9c57de3cdff5a..eb1187ca75bf2363791954776620191576c1fc45 100644
--- a/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/Export.tpl b/civicrm/templates/CRM/Financial/Form/Export.tpl
index 0d811cd84dfea91ef7ab1589eaccaa15e2ab9419..d7196cabc833496f2cc5c740ad3ce98cfb139c78 100644
--- a/civicrm/templates/CRM/Financial/Form/Export.tpl
+++ b/civicrm/templates/CRM/Financial/Form/Export.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialAccount.hlp b/civicrm/templates/CRM/Financial/Form/FinancialAccount.hlp
index ba5f2963fdbd2af79b7dadc169dbd375c2886eaa..81b6844a981712527f85909b4dc892927b87022f 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialAccount.hlp
+++ b/civicrm/templates/CRM/Financial/Form/FinancialAccount.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl b/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl
index b07e5ee5680eec10b39ad3747eb839b3f51ef9c8..6375a9179e3dbbb5804d736645ee3a96c33b7a59 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl
+++ b/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl b/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl
index 4905cfa49e663e92582c04588d919e6b814f79c4..03505718916a11fc4f0a9882fe203bcdf1d11b20 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl
+++ b/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialType.tpl b/civicrm/templates/CRM/Financial/Form/FinancialType.tpl
index cf15ba115c325df7164dfca1ede3f94555fa285a..c815ec8fbc64cd089f78c62df3b7cba637047040 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialType.tpl
+++ b/civicrm/templates/CRM/Financial/Form/FinancialType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialTypeAccount.tpl b/civicrm/templates/CRM/Financial/Form/FinancialTypeAccount.tpl
index eda15edb1b9abdf0ead013599a02c00c0a89ad6f..80cd255e16b9e1bb63c29d83ba62b3bc8da6c1f3 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialTypeAccount.tpl
+++ b/civicrm/templates/CRM/Financial/Form/FinancialTypeAccount.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/Payment.tpl b/civicrm/templates/CRM/Financial/Form/Payment.tpl
index 0c7ca06dff3bbf5a1e133f285ea898031130fdad..f750ac1e924735b31a1ee830120cd899a5374cdd 100644
--- a/civicrm/templates/CRM/Financial/Form/Payment.tpl
+++ b/civicrm/templates/CRM/Financial/Form/Payment.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/PaymentEdit.tpl b/civicrm/templates/CRM/Financial/Form/PaymentEdit.tpl
index 0c538c83b84349822658b2cea45cb22cc60aec70..6281ef9c9ea5e4bb38e1d8ead83c1da8af5cefd4 100644
--- a/civicrm/templates/CRM/Financial/Form/PaymentEdit.tpl
+++ b/civicrm/templates/CRM/Financial/Form/PaymentEdit.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/PaypalExpress.tpl b/civicrm/templates/CRM/Financial/Form/PaypalExpress.tpl
index 7761bbc36f542e2690b7c6c1a2a90f1498c2c762..21b9f9a4d5e22944e30d37c24a0673288851afb9 100644
--- a/civicrm/templates/CRM/Financial/Form/PaypalExpress.tpl
+++ b/civicrm/templates/CRM/Financial/Form/PaypalExpress.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/PaypalPro.tpl b/civicrm/templates/CRM/Financial/Form/PaypalPro.tpl
index 52588128a8dbe844948b249eb29bf45e6abc027c..90648ace7d6e775e1de6dd527aa569876d9ccc44 100644
--- a/civicrm/templates/CRM/Financial/Form/PaypalPro.tpl
+++ b/civicrm/templates/CRM/Financial/Form/PaypalPro.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Form/Search.tpl b/civicrm/templates/CRM/Financial/Form/Search.tpl
index da001b961c5f45bad8e525f8312be6e18ed6e5b7..89df71d3005c2515ba8e54881420f0a69c37e978 100644
--- a/civicrm/templates/CRM/Financial/Form/Search.tpl
+++ b/civicrm/templates/CRM/Financial/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Page/Batch.tpl b/civicrm/templates/CRM/Financial/Page/Batch.tpl
index 971ac2e6496e048a4de956758e41c1c3c285bb5e..be10a12e857f64c688ba4dc526a334e40249ac7b 100644
--- a/civicrm/templates/CRM/Financial/Page/Batch.tpl
+++ b/civicrm/templates/CRM/Financial/Page/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Page/BatchTransaction.tpl b/civicrm/templates/CRM/Financial/Page/BatchTransaction.tpl
index 4fbc45c99e27a38b2954ff40d422e1079bd4b89b..0887ae8c1b2ed9903d79768f7c6d447891899704 100644
--- a/civicrm/templates/CRM/Financial/Page/BatchTransaction.tpl
+++ b/civicrm/templates/CRM/Financial/Page/BatchTransaction.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialAccount.tpl b/civicrm/templates/CRM/Financial/Page/FinancialAccount.tpl
index 126b2b259552df9fd70093646d2800472bb038eb..d4f85222d7e55ef63a90ecdbf6de41f7d2228d98 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialAccount.tpl
+++ b/civicrm/templates/CRM/Financial/Page/FinancialAccount.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialBatch.hlp b/civicrm/templates/CRM/Financial/Page/FinancialBatch.hlp
index 0126d2299b4498b1997e31cbdf24d28d8584a850..598006be8c8b7308cd051c7706ae2f80d6624fb6 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialBatch.hlp
+++ b/civicrm/templates/CRM/Financial/Page/FinancialBatch.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialBatch.tpl b/civicrm/templates/CRM/Financial/Page/FinancialBatch.tpl
index d15b3f05c0083cb22ed727292487050c36294546..ac348563de36fdcc46b6d1157340f73f694df189 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialBatch.tpl
+++ b/civicrm/templates/CRM/Financial/Page/FinancialBatch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialType.tpl b/civicrm/templates/CRM/Financial/Page/FinancialType.tpl
index be80f92cfce350c65c41d53de42391a688f61c18..bcdecd9625a53e05aa77f786636aec422891da9d 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialType.tpl
+++ b/civicrm/templates/CRM/Financial/Page/FinancialType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialTypeAccount.tpl b/civicrm/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
index 4e793fd392a7c087341b595c41aebeffabe677c0..52c218c624e85d52460f5e8074831a1eda4d43cc 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
+++ b/civicrm/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Form/attachment.tpl b/civicrm/templates/CRM/Form/attachment.tpl
index dd838295893e4bff372b1201632ea4472ed27157..937271c7fc8a582f7d9a5946bfb5672528b718d6 100644
--- a/civicrm/templates/CRM/Form/attachment.tpl
+++ b/civicrm/templates/CRM/Form/attachment.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Form/basicForm.tpl b/civicrm/templates/CRM/Form/basicForm.tpl
index ab7d258cf3b34113ff25a4c9b8fbaea41194c07c..ff22a93292b28fbd0d157ed2721102f66414a470 100644
--- a/civicrm/templates/CRM/Form/basicForm.tpl
+++ b/civicrm/templates/CRM/Form/basicForm.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Form/body.tpl b/civicrm/templates/CRM/Form/body.tpl
index 2afde37e22e64b7a2b7fa71ab9bd7f6b1a12a75b..c4e1a38f00919b3ba9b851c34daae8f8838a4450 100644
--- a/civicrm/templates/CRM/Form/body.tpl
+++ b/civicrm/templates/CRM/Form/body.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Form/default.tpl b/civicrm/templates/CRM/Form/default.tpl
index 097a6fad20d1eda0b1685585365980e5d1c05dd7..db8a36a12ddc23afd8f61d89528f0e5235389124 100644
--- a/civicrm/templates/CRM/Form/default.tpl
+++ b/civicrm/templates/CRM/Form/default.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Form/element.tpl b/civicrm/templates/CRM/Form/element.tpl
index 977a04cd3ee31aefad71cf4587cb2fe2eb02155d..f0a99903d12a099c9261f90f5b2fef7cd0d7f6cf 100644
--- a/civicrm/templates/CRM/Form/element.tpl
+++ b/civicrm/templates/CRM/Form/element.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Form/error.tpl b/civicrm/templates/CRM/Form/error.tpl
index a1554710695660337375c3211f0637d311404911..b3ee34bec160911e8811fd65a607c86369a35a4f 100644
--- a/civicrm/templates/CRM/Form/error.tpl
+++ b/civicrm/templates/CRM/Form/error.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Form/label.tpl b/civicrm/templates/CRM/Form/label.tpl
index 13ec4d673761076503baf7307d30d1f7352a3d5d..4920f2d988c8db965808cba7a3a103069323407e 100644
--- a/civicrm/templates/CRM/Form/label.tpl
+++ b/civicrm/templates/CRM/Form/label.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Form/validate.tpl b/civicrm/templates/CRM/Form/validate.tpl
index 2aa73d83e3a4d54346a0d6aaf215642fa3ef8167..a899e1912964737fccc3095ab94aa544af7b4346 100644
--- a/civicrm/templates/CRM/Form/validate.tpl
+++ b/civicrm/templates/CRM/Form/validate.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Friend/Form.tpl b/civicrm/templates/CRM/Friend/Form.tpl
index 1397896d583365c8933121c20b859a275568f4c9..ec5709b9851461b0a1ef2330fcb93ba7a725446b 100644
--- a/civicrm/templates/CRM/Friend/Form.tpl
+++ b/civicrm/templates/CRM/Friend/Form.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Friend/Form/Contribute.tpl b/civicrm/templates/CRM/Friend/Form/Contribute.tpl
index 7df3a3725742c607626614cc048e987333e65eeb..fea9e161aa22eb88fc9bf711e34a3e7ee3fab0d9 100644
--- a/civicrm/templates/CRM/Friend/Form/Contribute.tpl
+++ b/civicrm/templates/CRM/Friend/Form/Contribute.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Friend/Form/Event.tpl b/civicrm/templates/CRM/Friend/Form/Event.tpl
index f031f19663df60041758a79d085337e3e23d39f4..a2045675e6252f1722cca0b00b6077c8d95da039 100644
--- a/civicrm/templates/CRM/Friend/Form/Event.tpl
+++ b/civicrm/templates/CRM/Friend/Form/Event.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Friend/Form/Friend.tpl b/civicrm/templates/CRM/Friend/Form/Friend.tpl
index 9165352a3e58dba1bf287f3e44f45dfe867d90e8..9b36c55ecfe945bb240c1e7c7b89bd6988802f5d 100644
--- a/civicrm/templates/CRM/Friend/Form/Friend.tpl
+++ b/civicrm/templates/CRM/Friend/Form/Friend.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Friend/Form/Pledge.tpl b/civicrm/templates/CRM/Friend/Form/Pledge.tpl
index 63310eb07fce20b7b3f023d6dd720b067d7d23a0..f11c7b05f56cdc445c2691bbd260ef4fddcebbec 100644
--- a/civicrm/templates/CRM/Friend/Form/Pledge.tpl
+++ b/civicrm/templates/CRM/Friend/Form/Pledge.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Grant.tpl b/civicrm/templates/CRM/Grant/Form/Grant.tpl
index 80c69246ca31e9c4b3b53454301b315d9277050c..6129921975445797f7223c06dc32bf254ab8785f 100644
--- a/civicrm/templates/CRM/Grant/Form/Grant.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Grant.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/GrantView.tpl b/civicrm/templates/CRM/Grant/Form/GrantView.tpl
index e9fef1fbaf5ddb7e8926c831c9cb3649fadd6b11..6f8fce372c23bfbba1c49f79dc016653fb15d8c1 100644
--- a/civicrm/templates/CRM/Grant/Form/GrantView.tpl
+++ b/civicrm/templates/CRM/Grant/Form/GrantView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Search.tpl b/civicrm/templates/CRM/Grant/Form/Search.tpl
index f4a2b785501161cc8d3bf39b0c400e5008fe0149..137baa2242bb9a79ab047bd6752e677380ee9da3 100644
--- a/civicrm/templates/CRM/Grant/Form/Search.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl
index 909ca0b77387973a19671645c0518f4f2206208d..d0f5387a22c4fd4d7cc353c7c2f2a9cfbb363dcd 100644
--- a/civicrm/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Search/Common.tpl b/civicrm/templates/CRM/Grant/Form/Search/Common.tpl
index 710be206acaf7adb1cc711441aa7debf7c000e6d..f85f11d3031392db47a83babe2a212d40a6904ae 100644
--- a/civicrm/templates/CRM/Grant/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Search/Common.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Grant/Form/Search/EmptyResults.tpl
index f5320ad5f3d046fa9ce2c4de97f1c5a13712670a..06f807e5a6f08d46add0310f4a5ba5f3ac85332b 100644
--- a/civicrm/templates/CRM/Grant/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Search/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Selector.tpl b/civicrm/templates/CRM/Grant/Form/Selector.tpl
index 84f12e5ade4619c7823f64d26e3865db38387a98..7cc96c54ed7d161f98c9dfa5073dc1724d378f65 100644
--- a/civicrm/templates/CRM/Grant/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Task.tpl b/civicrm/templates/CRM/Grant/Form/Task.tpl
index e29721ef6fc15f9798b1999d5ba43100f6ea4eea..a1d2292b0013293235babaddad617832aa56f046 100644
--- a/civicrm/templates/CRM/Grant/Form/Task.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Task/Delete.tpl b/civicrm/templates/CRM/Grant/Form/Task/Delete.tpl
index aeba8ee708bc61eeaca7703fd8846a92a1044d10..4ea0fd88d782f599370da1303151fc393aae1ea4 100644
--- a/civicrm/templates/CRM/Grant/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Task/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Task/Print.tpl b/civicrm/templates/CRM/Grant/Form/Task/Print.tpl
index 9a68a5c69a35403acf920acc30c4c6bbe2daeb34..71b1b51a834d710a2863ce485b4fe2ea9c99bed7 100644
--- a/civicrm/templates/CRM/Grant/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Form/Task/Update.tpl b/civicrm/templates/CRM/Grant/Form/Task/Update.tpl
index ca837169fce33afa35a2fda61e24ae146c4d3e16..9e8c4eea8a733f2efc4a7fc5665d41200411686c 100644
--- a/civicrm/templates/CRM/Grant/Form/Task/Update.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Task/Update.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Page/DashBoard.tpl b/civicrm/templates/CRM/Grant/Page/DashBoard.tpl
index 29146a5a7ce5797f2e74b9694247aa372d0ce1fd..0789fca2b7d7c6b76456bba89e3fa345e327886e 100644
--- a/civicrm/templates/CRM/Grant/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Grant/Page/DashBoard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Grant/Page/Tab.tpl b/civicrm/templates/CRM/Grant/Page/Tab.tpl
index 6fef82a654244f9074e6c3bc28871b56615cfa8e..c49a938585e4230d63a1303c591abda56c1ac147 100644
--- a/civicrm/templates/CRM/Grant/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Grant/Page/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Group/Form/Delete.tpl b/civicrm/templates/CRM/Group/Form/Delete.tpl
index d867c80e5cd2f0d4f420e1b25e6e8ae8f55e2fdd..18ca8ef0f0bce7c356aba0fa9876d9c00fcefee1 100644
--- a/civicrm/templates/CRM/Group/Form/Delete.tpl
+++ b/civicrm/templates/CRM/Group/Form/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Group/Form/Edit.tpl b/civicrm/templates/CRM/Group/Form/Edit.tpl
index 00041fb9ef473b1319093c28e8e6fa9d63e3d44b..71ea5732c85c137d3b98b03cafd8125458f861ed 100644
--- a/civicrm/templates/CRM/Group/Form/Edit.tpl
+++ b/civicrm/templates/CRM/Group/Form/Edit.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Group/Form/GroupsCommon.tpl b/civicrm/templates/CRM/Group/Form/GroupsCommon.tpl
index 655c13f136064cfb02fad9e35dc844261c47af8f..46ee414fcafd51b3adf809b36a4b318d0b95a4f0 100644
--- a/civicrm/templates/CRM/Group/Form/GroupsCommon.tpl
+++ b/civicrm/templates/CRM/Group/Form/GroupsCommon.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Group/Form/Search.tpl b/civicrm/templates/CRM/Group/Form/Search.tpl
index 5034d45474002ff1c86cb0102d51fc47364a09f6..6fe311cd282cf9345217e58bd1504180eb9b9d23 100644
--- a/civicrm/templates/CRM/Group/Form/Search.tpl
+++ b/civicrm/templates/CRM/Group/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Group/Page/Group.hlp b/civicrm/templates/CRM/Group/Page/Group.hlp
index 5a52d3494e9d91db119709b4c76d4a17a9fbb1d9..9d48d67a5bc03480f0289df15ed51726d3b66b47 100644
--- a/civicrm/templates/CRM/Group/Page/Group.hlp
+++ b/civicrm/templates/CRM/Group/Page/Group.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Group/Page/Group.tpl b/civicrm/templates/CRM/Group/Page/Group.tpl
index 1df7d291a0b81bddd521a9f6b567baf0098ca33b..7a954aa6aa0d2ef82f6af157a1dc1f9f57f74802 100644
--- a/civicrm/templates/CRM/Group/Page/Group.tpl
+++ b/civicrm/templates/CRM/Group/Page/Group.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Group/Page/GroupRows.tpl b/civicrm/templates/CRM/Group/Page/GroupRows.tpl
index 96bdf81af879056cf9cd1cb1b7d1abee52570306..13c7ef09344bdfb60f80fb5d9769725ff380970b 100644
--- a/civicrm/templates/CRM/Group/Page/GroupRows.tpl
+++ b/civicrm/templates/CRM/Group/Page/GroupRows.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Logging/ReportDetail.tpl b/civicrm/templates/CRM/Logging/ReportDetail.tpl
index 3ded328341601bc89ed0363c2d50aae357aa912f..a88617459258bd808a7abb1ebf6d9f36ea896df4 100644
--- a/civicrm/templates/CRM/Logging/ReportDetail.tpl
+++ b/civicrm/templates/CRM/Logging/ReportDetail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Logging/ReportSummary.tpl b/civicrm/templates/CRM/Logging/ReportSummary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Logging/ReportSummary.tpl
+++ b/civicrm/templates/CRM/Logging/ReportSummary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Approve.tpl b/civicrm/templates/CRM/Mailing/Form/Approve.tpl
index 6bea9663135721fcb963635c29c35da663b4611d..42f351b93f88ca8be30fe9a0534fb9653a408a2b 100644
--- a/civicrm/templates/CRM/Mailing/Form/Approve.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Approve.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Component.tpl b/civicrm/templates/CRM/Mailing/Form/Component.tpl
index 387435bbd0f5bb5caa947451356962ec262323d0..0ac7407f6f8f8aa172d63ec7edb320ebe94a4d6e 100644
--- a/civicrm/templates/CRM/Mailing/Form/Component.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Component.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Count.tpl b/civicrm/templates/CRM/Mailing/Form/Count.tpl
index fec5c6115e13d640a34d8ab8c4cd462a06a939cd..5f871d149a1be948dfe087264f790649059071e6 100644
--- a/civicrm/templates/CRM/Mailing/Form/Count.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Count.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/ForwardMailing.tpl b/civicrm/templates/CRM/Mailing/Form/ForwardMailing.tpl
index 0a44f110b30b337f19b2a70819fcb89b450292b2..ef6cb101847cde13a57012763aa396779c4e4b75 100644
--- a/civicrm/templates/CRM/Mailing/Form/ForwardMailing.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/ForwardMailing.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Group.hlp b/civicrm/templates/CRM/Mailing/Form/Group.hlp
index 12b8fe6a84ec59fed4109dda061e4d94fe8bbbc6..640c2d012c225d1ebf23b4ced762dc506400fe71 100644
--- a/civicrm/templates/CRM/Mailing/Form/Group.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Group.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Group.tpl b/civicrm/templates/CRM/Mailing/Form/Group.tpl
index 003aafab6ba096fb4905b16fe4a10b803fe6a67e..198de5444cfb3c2abccf062ac83e98f17d40fc38 100644
--- a/civicrm/templates/CRM/Mailing/Form/Group.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Group.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl b/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl
index 97ab609f192d16b97f9b5de3b3f4a738a420be57..4856fc886a7cf77414e700ed1cbd30aa11119581 100644
--- a/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Optout.tpl b/civicrm/templates/CRM/Mailing/Form/Optout.tpl
index 4ad45a76b17be54fe6079893b7db4574f30ef777..d6e4e993f335d343fcce894bae440e68d60a9b2f 100644
--- a/civicrm/templates/CRM/Mailing/Form/Optout.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Optout.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Schedule.hlp b/civicrm/templates/CRM/Mailing/Form/Schedule.hlp
index b25b50cb11066630913d23cc78f04acc6b4ddd3c..014b911fb4cdde7e1cb5de809b2a85830cce77d3 100644
--- a/civicrm/templates/CRM/Mailing/Form/Schedule.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Schedule.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Schedule.tpl b/civicrm/templates/CRM/Mailing/Form/Schedule.tpl
index 6d0861a3e3307b1389281938f7da3db3a62ab7e9..cb57a019129d71820e5d2e43f75a5a5631aba2fd 100644
--- a/civicrm/templates/CRM/Mailing/Form/Schedule.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Schedule.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Search.tpl b/civicrm/templates/CRM/Mailing/Form/Search.tpl
index dc9c90505bfb2d957ccd728624e7a6a1d506d11f..2831ff1f187a74aad6411717c65c7cb2d8383f92 100644
--- a/civicrm/templates/CRM/Mailing/Form/Search.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Selector.tpl b/civicrm/templates/CRM/Mailing/Form/Selector.tpl
index 2804e4bf7b1e2586976962d248c7f149ac65a083..732a9878a274154d65902dc46d47cce186c3582c 100644
--- a/civicrm/templates/CRM/Mailing/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Settings.hlp b/civicrm/templates/CRM/Mailing/Form/Settings.hlp
index 7a0882878d5ec96c7678c3a261f09464755c56cd..39749e8cf8d3567e9f6a1a3515b6598171f073d3 100644
--- a/civicrm/templates/CRM/Mailing/Form/Settings.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Settings.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Settings.tpl b/civicrm/templates/CRM/Mailing/Form/Settings.tpl
index c0189d4b85884a36c8c255bfbe656d7f3cbbbd79..c9435a1012d568e7b05b7b4ce1848d0529a15db4 100644
--- a/civicrm/templates/CRM/Mailing/Form/Settings.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Settings.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Subscribe.tpl b/civicrm/templates/CRM/Mailing/Form/Subscribe.tpl
index 4ca3be00d18a4abe080d473aab6b2a30f30a96be..0d81f270840a04896dba5537595e7444ad2a41fa 100644
--- a/civicrm/templates/CRM/Mailing/Form/Subscribe.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Subscribe.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Task.tpl b/civicrm/templates/CRM/Mailing/Form/Task.tpl
index fab4ce7501d99a08ec1604594b9259438cad63c5..d836ce0235413eee591f1a4551930c8ebb1b1504 100644
--- a/civicrm/templates/CRM/Mailing/Form/Task.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Task/Print.tpl b/civicrm/templates/CRM/Mailing/Form/Task/Print.tpl
index 9f72fdeb340f8d9c6ec259ca0b98a3c69f7b33d6..f04f18acf4b8d4105c1c391a9466abbc817d0a93 100644
--- a/civicrm/templates/CRM/Mailing/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Test.hlp b/civicrm/templates/CRM/Mailing/Form/Test.hlp
index 6847719cf3c6cb392361358befac8faf5ec045ab..c87226acba455ef723791f33edec81ed87acd116 100644
--- a/civicrm/templates/CRM/Mailing/Form/Test.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Test.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Test.tpl b/civicrm/templates/CRM/Mailing/Form/Test.tpl
index 2a92d6100ac2b559cbff779fdd45733eabe70dbb..953ab080c82a1d7684e9090f2eed9430a4a7572f 100644
--- a/civicrm/templates/CRM/Mailing/Form/Test.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Test.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Unsubscribe.tpl b/civicrm/templates/CRM/Mailing/Form/Unsubscribe.tpl
index 8a9eed15f5fa418c4bd1c181835527b9f4b67521..654de112d154f7d6356c98049c05fed72a70fce8 100644
--- a/civicrm/templates/CRM/Mailing/Form/Unsubscribe.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Unsubscribe.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Upload.hlp b/civicrm/templates/CRM/Mailing/Form/Upload.hlp
index 2aa1fa73efeff1d63d39827753c70fadaa8eb326..7b6c1281ed0e233738b588598b2d528be044fa03 100644
--- a/civicrm/templates/CRM/Mailing/Form/Upload.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Upload.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Form/Upload.tpl b/civicrm/templates/CRM/Mailing/Form/Upload.tpl
index be9055dc419687516e0f682dd9eb7c764cb56d56..953afd48dac4eb171a0593d8ba311961f1833f51 100644
--- a/civicrm/templates/CRM/Mailing/Form/Upload.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Upload.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/MailingUI.hlp b/civicrm/templates/CRM/Mailing/MailingUI.hlp
index de3903d789076d1db4fd8e7ffd1ba714b1bc366e..987e7fbffc8d3598b477473a0784d36d611d64d2 100644
--- a/civicrm/templates/CRM/Mailing/MailingUI.hlp
+++ b/civicrm/templates/CRM/Mailing/MailingUI.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Page/Browse.hlp b/civicrm/templates/CRM/Mailing/Page/Browse.hlp
index 7993bb00f79233d20f28b9d95ddd7ad4dc63eed6..3c809ce1b66f3c7c633ded2f36a349204eb7d2e5 100644
--- a/civicrm/templates/CRM/Mailing/Page/Browse.hlp
+++ b/civicrm/templates/CRM/Mailing/Page/Browse.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Page/Browse.tpl b/civicrm/templates/CRM/Mailing/Page/Browse.tpl
index 4a3d13c47db54256f58c9df2ac32a608d8ecfb37..97ac6a1c62406c1d495006586da5b4735d33f800 100644
--- a/civicrm/templates/CRM/Mailing/Page/Browse.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Browse.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Page/Component.tpl b/civicrm/templates/CRM/Mailing/Page/Component.tpl
index 5cf4294d6bb329b7d1546b1c8f7bb84f34fbe608..578a8709ed49c3f9405dcfa7aecb07862e96e484 100644
--- a/civicrm/templates/CRM/Mailing/Page/Component.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Component.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Page/Confirm.tpl b/civicrm/templates/CRM/Mailing/Page/Confirm.tpl
index d0489f6b96e2ed4501f9b0bb9551fbbf32f65a0b..6a77be6292b300e135df36bbd2246d7ba684ff93 100644
--- a/civicrm/templates/CRM/Mailing/Page/Confirm.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Confirm.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Page/Event.tpl b/civicrm/templates/CRM/Mailing/Page/Event.tpl
index a70e0e91d19749106d24ac63cbed15abe41a7e2c..d2733abf7b47384e3ee255bc9629359e75e7b565 100644
--- a/civicrm/templates/CRM/Mailing/Page/Event.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Event.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Page/Report.tpl b/civicrm/templates/CRM/Mailing/Page/Report.tpl
index 3a31c03792e5d322f05362d5c1a1d17db64ef936..0767df8c743f071dd0a3508519f3b9c6cd97e1a1 100644
--- a/civicrm/templates/CRM/Mailing/Page/Report.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Report.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -36,7 +36,7 @@
<td>{$report.event_totals.actionlinks.delivered}</td></tr>
{if $report.mailing.open_tracking}
<tr><td class="label"><a href="{$report.event_totals.links.opened}&distinct=1">{ts}Unique Opens{/ts}</a></td>
- <td>{$report.event_totals.opened}</td>
+ <td>{$report.event_totals.opened} ({$report.event_totals.opened_rate|string_format:"%0.2f"}%)</td>
<td>{$report.event_totals.actionlinks.opened}</td></tr>
<tr><td class="label"><a href="{$report.event_totals.links.opened}">{ts}Total Opens{/ts}</a></td>
<td>{$report.event_totals.total_opened}</td>
@@ -44,7 +44,7 @@
{/if}
{if $report.mailing.url_tracking}
<tr><td class="label"><a href="{$report.event_totals.links.clicks}">{ts}Click-throughs{/ts}</a></td>
- <td>{$report.event_totals.url}</td>
+ <td>{$report.event_totals.url} ({$report.event_totals.clickthrough_rate|string_format:"%0.2f"}%)</td>
<td>{$report.event_totals.actionlinks.clicks}</td></tr>
{/if}
<tr><td class="label"><a href="{$report.event_totals.links.forward}">{ts}Forwards{/ts}</a></td>
diff --git a/civicrm/templates/CRM/Mailing/Page/Resubscribe.tpl b/civicrm/templates/CRM/Mailing/Page/Resubscribe.tpl
index 45181ecd2f358189b3e540480768a55749b0b22a..9cec1055481dad35c319422731ada21e485eca53 100644
--- a/civicrm/templates/CRM/Mailing/Page/Resubscribe.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Resubscribe.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Mailing/Page/Tab.tpl b/civicrm/templates/CRM/Mailing/Page/Tab.tpl
index 3473440ef44fe12b251d3156b24ef5e524c9e9ab..afade29c26b62cef18c80cb4a61c397c54257d0c 100644
--- a/civicrm/templates/CRM/Mailing/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Membership.hlp b/civicrm/templates/CRM/Member/Form/Membership.hlp
index b6fd9eb7bf8f49ceda1c985e7cbeea74ce707eef..fb7b3b016f8954c9804594e299e9ce0fbde7c93d 100644
--- a/civicrm/templates/CRM/Member/Form/Membership.hlp
+++ b/civicrm/templates/CRM/Member/Form/Membership.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Membership.tpl b/civicrm/templates/CRM/Member/Form/Membership.tpl
index b09a75b69c81e733eba5534ae242863112445a92..16b3f090123ac7729ec1ec6d11826a31de1ce097 100644
--- a/civicrm/templates/CRM/Member/Form/Membership.tpl
+++ b/civicrm/templates/CRM/Member/Form/Membership.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/MembershipBlock.hlp b/civicrm/templates/CRM/Member/Form/MembershipBlock.hlp
index 7476022cc1e481e3372178e26b6895290cc4d080..80672e9620da156bfdf908c67e3d45f35c54b7d8 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipBlock.hlp
+++ b/civicrm/templates/CRM/Member/Form/MembershipBlock.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl b/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl
index 7f7a4c5bd36d71adbd2a3fe573d1e7d55accd89a..8f1af938e7924a2ac1cca322ed7f30d788efd2ff 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/MembershipRelated.tpl b/civicrm/templates/CRM/Member/Form/MembershipRelated.tpl
index 3b7ec032a2c8e7d5a16249346b70d8363110ce30..1a25676f22396003a2aa7fece0a1262fd3c98c90 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipRelated.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipRelated.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl b/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl
index c9e69e4b070a5949edf7b8cf7347358e816e50a2..bd2b43dfa909259b28a9d95cdb04120968e08c6a 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/MembershipStatus.tpl b/civicrm/templates/CRM/Member/Form/MembershipStatus.tpl
index bff7a6a79735a7a27713424d5c1c48f1450f81cb..d6bdbe176e74a2357fea228139c03c68c2d10064 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipStatus.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipStatus.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/MembershipType.tpl b/civicrm/templates/CRM/Member/Form/MembershipType.tpl
index e33b6c8757cd8ba75a0ee102ff8da2746e68f5f8..3c6bc9a3d04c679d7c8de33d26fe865fea481a89 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipType.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/MembershipView.tpl b/civicrm/templates/CRM/Member/Form/MembershipView.tpl
index 2503a60f60ae0581a77b0086394b03764ac2f625..a5d4ddaa405e5efc51ff4edcf818db2123a07732 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipView.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Search.hlp b/civicrm/templates/CRM/Member/Form/Search.hlp
index ccbfaa0d910fb5771964b55470601da723417eef..c70c36fc687e893580cf1819229222bdb894f662 100644
--- a/civicrm/templates/CRM/Member/Form/Search.hlp
+++ b/civicrm/templates/CRM/Member/Form/Search.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Search.tpl b/civicrm/templates/CRM/Member/Form/Search.tpl
index 5446a9906936460c2b5f63f63c8456fea1821f4d..d6732a5529a9bec1b77dbc711906a2d19494d45a 100644
--- a/civicrm/templates/CRM/Member/Form/Search.tpl
+++ b/civicrm/templates/CRM/Member/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Member/Form/Search/AdvancedSearchPane.tpl
index 02497f821f86ea459869eb0e72bda14e818dd622..e017ef90ada6d0e44b9e2250fc5260cbfe730b8f 100644
--- a/civicrm/templates/CRM/Member/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Member/Form/Search/AdvancedSearchPane.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Search/Common.tpl b/civicrm/templates/CRM/Member/Form/Search/Common.tpl
index 90e3a1e82b8e782d906eb336ef80b8b13847bc99..bce037849c852a191d5bc43e7849a745be4bf303 100644
--- a/civicrm/templates/CRM/Member/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Member/Form/Search/Common.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Member/Form/Search/EmptyResults.tpl
index 68fdb60ff7106eda6a719988c2fdd00afe8355ef..11f39d06869399f731441473c75ffde64ec3620b 100644
--- a/civicrm/templates/CRM/Member/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Member/Form/Search/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Selector.tpl b/civicrm/templates/CRM/Member/Form/Selector.tpl
index 53d0de976f9ec52a314c4521670ecbf4a91514d9..7e5820182395d14828d7922c8c4f3061605cbac7 100644
--- a/civicrm/templates/CRM/Member/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Member/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Task.tpl b/civicrm/templates/CRM/Member/Form/Task.tpl
index dcccebb6aa42d7135d3ce87bbe0188f52111235c..bfec81e0751abeb310b57e07fa632abff0697f0c 100644
--- a/civicrm/templates/CRM/Member/Form/Task.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Task/Batch.tpl b/civicrm/templates/CRM/Member/Form/Task/Batch.tpl
index 6814f18431d32401a6c4f635c4574eb18c0a2d06..18e4dccb517fdf5c0a071a663e6a71770c099a7b 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Batch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Task/Delete.tpl b/civicrm/templates/CRM/Member/Form/Task/Delete.tpl
index c000a94dc549c80c245326f0ead2312c57ca396f..28d356e352d3af38c9de3085143a11c340decb01 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Task/Email.tpl b/civicrm/templates/CRM/Member/Form/Task/Email.tpl
index 9b7a13ada8bd503c9f100352fed2af347406aecd..b67407fbc1b479008e589658a5c04c4c2dd9e1f4 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Email.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Task/Label.tpl b/civicrm/templates/CRM/Member/Form/Task/Label.tpl
index 18f3004ad2c99b95e38dcedceb3856d38b236c5b..695b7a3ff9aafefe04fb594a70cbd1a73e58157b 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Label.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Label.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Task/PDFLetter.tpl b/civicrm/templates/CRM/Member/Form/Task/PDFLetter.tpl
index 8355ff207f783997b1c13279c7ed1ba65e5da385..6d97ff3178848edc8ff7caf0148e1ee9ec642dd9 100644
--- a/civicrm/templates/CRM/Member/Form/Task/PDFLetter.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/PDFLetter.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Member/Form/Task/PickProfile.tpl
index faf45d870549cd3f93f290f59ddc857f4a618225..50bfdbd01a624d90de9d9e30939e9c0b579ddc2f 100644
--- a/civicrm/templates/CRM/Member/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/PickProfile.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Task/Print.tpl b/civicrm/templates/CRM/Member/Form/Task/Print.tpl
index b1cf554e5216e4c653661433b2a9b355615c9d1e..a14fc627e8775666432e5ce7cd1821af5cff37b4 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Form/Task/Result.tpl b/civicrm/templates/CRM/Member/Form/Task/Result.tpl
index 12a8d7ce50c9f9469a1c91971390c4daa17fe384..a1dec7f51c1c018c07d40b9a7bb1b714b2888988 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Result.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Member/Import/Form/DataSource.hlp
index 7198fa3e797d934178b379ae240dddf2b61c5449..d66a2c9677198d093a1fba314acaa743f9b066ca 100644
--- a/civicrm/templates/CRM/Member/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Member/Import/Form/DataSource.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Member/Import/Form/DataSource.tpl
index b5e3536c0326981dd6d2c5bc4226bc715d2a8d1b..c52885db57dff196a00991eb09e944b16cf98cb7 100644
--- a/civicrm/templates/CRM/Member/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/DataSource.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Import/Form/MapField.tpl b/civicrm/templates/CRM/Member/Import/Form/MapField.tpl
index 83921e5a9b2a53e3fe14ec1506116262622921d5..00a64b83a1203b6d41004009ae774e27452df9d5 100644
--- a/civicrm/templates/CRM/Member/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/MapField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Member/Import/Form/MapTable.tpl
index 75e441fd7ff375a9840ac5911c13210dcceafb6e..812a6aef51d0f3ea0741bbc37b8aecfb50d4c478 100644
--- a/civicrm/templates/CRM/Member/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/MapTable.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Import/Form/Preview.tpl b/civicrm/templates/CRM/Member/Import/Form/Preview.tpl
index 7485b15b5974859bdb704e689122904a222a08c1..9e357cc78beeee24a76e5ec8385dfd6072c94794 100644
--- a/civicrm/templates/CRM/Member/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Import/Form/Summary.tpl b/civicrm/templates/CRM/Member/Import/Form/Summary.tpl
index a5b18ea7172ebd85d600ca20a5ffad66c51d8d82..559587edefb1eb07cf209c650cbd9174b2265d1a 100644
--- a/civicrm/templates/CRM/Member/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Page/DashBoard.hlp b/civicrm/templates/CRM/Member/Page/DashBoard.hlp
index 93f81e85f0c2d1561cfbdc8d2a6455c584e2d9e9..2de24515385f526152b258c36c3d47caa053a213 100644
--- a/civicrm/templates/CRM/Member/Page/DashBoard.hlp
+++ b/civicrm/templates/CRM/Member/Page/DashBoard.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Page/DashBoard.tpl b/civicrm/templates/CRM/Member/Page/DashBoard.tpl
index 58a61163944bcfdfa5226fede596a035a1dd5cca..093efdb7720628b054132640d99f72deae65baf0 100644
--- a/civicrm/templates/CRM/Member/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Member/Page/DashBoard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl b/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl
index bdfc5c2e4367fd560a079ef74621f699977f5655..574f99472b62f1d5806b60b12857d352569780c9 100644
--- a/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl
+++ b/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Page/MembershipType.hlp b/civicrm/templates/CRM/Member/Page/MembershipType.hlp
index f18985f4efc38264eb95b454c92073d61b43ee2b..94cb372885feddb968f79600eeb0578a06f0896e 100644
--- a/civicrm/templates/CRM/Member/Page/MembershipType.hlp
+++ b/civicrm/templates/CRM/Member/Page/MembershipType.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Page/MembershipType.tpl b/civicrm/templates/CRM/Member/Page/MembershipType.tpl
index 245643ca090c3012b9de1186875e543067fc32ff..d45566ce8a2bd321014b3e674707d1917b29930e 100644
--- a/civicrm/templates/CRM/Member/Page/MembershipType.tpl
+++ b/civicrm/templates/CRM/Member/Page/MembershipType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Page/Tab.hlp b/civicrm/templates/CRM/Member/Page/Tab.hlp
index 4302d77dd5f55493f7e934cfd35b719bea4ea0a2..9b5e93809a9dd120dfe535c9287f72e091b8991c 100644
--- a/civicrm/templates/CRM/Member/Page/Tab.hlp
+++ b/civicrm/templates/CRM/Member/Page/Tab.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Page/Tab.tpl b/civicrm/templates/CRM/Member/Page/Tab.tpl
index f746790870add6d7c150c385f4e0d3cc8118ae94..0323190bd9594b7460b558bf31fe98c21655912a 100644
--- a/civicrm/templates/CRM/Member/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Member/Page/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Member/Page/UserDashboard.tpl b/civicrm/templates/CRM/Member/Page/UserDashboard.tpl
index a1a28ef3c693575f2d6362a29c48d4d633c67718..41de55ad5c7b4174fa4d6903be275f52e826d1c0 100644
--- a/civicrm/templates/CRM/Member/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Member/Page/UserDashboard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Note/Form/Note.tpl b/civicrm/templates/CRM/Note/Form/Note.tpl
index 79494a86c8f38ecaadcd918e7917070ce2d6fde2..22d26b8092572bf9740e2f4517ec376d267a079b 100644
--- a/civicrm/templates/CRM/Note/Form/Note.tpl
+++ b/civicrm/templates/CRM/Note/Form/Note.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Form/Campaign.tpl b/civicrm/templates/CRM/PCP/Form/Campaign.tpl
index 8bd17e3382ea236a846e58099e7c0e012fbe6a06..e6a246e7e88cfdca45c9dabeed185404221dcf5f 100644
--- a/civicrm/templates/CRM/PCP/Form/Campaign.tpl
+++ b/civicrm/templates/CRM/PCP/Form/Campaign.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Form/Contribute.hlp b/civicrm/templates/CRM/PCP/Form/Contribute.hlp
index 9f1d7fd4e1acd9fde12b68ac34107833ab376924..b473c8236f8c4628ba4ddace303428a3004c4017 100644
--- a/civicrm/templates/CRM/PCP/Form/Contribute.hlp
+++ b/civicrm/templates/CRM/PCP/Form/Contribute.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Form/Contribute.tpl b/civicrm/templates/CRM/PCP/Form/Contribute.tpl
index 5f89729bf53307f896ad9618ec307fb92ecc7275..592d224ec52fada301353eb21e48ec5d199f3191 100644
--- a/civicrm/templates/CRM/PCP/Form/Contribute.tpl
+++ b/civicrm/templates/CRM/PCP/Form/Contribute.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Form/Event.hlp b/civicrm/templates/CRM/PCP/Form/Event.hlp
index a51275cf0cf0ba0a63629bb2f1aa1e72d2217419..8521820e275d1aa4b603c29b335b88c9e32f934c 100644
--- a/civicrm/templates/CRM/PCP/Form/Event.hlp
+++ b/civicrm/templates/CRM/PCP/Form/Event.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Form/Event.tpl b/civicrm/templates/CRM/PCP/Form/Event.tpl
index 3d51ffca46a0b27ba80fb436457ee897e5a2533d..d12e63c0c0586c02199d17c9ae84bad5b3b6ce36 100644
--- a/civicrm/templates/CRM/PCP/Form/Event.tpl
+++ b/civicrm/templates/CRM/PCP/Form/Event.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Form/PCP.tpl b/civicrm/templates/CRM/PCP/Form/PCP.tpl
index 258d6f91cafd6ca8a9c9d7a5cde93c551cfe55f6..103156e4ab3a0d56f05a9b0013b99a7b0f4c7af9 100644
--- a/civicrm/templates/CRM/PCP/Form/PCP.tpl
+++ b/civicrm/templates/CRM/PCP/Form/PCP.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Form/PCP/Delete.tpl b/civicrm/templates/CRM/PCP/Form/PCP/Delete.tpl
index 38541162b758829f13797d289ebe0c02ab712d76..8f79bec0a18466958e84f0b4da838bfa615d8c69 100644
--- a/civicrm/templates/CRM/PCP/Form/PCP/Delete.tpl
+++ b/civicrm/templates/CRM/PCP/Form/PCP/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Form/PCP/PCP.tpl b/civicrm/templates/CRM/PCP/Form/PCP/PCP.tpl
index 64989485c49c8e8fd4ef35c5a555717e74a2e534..b097dc53045b903bdb7b0587d33061b524a4e1fa 100644
--- a/civicrm/templates/CRM/PCP/Form/PCP/PCP.tpl
+++ b/civicrm/templates/CRM/PCP/Form/PCP/PCP.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Form/PCPAccount.tpl b/civicrm/templates/CRM/PCP/Form/PCPAccount.tpl
index 099689f09a8ac00b0625918cf9032e6690ac3fcd..eac51f5bead09811cd392cee2cf7078c178580d6 100644
--- a/civicrm/templates/CRM/PCP/Form/PCPAccount.tpl
+++ b/civicrm/templates/CRM/PCP/Form/PCPAccount.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Page/Contribute.tpl b/civicrm/templates/CRM/PCP/Page/Contribute.tpl
index 75f0eaa5fa8696cee4abd76864a6f907e48f3235..ea626ebe018bd60f7783879a8b91ccb84e3bf213 100644
--- a/civicrm/templates/CRM/PCP/Page/Contribute.tpl
+++ b/civicrm/templates/CRM/PCP/Page/Contribute.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Page/Event.tpl b/civicrm/templates/CRM/PCP/Page/Event.tpl
index 21bbf926213fd1b68584482e20cbc6a4f0c2ffb9..73d14462fe6d371ee04724332c48c921bdab7b74 100644
--- a/civicrm/templates/CRM/PCP/Page/Event.tpl
+++ b/civicrm/templates/CRM/PCP/Page/Event.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Page/PCP.hlp b/civicrm/templates/CRM/PCP/Page/PCP.hlp
index 00196a83a43569523691d4aa005f5906d21f5b92..509f598b1f2df35da1bfb9341275cd095be15d06 100644
--- a/civicrm/templates/CRM/PCP/Page/PCP.hlp
+++ b/civicrm/templates/CRM/PCP/Page/PCP.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Page/PCP.tpl b/civicrm/templates/CRM/PCP/Page/PCP.tpl
index 91ae960b9d913058ba95d3a37bd20b44d15187da..ecb9510529ead851fcd050542e5c30a438ff2a83 100644
--- a/civicrm/templates/CRM/PCP/Page/PCP.tpl
+++ b/civicrm/templates/CRM/PCP/Page/PCP.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/PCP/Page/PCPInfo.tpl b/civicrm/templates/CRM/PCP/Page/PCPInfo.tpl
index 75e408669ed5a5ab441715cd7446e7ae20d5ad03..73308f0b30dba4c2a80fae909339d7e95af36b13 100644
--- a/civicrm/templates/CRM/PCP/Page/PCPInfo.tpl
+++ b/civicrm/templates/CRM/PCP/Page/PCPInfo.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Payment.tpl b/civicrm/templates/CRM/Pledge/Form/Payment.tpl
index c770a61d7c9818cb0450df1fc2ee870395abf242..d07f9e8f3f4835b8242dc649d946a45b1e3515fc 100644
--- a/civicrm/templates/CRM/Pledge/Form/Payment.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Payment.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Pledge.tpl b/civicrm/templates/CRM/Pledge/Form/Pledge.tpl
index f9c7b4e78129b8c46a15fa0bb708589fcc97b16b..3f64f64d7b7bde48413948fc3f2b6c6b316c7f33 100644
--- a/civicrm/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Pledge.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl b/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl
index aa8c74ff80fa7b3286fe5df9bd079ff3ec092b24..cb6ee9145d2e1510479583de54e0fb7ca4ef3788 100644
--- a/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Search.tpl b/civicrm/templates/CRM/Pledge/Form/Search.tpl
index 2bc1436803866e6abfbbe5b24a69d606932c4584..24b3e6c7e07e34752e8d117317824a2e3b7094f0 100644
--- a/civicrm/templates/CRM/Pledge/Form/Search.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Pledge/Form/Search/AdvancedSearchPane.tpl
index 1596dde6366b78e1fc9a3433b820524a3476b438..f002a22bee60ca5359acf8bfae9f03065d9e95e3 100644
--- a/civicrm/templates/CRM/Pledge/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Search/AdvancedSearchPane.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Search/Common.tpl b/civicrm/templates/CRM/Pledge/Form/Search/Common.tpl
index 18c5e04a71d378accba32c14439616a1cd2f70e3..96e401f0bf4b1e1934cdb76877fac1a05ebcda97 100644
--- a/civicrm/templates/CRM/Pledge/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Search/Common.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Pledge/Form/Search/EmptyResults.tpl
index d861f01d6ec90d396970d6cd6bc94ddc6fba7416..08c7cc1892824608ee925f7dd5b0be37e39175f3 100644
--- a/civicrm/templates/CRM/Pledge/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Search/EmptyResults.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Selector.tpl b/civicrm/templates/CRM/Pledge/Form/Selector.tpl
index b6c03b1f09fe946fdab9f8358aeb3e33ddaaed5c..17332c459b70fe5fc2efe1744ed4986443dc0ba1 100644
--- a/civicrm/templates/CRM/Pledge/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Selector.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Task.tpl b/civicrm/templates/CRM/Pledge/Form/Task.tpl
index b61fefe3cefbfb94f0ff20d6747d021c05a2e7b9..5dadc72254357157dd38d22a4d125a0312da0ecd 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/Delete.tpl b/civicrm/templates/CRM/Pledge/Form/Task/Delete.tpl
index fbc9453e40d5e27c555b4c270089a50bd48627e4..62aed95bd99bcb9348396d6e80e8c4569f56a3fe 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/Delete.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/Print.tpl b/civicrm/templates/CRM/Pledge/Form/Task/Print.tpl
index 2b38e19538290813887146530d4513699671cccb..357ac68f5f9886ee9911612f4710881a437e6cd2 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/Print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/Result.tpl b/civicrm/templates/CRM/Pledge/Form/Task/Result.tpl
index 58b48aff86857ef715d069b6291641d3307a9ee2..9e692f611e0b7e12968ad5ad737425322d0a644a 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/Result.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch.tpl b/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch.tpl
index 76706a15cbdd71ee0bd8456fd2393df746ea4a54..16820c2983d039e8bd55002c6eb0321dac329f15 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch/Update.tpl b/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch/Update.tpl
index ce1d6fb33294d755bf648f4763de3b5dead7e73b..7b120152dad92f99444e7dc6e89ea919601f4dc9 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch/Update.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch/Update.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Page/DashBoard.tpl b/civicrm/templates/CRM/Pledge/Page/DashBoard.tpl
index 83316c7cc5ab2608544e63cc4e14e267d3028408..48f285fd4133475d487d5c3cdb337fe03141ddae 100644
--- a/civicrm/templates/CRM/Pledge/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Pledge/Page/DashBoard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Page/Payment.hlp b/civicrm/templates/CRM/Pledge/Page/Payment.hlp
index b6edafa3d3acb4b3716b4c47c09b265c8efa61c6..aca1023c58831afa486e43c9162b300c563507b4 100644
--- a/civicrm/templates/CRM/Pledge/Page/Payment.hlp
+++ b/civicrm/templates/CRM/Pledge/Page/Payment.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Page/Payment.tpl b/civicrm/templates/CRM/Pledge/Page/Payment.tpl
index c5ea31873740026bd304c4d88f3644055abd70c4..97596f617b207e2670efd21d27ebaf1cd367e42f 100644
--- a/civicrm/templates/CRM/Pledge/Page/Payment.tpl
+++ b/civicrm/templates/CRM/Pledge/Page/Payment.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Page/Tab.hlp b/civicrm/templates/CRM/Pledge/Page/Tab.hlp
index e2188a576524ad7dc37858c8fe59b44798a18adf..4cda134cd8c7aa4d928e7824c28784cd32203173 100644
--- a/civicrm/templates/CRM/Pledge/Page/Tab.hlp
+++ b/civicrm/templates/CRM/Pledge/Page/Tab.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Page/Tab.tpl b/civicrm/templates/CRM/Pledge/Page/Tab.tpl
index 52d847f9f46b54c539c8d05c05eb3bd445ec2ba0..b792a83ca3a95bdc863396403bcfc29a817e259e 100644
--- a/civicrm/templates/CRM/Pledge/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Pledge/Page/Tab.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Pledge/Page/UserDashboard.tpl b/civicrm/templates/CRM/Pledge/Page/UserDashboard.tpl
index 3c945cd6ce23642ad0be2807a41ca1faf7bc2995..f0cab011a01b8ab9db63ce9dc0fdd340cd9ff8ed 100644
--- a/civicrm/templates/CRM/Pledge/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Pledge/Page/UserDashboard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/Calculate.tpl b/civicrm/templates/CRM/Price/Form/Calculate.tpl
index 6e3f807c953f31231f94c82b97776ec40d6dbfe5..7c0533f4cb0441ddcd7cbdabc7bba57cffe3043e 100644
--- a/civicrm/templates/CRM/Price/Form/Calculate.tpl
+++ b/civicrm/templates/CRM/Price/Form/Calculate.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/DeleteField.tpl b/civicrm/templates/CRM/Price/Form/DeleteField.tpl
index 77f684b45df58b053b75bc1b1ddf42487974c2e2..a6aed134920541bb49d2573e08fe5d1822d3e690 100644
--- a/civicrm/templates/CRM/Price/Form/DeleteField.tpl
+++ b/civicrm/templates/CRM/Price/Form/DeleteField.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/DeleteSet.tpl b/civicrm/templates/CRM/Price/Form/DeleteSet.tpl
index 7ec9b46838e7ba3a7e6602c1a672cd8a27d4af4b..84fb1019a5335b83ee389ca2551ea79a5ffb6a18 100644
--- a/civicrm/templates/CRM/Price/Form/DeleteSet.tpl
+++ b/civicrm/templates/CRM/Price/Form/DeleteSet.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/Field.tpl b/civicrm/templates/CRM/Price/Form/Field.tpl
index 8ee57cec2fb408725afb32b3f0a20b9b36628d55..2428a03a9720889e48bb0a8b611f7c5c60eb8490 100644
--- a/civicrm/templates/CRM/Price/Form/Field.tpl
+++ b/civicrm/templates/CRM/Price/Form/Field.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/LineItem.tpl b/civicrm/templates/CRM/Price/Form/LineItem.tpl
index a6bec8ecae9597947e33e54e4bac6bc9719280aa..c490fdf399a67dc687a20bce8058f6ebaddff51c 100644
--- a/civicrm/templates/CRM/Price/Form/LineItem.tpl
+++ b/civicrm/templates/CRM/Price/Form/LineItem.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/Option.tpl b/civicrm/templates/CRM/Price/Form/Option.tpl
index f590adc5026d5ffdc42e9bede9793c0970f19931..9a7ca3775fa7fccf6514f2258a4fea50f0b0d792 100644
--- a/civicrm/templates/CRM/Price/Form/Option.tpl
+++ b/civicrm/templates/CRM/Price/Form/Option.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/OptionFields.tpl b/civicrm/templates/CRM/Price/Form/OptionFields.tpl
index b5802d62ac9dddbe3b7a3b04c022bf136790922a..25e34ebe963cc0ca88baef3fc2d6a91a8151b624 100644
--- a/civicrm/templates/CRM/Price/Form/OptionFields.tpl
+++ b/civicrm/templates/CRM/Price/Form/OptionFields.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/ParticipantCount.tpl b/civicrm/templates/CRM/Price/Form/ParticipantCount.tpl
index b2addfb6410ce9e8d9dd1f9c64b2a40bb08be3c1..7f310bd5591d4abfe7ea52b740f653df3f7b6401 100644
--- a/civicrm/templates/CRM/Price/Form/ParticipantCount.tpl
+++ b/civicrm/templates/CRM/Price/Form/ParticipantCount.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/Preview.tpl b/civicrm/templates/CRM/Price/Form/Preview.tpl
index 5042c3998cc788e9a15fc05312d78bf61e2d20b6..9e3fb82e836da5f1b1a2922adc3100fe86f4c603 100644
--- a/civicrm/templates/CRM/Price/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Price/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/PriceSet.tpl b/civicrm/templates/CRM/Price/Form/PriceSet.tpl
index e6876900ee11020d81f86d8cbb7d5c6fb770eaab..45c61e347b2e4559d0873756f817ccda9341d077 100644
--- a/civicrm/templates/CRM/Price/Form/PriceSet.tpl
+++ b/civicrm/templates/CRM/Price/Form/PriceSet.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Form/Set.tpl b/civicrm/templates/CRM/Price/Form/Set.tpl
index 427533e89df9cfcc5bf3eb182279d58a501807f4..2a8ee7ebce8760c2330492f118eec7142a4fe998 100644
--- a/civicrm/templates/CRM/Price/Form/Set.tpl
+++ b/civicrm/templates/CRM/Price/Form/Set.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Page/Field.hlp b/civicrm/templates/CRM/Price/Page/Field.hlp
index 255140490532efdfa01210dbfe553dfb5db97365..9c25fa6bb5d8ed134c22bee06e2784053cb549ae 100644
--- a/civicrm/templates/CRM/Price/Page/Field.hlp
+++ b/civicrm/templates/CRM/Price/Page/Field.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Page/Field.tpl b/civicrm/templates/CRM/Price/Page/Field.tpl
index 8f9166a33cc827e10cbf8b3dd57d7897327b5709..fdbfddf01a0474b0686602ff158bf371cb063fcc 100644
--- a/civicrm/templates/CRM/Price/Page/Field.tpl
+++ b/civicrm/templates/CRM/Price/Page/Field.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Page/LineItem.tpl b/civicrm/templates/CRM/Price/Page/LineItem.tpl
index 23d6ff24ec5505a0cec0c107ffa751e265c17f33..8fe2f888ad7467ce692ef74a51d2279016b22e90 100644
--- a/civicrm/templates/CRM/Price/Page/LineItem.tpl
+++ b/civicrm/templates/CRM/Price/Page/LineItem.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Page/Option.tpl b/civicrm/templates/CRM/Price/Page/Option.tpl
index 4f52d233fa4fcd773088e2bbdcd0ae42f0c38b98..ec63a4d88d828f1684505f97a3d32efeafa287e3 100644
--- a/civicrm/templates/CRM/Price/Page/Option.tpl
+++ b/civicrm/templates/CRM/Price/Page/Option.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Page/Set.tpl b/civicrm/templates/CRM/Price/Page/Set.tpl
index 9a8d1b8ae04ba3b759240018dc89809f0779884b..a0d13e45e7a63608092730ab2d121eb2782b3722 100644
--- a/civicrm/templates/CRM/Price/Page/Set.tpl
+++ b/civicrm/templates/CRM/Price/Page/Set.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Price/Page/table.tpl b/civicrm/templates/CRM/Price/Page/table.tpl
index e17300052f85b8922ece7e0560c2afe9548796c2..05b4fac682d82981e28f24e6228d79f27220b39b 100644
--- a/civicrm/templates/CRM/Price/Page/table.tpl
+++ b/civicrm/templates/CRM/Price/Page/table.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Profile/Form/Dynamic.tpl b/civicrm/templates/CRM/Profile/Form/Dynamic.tpl
index d773d925d57cf9bbf7f58c871cc05ab76e29d41a..ffb5047aeb687755f1cfe409be9fbbc6da6f09f9 100644
--- a/civicrm/templates/CRM/Profile/Form/Dynamic.tpl
+++ b/civicrm/templates/CRM/Profile/Form/Dynamic.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Profile/Form/Edit.tpl b/civicrm/templates/CRM/Profile/Form/Edit.tpl
index f4fda46f7b1ff108a7aa4e4a55215a3f7b71ecee..9f160b1ff0ffc6f5a5a325b670cbab89b15c7f71 100644
--- a/civicrm/templates/CRM/Profile/Form/Edit.tpl
+++ b/civicrm/templates/CRM/Profile/Form/Edit.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Profile/Form/GreetingType.tpl b/civicrm/templates/CRM/Profile/Form/GreetingType.tpl
index e89758156a8baf8e662425f41f99e8ffe443769d..d23a64f47604609c510a87104d4bbbb6b3bce63f 100644
--- a/civicrm/templates/CRM/Profile/Form/GreetingType.tpl
+++ b/civicrm/templates/CRM/Profile/Form/GreetingType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Profile/Form/Search.tpl b/civicrm/templates/CRM/Profile/Form/Search.tpl
index 64352f647a693e9952391a8068416114da37d8e4..f17aec45f61d42ff2146abdd8a90951b5d1dabd5 100644
--- a/civicrm/templates/CRM/Profile/Form/Search.tpl
+++ b/civicrm/templates/CRM/Profile/Form/Search.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Profile/Page/Dynamic.tpl b/civicrm/templates/CRM/Profile/Page/Dynamic.tpl
index 1d89dbdd616d22057587b9977e70d70ba31e0716..435251a096c94636a2e665e14aaae64e1ce741ab 100644
--- a/civicrm/templates/CRM/Profile/Page/Dynamic.tpl
+++ b/civicrm/templates/CRM/Profile/Page/Dynamic.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Profile/Page/Listings.tpl b/civicrm/templates/CRM/Profile/Page/Listings.tpl
index 8eb2c90de318d18fb0596ca1ac959e95faf83231..0e184bc43ae97886a7bf0eb9b9136123867aff75 100644
--- a/civicrm/templates/CRM/Profile/Page/Listings.tpl
+++ b/civicrm/templates/CRM/Profile/Page/Listings.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl b/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
index 03206d0b8995974c4ec6831ec48639a93e39fdb8..3091780ba850a0045d8c3ae00012c0afae3a7d3a 100644
--- a/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
+++ b/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Profile/Page/Overlay.tpl b/civicrm/templates/CRM/Profile/Page/Overlay.tpl
index ab5718ff07a4e9ba9aead20bfcf70e8dcdb4b656..1c3e72a0e0a5a87f1c67c1b6c15ae7274c126b54 100644
--- a/civicrm/templates/CRM/Profile/Page/Overlay.tpl
+++ b/civicrm/templates/CRM/Profile/Page/Overlay.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Profile/Page/View.tpl b/civicrm/templates/CRM/Profile/Page/View.tpl
index e48b0c7802581853c75e501d287e8465ca204e0e..1b24754fd967be3a492f04a4a013bfa989554f42 100644
--- a/civicrm/templates/CRM/Profile/Page/View.tpl
+++ b/civicrm/templates/CRM/Profile/Page/View.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form.tpl b/civicrm/templates/CRM/Report/Form.tpl
index 5900c3923c5f309b406fc4a88afccebd67709015..633424271c6102e60b445351e1ff1ed249855192 100644
--- a/civicrm/templates/CRM/Report/Form.tpl
+++ b/civicrm/templates/CRM/Report/Form.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Actions.tpl b/civicrm/templates/CRM/Report/Form/Actions.tpl
index 92120287b9aed9380211a94c38ff1a389b4bfb30..e64647447997a98ba630a170f2c76cb3f215261c 100644
--- a/civicrm/templates/CRM/Report/Form/Actions.tpl
+++ b/civicrm/templates/CRM/Report/Form/Actions.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Activity.tpl b/civicrm/templates/CRM/Report/Form/Activity.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Activity.tpl
+++ b/civicrm/templates/CRM/Report/Form/Activity.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/ActivitySummary.tpl b/civicrm/templates/CRM/Report/Form/ActivitySummary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/ActivitySummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/ActivitySummary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl b/civicrm/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl
index 468ee2beba55a7d8a93ffc885aa36bac1c2f2a9f..aa68e0f094fa22c8f6ec94a1a9cea1d69d0a45ba 100644
--- a/civicrm/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl
+++ b/civicrm/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Campaign/SurveyDetails.tpl b/civicrm/templates/CRM/Report/Form/Campaign/SurveyDetails.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Campaign/SurveyDetails.tpl
+++ b/civicrm/templates/CRM/Report/Form/Campaign/SurveyDetails.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Case/Demographics.tpl b/civicrm/templates/CRM/Report/Form/Case/Demographics.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Case/Demographics.tpl
+++ b/civicrm/templates/CRM/Report/Form/Case/Demographics.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Case/Detail.tpl b/civicrm/templates/CRM/Report/Form/Case/Detail.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Case/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Case/Detail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Case/Summary.tpl b/civicrm/templates/CRM/Report/Form/Case/Summary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Case/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Case/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Case/TimeSpent.tpl b/civicrm/templates/CRM/Report/Form/Case/TimeSpent.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Case/TimeSpent.tpl
+++ b/civicrm/templates/CRM/Report/Form/Case/TimeSpent.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contact/CurrentEmployer.tpl b/civicrm/templates/CRM/Report/Form/Contact/CurrentEmployer.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/CurrentEmployer.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/CurrentEmployer.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contact/Detail.tpl b/civicrm/templates/CRM/Report/Form/Contact/Detail.tpl
index 779726ce4338d376635dc758f3534b88c29f0916..c0e2cd0f88c3360a9f38a09d858b474ee6f4c1f1 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/Detail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contact/Log.tpl b/civicrm/templates/CRM/Report/Form/Contact/Log.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/Log.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/Log.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contact/LoggingDetail.tpl b/civicrm/templates/CRM/Report/Form/Contact/LoggingDetail.tpl
index de408e8070201716435944a2286f2258f94b006f..e34abdbc791505f988e815e29a70e710f20e4639 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/LoggingDetail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/LoggingDetail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contact/LoggingSummary.tpl b/civicrm/templates/CRM/Report/Form/Contact/LoggingSummary.tpl
index de2530b428e9aa2f2d4f06e7ce666e7b289287e5..cdb505be361e1058fe689317d05dd5e2b1f96ab7 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/LoggingSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/LoggingSummary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contact/Relationship.tpl b/civicrm/templates/CRM/Report/Form/Contact/Relationship.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/Relationship.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/Relationship.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contact/Summary.tpl b/civicrm/templates/CRM/Report/Form/Contact/Summary.tpl
index 063fa31e41a7822cb9174db961f2765b88c4f8c4..63dd786cce0dbc61e4310e2385dd28a10f767e3a 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Bookkeeping.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Bookkeeping.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Bookkeeping.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Bookkeeping.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/DeferredRevenue.tpl b/civicrm/templates/CRM/Report/Form/Contribute/DeferredRevenue.tpl
index 5d870a48dacf571aa5ab3c4a4b03de0cf210d37f..f14a30642a6b84e7fa545541dc6649a73ca2c734 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/DeferredRevenue.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/DeferredRevenue.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Detail.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Detail.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Detail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/History.tpl b/civicrm/templates/CRM/Report/Form/Contribute/History.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/History.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/History.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/HouseholdSummary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/HouseholdSummary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/HouseholdSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/HouseholdSummary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/LoggingDetail.tpl b/civicrm/templates/CRM/Report/Form/Contribute/LoggingDetail.tpl
index de408e8070201716435944a2286f2258f94b006f..e34abdbc791505f988e815e29a70e710f20e4639 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/LoggingDetail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/LoggingDetail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/LoggingSummary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/LoggingSummary.tpl
index de2530b428e9aa2f2d4f06e7ce666e7b289287e5..cdb505be361e1058fe689317d05dd5e2b1f96ab7 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/LoggingSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/LoggingSummary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Lybunt.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Lybunt.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Lybunt.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Lybunt.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/OrganizationSummary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/OrganizationSummary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/OrganizationSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/OrganizationSummary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/PCP.tpl b/civicrm/templates/CRM/Report/Form/Contribute/PCP.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/PCP.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/PCP.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/RecurSummary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/RecurSummary.tpl
index 5ad91b1ff3c0a57364885ba1dcbe68e8bb89dcb3..d02ef2dc75df9743d5700d6dec87ebed8ab85c63 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/RecurSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/RecurSummary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Repeat.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Repeat.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Repeat.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Repeat.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/SoftCredit.tpl b/civicrm/templates/CRM/Report/Form/Contribute/SoftCredit.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/SoftCredit.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/SoftCredit.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Summary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Summary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Sybunt.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Sybunt.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Sybunt.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Sybunt.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/TopDonor.tpl b/civicrm/templates/CRM/Report/Form/Contribute/TopDonor.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/TopDonor.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/TopDonor.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Criteria.tpl b/civicrm/templates/CRM/Report/Form/Criteria.tpl
index 62b52d20a03793b3b33edaed7e8ca575f5b1eab4..2ddf7b241b8424c1641a43ee01427c47a3cad018 100644
--- a/civicrm/templates/CRM/Report/Form/Criteria.tpl
+++ b/civicrm/templates/CRM/Report/Form/Criteria.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/ErrorMessage.tpl b/civicrm/templates/CRM/Report/Form/ErrorMessage.tpl
index e38b674358a35d14e1d6d7678c72b5783ff278ae..65bc147a85d33d41074221dd67683cea0e480c74 100644
--- a/civicrm/templates/CRM/Report/Form/ErrorMessage.tpl
+++ b/civicrm/templates/CRM/Report/Form/ErrorMessage.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Event/Income.tpl b/civicrm/templates/CRM/Report/Form/Event/Income.tpl
index c8a15b53dd9606c68a2c583d019b6921e4f4f936..d968a78b43d114dd62397b9320e1970f4b2a0fa3 100644
--- a/civicrm/templates/CRM/Report/Form/Event/Income.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/Income.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Event/IncomeCountSummary.tpl b/civicrm/templates/CRM/Report/Form/Event/IncomeCountSummary.tpl
index 262ab5f6ea107d40c2fd8c58c94ecfdbf2817c89..4d69f463f8acb7ceb17f8f0e6b9db528d8909f2f 100644
--- a/civicrm/templates/CRM/Report/Form/Event/IncomeCountSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/IncomeCountSummary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Event/ParticipantListCount.tpl b/civicrm/templates/CRM/Report/Form/Event/ParticipantListCount.tpl
index 262ab5f6ea107d40c2fd8c58c94ecfdbf2817c89..4d69f463f8acb7ceb17f8f0e6b9db528d8909f2f 100644
--- a/civicrm/templates/CRM/Report/Form/Event/ParticipantListCount.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/ParticipantListCount.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Event/ParticipantListing.tpl b/civicrm/templates/CRM/Report/Form/Event/ParticipantListing.tpl
index 063fa31e41a7822cb9174db961f2765b88c4f8c4..63dd786cce0dbc61e4310e2385dd28a10f767e3a 100644
--- a/civicrm/templates/CRM/Report/Form/Event/ParticipantListing.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/ParticipantListing.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Event/Summary.tpl b/civicrm/templates/CRM/Report/Form/Event/Summary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Event/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Fields.tpl b/civicrm/templates/CRM/Report/Form/Fields.tpl
index 8528d6ff97268fa9036ecfbe151cc603de92d17b..09b5835ed3f4d59fe6919f86afe80b98e291e7c2 100644
--- a/civicrm/templates/CRM/Report/Form/Fields.tpl
+++ b/civicrm/templates/CRM/Report/Form/Fields.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Grant/Detail.tpl b/civicrm/templates/CRM/Report/Form/Grant/Detail.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Grant/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Grant/Detail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Grant/Statistics.tpl b/civicrm/templates/CRM/Report/Form/Grant/Statistics.tpl
index d6d5bf0c58d8d668f3b3cdd5ac44e76334cfa1c7..1f8692e9dbd7c1dfc2ea18f079ed68447ad5c21c 100644
--- a/civicrm/templates/CRM/Report/Form/Grant/Statistics.tpl
+++ b/civicrm/templates/CRM/Report/Form/Grant/Statistics.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Layout/Graph.tpl b/civicrm/templates/CRM/Report/Form/Layout/Graph.tpl
index ec59ff507aee6af66d13ed22a83f92557f100730..d1b0286c8abb4a286e34f8ba6a3d035b7d211254 100644
--- a/civicrm/templates/CRM/Report/Form/Layout/Graph.tpl
+++ b/civicrm/templates/CRM/Report/Form/Layout/Graph.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Layout/Overlay.tpl b/civicrm/templates/CRM/Report/Form/Layout/Overlay.tpl
index 19ab0189b485a332c6afbc64ca3f403521006239..6dda693c7bb48daca166bc0288e6f33a942b9075 100644
--- a/civicrm/templates/CRM/Report/Form/Layout/Overlay.tpl
+++ b/civicrm/templates/CRM/Report/Form/Layout/Overlay.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Layout/Table.tpl b/civicrm/templates/CRM/Report/Form/Layout/Table.tpl
index 52a2ae5cf77a0d4779d201f029e18c5d3e2518d0..1c6d15fdcdc757777d41429c5411f3adc6090f50 100644
--- a/civicrm/templates/CRM/Report/Form/Layout/Table.tpl
+++ b/civicrm/templates/CRM/Report/Form/Layout/Table.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Bounce.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Bounce.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Bounce.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Bounce.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Clicks.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Clicks.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Clicks.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Clicks.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Detail.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Detail.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Detail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Opened.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Opened.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Opened.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Opened.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Summary.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Summary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Member/ContributionDetail.tpl b/civicrm/templates/CRM/Report/Form/Member/ContributionDetail.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Member/ContributionDetail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Member/ContributionDetail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Member/Detail.tpl b/civicrm/templates/CRM/Report/Form/Member/Detail.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Member/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Member/Detail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Member/Lapse.tpl b/civicrm/templates/CRM/Report/Form/Member/Lapse.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Member/Lapse.tpl
+++ b/civicrm/templates/CRM/Report/Form/Member/Lapse.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Member/Summary.tpl b/civicrm/templates/CRM/Report/Form/Member/Summary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Member/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Member/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Membership/Summary.tpl b/civicrm/templates/CRM/Report/Form/Membership/Summary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Membership/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Membership/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Pledge/Detail.tpl b/civicrm/templates/CRM/Report/Form/Pledge/Detail.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Pledge/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Pledge/Detail.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Pledge/Pbnp.tpl b/civicrm/templates/CRM/Report/Form/Pledge/Pbnp.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Pledge/Pbnp.tpl
+++ b/civicrm/templates/CRM/Report/Form/Pledge/Pbnp.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Pledge/Summary.tpl b/civicrm/templates/CRM/Report/Form/Pledge/Summary.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Pledge/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Pledge/Summary.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Register.tpl b/civicrm/templates/CRM/Report/Form/Register.tpl
index 59d503416ab3584f54fca112de112cb1e85fea96..87a3f69944701fd9b15fdc8665b33d60dc00763e 100644
--- a/civicrm/templates/CRM/Report/Form/Register.tpl
+++ b/civicrm/templates/CRM/Report/Form/Register.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Statistics.tpl b/civicrm/templates/CRM/Report/Form/Statistics.tpl
index 5dc7ee43d50e658e4bf4a45089da901b6cc39f5a..86359c15cde213720f2f076686bb97a538aec4a5 100644
--- a/civicrm/templates/CRM/Report/Form/Statistics.tpl
+++ b/civicrm/templates/CRM/Report/Form/Statistics.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl b/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl
index e0819a79a0e38bb5afbc39f864093e17fce25dbe..01b50cc1049265d2382c90aeb7b56612661e3bcc 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl b/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl
index 4177f06764470d86ab0a8f3c1a23ffbd857257d7..c349e2ef17901e6a943543a9b13f6a58317edf7e 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/GroupBy.tpl b/civicrm/templates/CRM/Report/Form/Tabs/GroupBy.tpl
index 9d7c6aa1de855f0e795a37f40dd5edc78aa84b99..dfffd671fdc8e619253f2e3eac9d770ffe922a48 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/GroupBy.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/GroupBy.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/Instance.tpl b/civicrm/templates/CRM/Report/Form/Tabs/Instance.tpl
index 02dcae650a51b62289cca56791cd490094101db7..d08ab2e66dd84ae7cb2a05794d54a08d3cf04095 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/Instance.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/Instance.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/OrderBy.tpl b/civicrm/templates/CRM/Report/Form/Tabs/OrderBy.tpl
index fef2834d432d3cd233694b028ccbebf202f0114a..1877e4e2e958a2db5d4db91519194121b45e527b 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/OrderBy.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/OrderBy.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/ReportOptions.tpl b/civicrm/templates/CRM/Report/Form/Tabs/ReportOptions.tpl
index 0c76f5acffcc8ac4459b444532a394dd68045cc2..de1115d607cc6444ccee20737324edafcc2f53af 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/ReportOptions.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/ReportOptions.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
-| CiviCRM version 4.7 |
+| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/Settings.hlp b/civicrm/templates/CRM/Report/Form/Tabs/Settings.hlp
index 21d57913c834c3ccc7dfc438fc40f12e33f34af0..4a170cb72930775d24d93c8338818cf07b3b64d1 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/Settings.hlp
+++ b/civicrm/templates/CRM/Report/Form/Tabs/Settings.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Form/Walklist/Walklist.tpl b/civicrm/templates/CRM/Report/Form/Walklist/Walklist.tpl
index 21b6461e95f5827297fe76c5b376b5ded2eabff2..0c9270cc74268ea8e20e85adc89fad7888461ee4 100644
--- a/civicrm/templates/CRM/Report/Form/Walklist/Walklist.tpl
+++ b/civicrm/templates/CRM/Report/Form/Walklist/Walklist.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Page/InstanceList.tpl b/civicrm/templates/CRM/Report/Page/InstanceList.tpl
index 19e6919f9f11cd4cd3d81c287deafe55fb89c299..3fd843d4fbf995ec87788b04b300a3800bf496b9 100644
--- a/civicrm/templates/CRM/Report/Page/InstanceList.tpl
+++ b/civicrm/templates/CRM/Report/Page/InstanceList.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Page/Options.tpl b/civicrm/templates/CRM/Report/Page/Options.tpl
index b7035f21daf52db2b9e6dcb02a6bf6fae8f028af..6a704ab268d80149bf22c7e656b7d847911887c0 100644
--- a/civicrm/templates/CRM/Report/Page/Options.tpl
+++ b/civicrm/templates/CRM/Report/Page/Options.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Report/Page/TemplateList.tpl b/civicrm/templates/CRM/Report/Page/TemplateList.tpl
index 93c4e857d2495f05366ce464996d99eebcecec0e..523d166c8d5f8517e8f6af78ecee48e6d51f050d 100644
--- a/civicrm/templates/CRM/Report/Page/TemplateList.tpl
+++ b/civicrm/templates/CRM/Report/Page/TemplateList.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/SMS/Form/Group.hlp b/civicrm/templates/CRM/SMS/Form/Group.hlp
index cbbf5eee1d5c7f17e2b7cbe4c682794299b3632d..7ed2d9b7576e1baf3081f66eb960919fe55cc8e6 100644
--- a/civicrm/templates/CRM/SMS/Form/Group.hlp
+++ b/civicrm/templates/CRM/SMS/Form/Group.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/SMS/Form/Group.tpl b/civicrm/templates/CRM/SMS/Form/Group.tpl
index 0635001612fa2da633c653e033301f99d354eaf9..49e31a12a4c12384e0e747e17b580f34a6675fb4 100644
--- a/civicrm/templates/CRM/SMS/Form/Group.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Group.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/SMS/Form/Provider.tpl b/civicrm/templates/CRM/SMS/Form/Provider.tpl
index 899cccbc295ceb01fa05c12ff0e9dfbb02f4235e..6d057473f8d490a14332101639e53b87742c1690 100644
--- a/civicrm/templates/CRM/SMS/Form/Provider.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Provider.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/SMS/Form/Schedule.hlp b/civicrm/templates/CRM/SMS/Form/Schedule.hlp
index 0a8aacbe32e4301c9e7754d893acfc2600e00ec3..b5ee1f0c862213dbbbcdcaa4b03f9bc9191c55a4 100644
--- a/civicrm/templates/CRM/SMS/Form/Schedule.hlp
+++ b/civicrm/templates/CRM/SMS/Form/Schedule.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/SMS/Form/Schedule.tpl b/civicrm/templates/CRM/SMS/Form/Schedule.tpl
index c96bad1edf4290f8b5ed19e4943914062a55077e..1eb30371b5a920a204f043ba074d5615b151f149 100644
--- a/civicrm/templates/CRM/SMS/Form/Schedule.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Schedule.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/SMS/Form/Task/SMS.tpl b/civicrm/templates/CRM/SMS/Form/Task/SMS.tpl
index a6311fa92c81a6d10edc60d90b426e79c48d6e38..0a923fd46af4079288e831141a5a3e0a8adb5d28 100644
--- a/civicrm/templates/CRM/SMS/Form/Task/SMS.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Task/SMS.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/SMS/Form/Upload.hlp b/civicrm/templates/CRM/SMS/Form/Upload.hlp
index d31aa8ac909418e722bcea2086639a763d77d77a..000e4af09c81cb23a1ca444b454050eab468a402 100644
--- a/civicrm/templates/CRM/SMS/Form/Upload.hlp
+++ b/civicrm/templates/CRM/SMS/Form/Upload.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/SMS/Form/Upload.tpl b/civicrm/templates/CRM/SMS/Form/Upload.tpl
index 9c7d256fb644899f69c8628a5738c97531c37db1..2948330e2d1b17871792aeb27c7b470fc682e798 100644
--- a/civicrm/templates/CRM/SMS/Form/Upload.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Upload.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/SMS/Page/Provider.tpl b/civicrm/templates/CRM/SMS/Page/Provider.tpl
index d5e21bbfe4c736cda9b23cb6be632e6db939768c..f2b369d89d75a00043a49c68a9d13af1e64e87d0 100644
--- a/civicrm/templates/CRM/SMS/Page/Provider.tpl
+++ b/civicrm/templates/CRM/SMS/Page/Provider.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Tag/Form/Edit.tpl b/civicrm/templates/CRM/Tag/Form/Edit.tpl
index ebc709d783411fa9fc0a15b2de1e3dd71842ca6f..001426b0202a57461d604985c78efecf5c2e6b7f 100644
--- a/civicrm/templates/CRM/Tag/Form/Edit.tpl
+++ b/civicrm/templates/CRM/Tag/Form/Edit.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Tag/Form/Merge.tpl b/civicrm/templates/CRM/Tag/Form/Merge.tpl
index 63946037cb55c07ddb1d4c9cc6720d61884b640d..c77fa9dbb70c6270271747f0b04153e70360304f 100644
--- a/civicrm/templates/CRM/Tag/Form/Merge.tpl
+++ b/civicrm/templates/CRM/Tag/Form/Merge.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Tag/Form/Tag.tpl b/civicrm/templates/CRM/Tag/Form/Tag.tpl
index 64f59eec704fad174c485b7706f2e75ed7e4e2f1..c9b3e28f0902de9f3a2c1af304bbb8190eb58c8d 100644
--- a/civicrm/templates/CRM/Tag/Form/Tag.tpl
+++ b/civicrm/templates/CRM/Tag/Form/Tag.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Tag/Form/Tagtree.tpl b/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
index 59dbe96d5976bcc50f57ab2c45ca1f3db22eac35..16a6c9a694e94ac4d0cbe9b2e9f5e1109690a739 100644
--- a/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
+++ b/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Tag/Page/Tag.tpl b/civicrm/templates/CRM/Tag/Page/Tag.tpl
index 9905b2326f48521490089a13f37329ecbb23f94f..142477f6971b1bb03ca26e0857068f6b0e2568f3 100644
--- a/civicrm/templates/CRM/Tag/Page/Tag.tpl
+++ b/civicrm/templates/CRM/Tag/Page/Tag.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl b/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl
index 9188400c520a1c5c80809ffb7047ea58f0b3b7fd..34c1f65ac252fa3c3f4d48cb87288dbcc127d3f7 100644
--- a/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl
+++ b/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/UF/Form/Block.tpl b/civicrm/templates/CRM/UF/Form/Block.tpl
index c91b60391651a30cc22a4e98a3ecb46a829fc595..4d682c1a2ab0db37601886d849491d5afef04c7d 100644
--- a/civicrm/templates/CRM/UF/Form/Block.tpl
+++ b/civicrm/templates/CRM/UF/Form/Block.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/UF/Form/Field.tpl b/civicrm/templates/CRM/UF/Form/Field.tpl
index 53466462f50dafcfd9b2900b828a1a0c66dac473..299dbb50d719638fb72d9c197e4fa71971a11b52 100644
--- a/civicrm/templates/CRM/UF/Form/Field.tpl
+++ b/civicrm/templates/CRM/UF/Form/Field.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/UF/Form/Group.hlp b/civicrm/templates/CRM/UF/Form/Group.hlp
index c2049c444a38990fdfc830c7216c0a05c23e598c..c1f72b76fa65321f23b91a55fae00434450b914a 100644
--- a/civicrm/templates/CRM/UF/Form/Group.hlp
+++ b/civicrm/templates/CRM/UF/Form/Group.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/UF/Form/Group.tpl b/civicrm/templates/CRM/UF/Form/Group.tpl
index 36078989c29ae90d34b3566819fa771bddb46f09..5af929ddc6cdaf4c03bb163a98c68db263b221ce 100644
--- a/civicrm/templates/CRM/UF/Form/Group.tpl
+++ b/civicrm/templates/CRM/UF/Form/Group.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/UF/Form/Preview.tpl b/civicrm/templates/CRM/UF/Form/Preview.tpl
index 7c7b1af18c140afcb1e108b11f0a7e5bb98d70f3..19ef8881c2859262e7ad8946ea4521d0d2d9416d 100644
--- a/civicrm/templates/CRM/UF/Form/Preview.tpl
+++ b/civicrm/templates/CRM/UF/Form/Preview.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/UF/Page/Field.tpl b/civicrm/templates/CRM/UF/Page/Field.tpl
index d513f4744dbf8a487aa97260f9de6c2affe9b836..00fa5810099b5656d2804333665eeccaeca957ec 100644
--- a/civicrm/templates/CRM/UF/Page/Field.tpl
+++ b/civicrm/templates/CRM/UF/Page/Field.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/UF/Page/Group.hlp b/civicrm/templates/CRM/UF/Page/Group.hlp
index 24fb560d00830d3f97adaeb696cdd321e31a4853..c3ccbd41066e7d4c5d14aa6f9e5976450d50841c 100644
--- a/civicrm/templates/CRM/UF/Page/Group.hlp
+++ b/civicrm/templates/CRM/UF/Page/Group.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/UF/Page/Group.tpl b/civicrm/templates/CRM/UF/Page/Group.tpl
index 9186f52164d686c3f2b41fd3f86be0f602a41195..77b5ea655f59d9c7969d31424d29719fc3c1e205 100644
--- a/civicrm/templates/CRM/UF/Page/Group.tpl
+++ b/civicrm/templates/CRM/UF/Page/Group.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Upgrade/Base.tpl b/civicrm/templates/CRM/Upgrade/Base.tpl
index f8ec3ed12b6491c6f8fba422592305e48b3e9495..d4e65ddd361d5634c1a68906b10c2aac94791dfb 100644
--- a/civicrm/templates/CRM/Upgrade/Base.tpl
+++ b/civicrm/templates/CRM/Upgrade/Base.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/Widget/widget.tpl b/civicrm/templates/CRM/Widget/widget.tpl
index 52fc5c6e61f67afd1d23b8dae3f1cf64ccc1af14..c4ecf6541cfd21592bd8375cbb202f39560d4ff6 100644
--- a/civicrm/templates/CRM/Widget/widget.tpl
+++ b/civicrm/templates/CRM/Widget/widget.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/CMSUser.tpl b/civicrm/templates/CRM/common/CMSUser.tpl
index 387db9c772d926fbeca9bd2aee37496b6d6da74d..333205cb23bcc95e2dd8429af79bdd59c38a44df 100644
--- a/civicrm/templates/CRM/common/CMSUser.tpl
+++ b/civicrm/templates/CRM/common/CMSUser.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/ReCAPTCHA.tpl b/civicrm/templates/CRM/common/ReCAPTCHA.tpl
index 06200209e1fbf2ac42800c9cfe019f8d427a9482..7b4a599ed7b5090be144cee90143104b46502116 100644
--- a/civicrm/templates/CRM/common/ReCAPTCHA.tpl
+++ b/civicrm/templates/CRM/common/ReCAPTCHA.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/SectionNav.tpl b/civicrm/templates/CRM/common/SectionNav.tpl
index ec567e0e64fd3ee33b222ed3bb1523464bae890b..3e49cbff5d70860547ecbe98b1fbe0da3b6a97b1 100644
--- a/civicrm/templates/CRM/common/SectionNav.tpl
+++ b/civicrm/templates/CRM/common/SectionNav.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/SocialNetwork.tpl b/civicrm/templates/CRM/common/SocialNetwork.tpl
index 9242953f0d6684c6bebbedf20f5eb39146b7639a..88029fb977b3c008bf76c6934521db01d4b1b50e 100644
--- a/civicrm/templates/CRM/common/SocialNetwork.tpl
+++ b/civicrm/templates/CRM/common/SocialNetwork.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/TabHeader.tpl b/civicrm/templates/CRM/common/TabHeader.tpl
index feb19cd60acdb4c9bd091e22a700e7fcac1bf591..e47906d4cb0d9a95b27cbcd5fec881b358b397a0 100644
--- a/civicrm/templates/CRM/common/TabHeader.tpl
+++ b/civicrm/templates/CRM/common/TabHeader.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/Tagset.tpl b/civicrm/templates/CRM/common/Tagset.tpl
index acda27307c56cd584d2811a5e67d320a6ab03687..84dee956b65b924bd17e71d7b34f261d47f65f7e 100644
--- a/civicrm/templates/CRM/common/Tagset.tpl
+++ b/civicrm/templates/CRM/common/Tagset.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/TrackingFields.tpl b/civicrm/templates/CRM/common/TrackingFields.tpl
index 1e7d86283c6da346030f7125774047434f0fe6dc..65d0c43d36c5b4e1bd64ba01149f780fff37b829 100644
--- a/civicrm/templates/CRM/common/TrackingFields.tpl
+++ b/civicrm/templates/CRM/common/TrackingFields.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/WizardHeader.tpl b/civicrm/templates/CRM/common/WizardHeader.tpl
index 3220b2edf4420c8bbc7627f8c47da67ee915f823..2ed4a73d5ddb8dfab274feecc728811c67382a89 100644
--- a/civicrm/templates/CRM/common/WizardHeader.tpl
+++ b/civicrm/templates/CRM/common/WizardHeader.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/accesskeys.hlp b/civicrm/templates/CRM/common/accesskeys.hlp
index ffcde05a31cf0f9c5d67baafa9e013cdc8739613..e09de153b502ba0eaae4926b996b34c7a4c6dea7 100644
--- a/civicrm/templates/CRM/common/accesskeys.hlp
+++ b/civicrm/templates/CRM/common/accesskeys.hlp
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/accesskeys.tpl b/civicrm/templates/CRM/common/accesskeys.tpl
index db6d61cf0e5a0a06b9844cf9f0f373e961abaa38..508e2fa3d3ad66cf8c06459bd06c014e187f137b 100644
--- a/civicrm/templates/CRM/common/accesskeys.tpl
+++ b/civicrm/templates/CRM/common/accesskeys.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/additionalBlocks.tpl b/civicrm/templates/CRM/common/additionalBlocks.tpl
index 8e3a1faba59173d1e5c9cf36796948a3ea68f6b6..25bd4c92e516b96eca5f5ee6001a58ff153218ae 100644
--- a/civicrm/templates/CRM/common/additionalBlocks.tpl
+++ b/civicrm/templates/CRM/common/additionalBlocks.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/backdrop.tpl b/civicrm/templates/CRM/common/backdrop.tpl
index d078faa0e39cc5948c6b7afa6972f94a992007ed..ecb2906e0ff3497a0b98250cc964cbf452d06c1f 100644
--- a/civicrm/templates/CRM/common/backdrop.tpl
+++ b/civicrm/templates/CRM/common/backdrop.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/batchCopy.tpl b/civicrm/templates/CRM/common/batchCopy.tpl
index b4476dd8a3428109b7409042fd4776d9fea0386a..342eb5f7285f2d4ea678bcd747c35b9c53cdec45 100644
--- a/civicrm/templates/CRM/common/batchCopy.tpl
+++ b/civicrm/templates/CRM/common/batchCopy.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/checkUsernameAvailable.tpl b/civicrm/templates/CRM/common/checkUsernameAvailable.tpl
index 8da8ecdf1cc068b87d9278fd8c966f537c627db2..d7f8580fb2233dda0300baadad6614848bec2e9c 100644
--- a/civicrm/templates/CRM/common/checkUsernameAvailable.tpl
+++ b/civicrm/templates/CRM/common/checkUsernameAvailable.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/civicrm.settings.php.template b/civicrm/templates/CRM/common/civicrm.settings.php.template
index bb575170a44a5afbdfee188d5a967cc557e2b4a2..ae4d6e269fd86876a2bdfdf6a02de88816fe9da9 100644
--- a/civicrm/templates/CRM/common/civicrm.settings.php.template
+++ b/civicrm/templates/CRM/common/civicrm.settings.php.template
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -304,6 +304,13 @@ if (!defined('CIVICRM_MAIL_SMARTY')) {
// define( 'CIVICRM_MAIL_LOG', '%%templateCompileDir%%/mail.log');
// }
+/**
+ * This setting will only work if CIVICRM_MAIL_LOG is defined. Mail will be logged and then sent.
+ */
+//if (!defined('CIVICRM_MAIL_LOG_AND_SEND')) {
+// define( 'CIVICRM_MAIL_LOG_AND_SEND', 1);
+//}
+
if (!defined('CIVICRM_DOMAIN_ID')) {
define( 'CIVICRM_DOMAIN_ID', 1);
diff --git a/civicrm/templates/CRM/common/contactFooter.tpl b/civicrm/templates/CRM/common/contactFooter.tpl
index c8f5d9560c63724167a28818377d42af8585aa83..5791d381beccfed1412250d74e01cb37b8878b62 100644
--- a/civicrm/templates/CRM/common/contactFooter.tpl
+++ b/civicrm/templates/CRM/common/contactFooter.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/customData.tpl b/civicrm/templates/CRM/common/customData.tpl
index 81be93229d976bf3087299ae434899217cf958f3..bde7b87b910dbbe8e9d7baf577e50e4c3ffc4161 100644
--- a/civicrm/templates/CRM/common/customData.tpl
+++ b/civicrm/templates/CRM/common/customData.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/dashboard.tpl b/civicrm/templates/CRM/common/dashboard.tpl
index b1d91532c1e1431318657211e580f774c67b3a34..60e41a450efd0d076fa5da066f8ae6b4aa732289 100644
--- a/civicrm/templates/CRM/common/dashboard.tpl
+++ b/civicrm/templates/CRM/common/dashboard.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/debug.tpl b/civicrm/templates/CRM/common/debug.tpl
index 0af73fe70959085922ed92b676428b01e0325402..1a7679c5d603d648de0de6895b15b0f70560466b 100644
--- a/civicrm/templates/CRM/common/debug.tpl
+++ b/civicrm/templates/CRM/common/debug.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/deferredFinancialType.tpl b/civicrm/templates/CRM/common/deferredFinancialType.tpl
index 53836eb1018bc99bfef4db5f4728633f3c3dd55b..36f841ed177e29661169e774187592ec7127e114 100644
--- a/civicrm/templates/CRM/common/deferredFinancialType.tpl
+++ b/civicrm/templates/CRM/common/deferredFinancialType.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/displaySearchCriteria.tpl b/civicrm/templates/CRM/common/displaySearchCriteria.tpl
index 0e4daabd86af3fb160def9247e220713d6aaeddc..94b0b6c8cf573604f3dd3bdf294abb58e359bf12 100644
--- a/civicrm/templates/CRM/common/displaySearchCriteria.tpl
+++ b/civicrm/templates/CRM/common/displaySearchCriteria.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/drupal.tpl b/civicrm/templates/CRM/common/drupal.tpl
index d078faa0e39cc5948c6b7afa6972f94a992007ed..ecb2906e0ff3497a0b98250cc964cbf452d06c1f 100644
--- a/civicrm/templates/CRM/common/drupal.tpl
+++ b/civicrm/templates/CRM/common/drupal.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/drupal6.tpl b/civicrm/templates/CRM/common/drupal6.tpl
index ba75cd3ddc6f62cae16dc2de0e3b2bfb642b03ab..2a424882e55cad743ae6ff7986db76ccc233c55f 100644
--- a/civicrm/templates/CRM/common/drupal6.tpl
+++ b/civicrm/templates/CRM/common/drupal6.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/drupal8.tpl b/civicrm/templates/CRM/common/drupal8.tpl
index d078faa0e39cc5948c6b7afa6972f94a992007ed..ecb2906e0ff3497a0b98250cc964cbf452d06c1f 100644
--- a/civicrm/templates/CRM/common/drupal8.tpl
+++ b/civicrm/templates/CRM/common/drupal8.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/enableDisableApi.tpl b/civicrm/templates/CRM/common/enableDisableApi.tpl
index ed9f284247a5b5984fc30f11d60e774779be6473..7794f20bd3b44e4ac872c3e2031b5afec90fa5c1 100644
--- a/civicrm/templates/CRM/common/enableDisableApi.tpl
+++ b/civicrm/templates/CRM/common/enableDisableApi.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -36,7 +36,13 @@
}
function refresh() {
- $a.trigger('crmPopupFormSuccess');
+ // the opposite of the current status based on row class
+ var newStatus = $row.hasClass('disabled');
+ $a.trigger('crmPopupFormSuccess', {
+ 'entity': info.entity,
+ 'id': info.id,
+ 'enabled': newStatus
+ });
CRM.refreshParent($row);
}
diff --git a/civicrm/templates/CRM/common/fatal.tpl b/civicrm/templates/CRM/common/fatal.tpl
index 7a801cbcfb2dd3be5a4efc26ee8a4fb0b4d6c10e..4b59d5573001e87b38c083ce850ccc0ff1fc0646 100644
--- a/civicrm/templates/CRM/common/fatal.tpl
+++ b/civicrm/templates/CRM/common/fatal.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/footer.tpl b/civicrm/templates/CRM/common/footer.tpl
index d9ddb0d2de6c56f5b5b56c9a5e8c555358f8d5c3..74d5c60a0f264bab6164eb8f9d8366bada36309d 100644
--- a/civicrm/templates/CRM/common/footer.tpl
+++ b/civicrm/templates/CRM/common/footer.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/formButtons.tpl b/civicrm/templates/CRM/common/formButtons.tpl
index 54291e541c8572249379af82817af4291351a957..91ed13bfe71a4b6572299f1e1e225d9bf0446156 100644
--- a/civicrm/templates/CRM/common/formButtons.tpl
+++ b/civicrm/templates/CRM/common/formButtons.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/highLightImport.tpl b/civicrm/templates/CRM/common/highLightImport.tpl
index 6856e8f3e1700bce4ad042af5cb4e7e52f48e3bf..b742c33975c0308c83c09004009c569c26162154 100644
--- a/civicrm/templates/CRM/common/highLightImport.tpl
+++ b/civicrm/templates/CRM/common/highLightImport.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/importProgress.tpl b/civicrm/templates/CRM/common/importProgress.tpl
index c3ab07ad9e1ad6568bc557853dd7b40b01dc86bb..7689cd70186a0f135dcd4064f2f4f5c630c6a389 100644
--- a/civicrm/templates/CRM/common/importProgress.tpl
+++ b/civicrm/templates/CRM/common/importProgress.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/info.tpl b/civicrm/templates/CRM/common/info.tpl
index 92e3bd1e60f3d315f8748c6847bd47acb30ce332..b74b42693d154ce391feac7b3218753b3bc6beb5 100644
--- a/civicrm/templates/CRM/common/info.tpl
+++ b/civicrm/templates/CRM/common/info.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/jcalendar.tpl b/civicrm/templates/CRM/common/jcalendar.tpl
index 60ed995491a61de2e4b5c818749033e13a5e04a6..14128ac33e295eaa9997ebd712dcf084cf3d92a3 100644
--- a/civicrm/templates/CRM/common/jcalendar.tpl
+++ b/civicrm/templates/CRM/common/jcalendar.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/joomla.tpl b/civicrm/templates/CRM/common/joomla.tpl
index 41fb3d9151552f08787e54ad05a380d0ebfa160e..6ef2eb28db8723b9cd1250785154ff32550d343c 100644
--- a/civicrm/templates/CRM/common/joomla.tpl
+++ b/civicrm/templates/CRM/common/joomla.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/jsortable.tpl b/civicrm/templates/CRM/common/jsortable.tpl
index f885333f939902da630a48d036cf155e23b9594e..83fc9f7a5683f00df6699e5d020a31c5089e3040 100644
--- a/civicrm/templates/CRM/common/jsortable.tpl
+++ b/civicrm/templates/CRM/common/jsortable.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/l10n.js.tpl b/civicrm/templates/CRM/common/l10n.js.tpl
index 9663e33f61a942c0fd57c17baf35ac6d1d8357a1..cacc15e1b9006abca4cda5746d50d3b09ba90a2e 100644
--- a/civicrm/templates/CRM/common/l10n.js.tpl
+++ b/civicrm/templates/CRM/common/l10n.js.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/localNav.tpl b/civicrm/templates/CRM/common/localNav.tpl
index 11f082cd0b448956f561a59f2880ee0f23a42b4b..eb6998632bc9aacacab025a78a05407cccdfe858 100644
--- a/civicrm/templates/CRM/common/localNav.tpl
+++ b/civicrm/templates/CRM/common/localNav.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/logButton.tpl b/civicrm/templates/CRM/common/logButton.tpl
index 518910147845d594d5fd07f0a356d05d29dd8659..87a628d7f1340659c9c3c4ac2362e53b861fb191 100644
--- a/civicrm/templates/CRM/common/logButton.tpl
+++ b/civicrm/templates/CRM/common/logButton.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/navigation.js.tpl b/civicrm/templates/CRM/common/navigation.js.tpl
index ba634bd8c5870fb194f4e12dd837a55f63dbbe25..98783c49a101927e7670937d2e9b8c66981e2cec 100644
--- a/civicrm/templates/CRM/common/navigation.js.tpl
+++ b/civicrm/templates/CRM/common/navigation.js.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/openFlashChart.tpl b/civicrm/templates/CRM/common/openFlashChart.tpl
index 5661bcbb8f80796448d3c444d1c9e7e8d1c51c74..900d2ac907a0d1a08622078d9c1ab4e6ed2e3def 100644
--- a/civicrm/templates/CRM/common/openFlashChart.tpl
+++ b/civicrm/templates/CRM/common/openFlashChart.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/pager.tpl b/civicrm/templates/CRM/common/pager.tpl
index 63a63b19bc286f29cbd666ea6644f49eac433a71..a56f75f70174ea14b871322b6cee3ef08ee8a5f5 100644
--- a/civicrm/templates/CRM/common/pager.tpl
+++ b/civicrm/templates/CRM/common/pager.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/pagerAToZ.tpl b/civicrm/templates/CRM/common/pagerAToZ.tpl
index d725ccc261c8714eb817b1528ad8b9652f385183..5ae7652e4f60f6c5819f7d590f71b6ecb53f4598 100644
--- a/civicrm/templates/CRM/common/pagerAToZ.tpl
+++ b/civicrm/templates/CRM/common/pagerAToZ.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/paymentBlock.tpl b/civicrm/templates/CRM/common/paymentBlock.tpl
index 53765c02af73017e0b762fdb796575ff44c541d7..57cc8c3ae6b4416bc412e0af06add98686ee4416 100644
--- a/civicrm/templates/CRM/common/paymentBlock.tpl
+++ b/civicrm/templates/CRM/common/paymentBlock.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/print.tpl b/civicrm/templates/CRM/common/print.tpl
index 8d63a94ad068c762acd2c49dfc4d239cf5aa71a1..75cbf321abf56fb4a4dd382530cea3f73fffc2e4 100644
--- a/civicrm/templates/CRM/common/print.tpl
+++ b/civicrm/templates/CRM/common/print.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/printBody.tpl b/civicrm/templates/CRM/common/printBody.tpl
index c406a9ec0e99f7f3e011617ad4cd4a2af8318c76..8eb65657bb2180b401686fc483f2cf444a6f1633 100644
--- a/civicrm/templates/CRM/common/printBody.tpl
+++ b/civicrm/templates/CRM/common/printBody.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/publicFooter.tpl b/civicrm/templates/CRM/common/publicFooter.tpl
index 43b771e62e2721758ce5b1d05bd591e8b3f3adc2..b55d6c0ea6f7fee580361e44c0d74889e2cf6f78 100644
--- a/civicrm/templates/CRM/common/publicFooter.tpl
+++ b/civicrm/templates/CRM/common/publicFooter.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/recentlyViewed.tpl b/civicrm/templates/CRM/common/recentlyViewed.tpl
index 30eba6ca2cc4ec66765467a017552fecdf6d3259..d74596c9d35ef0f3e87c19334f2e385b48e7fa61 100644
--- a/civicrm/templates/CRM/common/recentlyViewed.tpl
+++ b/civicrm/templates/CRM/common/recentlyViewed.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/searchResultTasks.tpl b/civicrm/templates/CRM/common/searchResultTasks.tpl
index 09bbde49435dc173d7585b09505bbb5890755f83..f21dbbf2cb501231cad677c92172e1a919de8c28 100644
--- a/civicrm/templates/CRM/common/searchResultTasks.tpl
+++ b/civicrm/templates/CRM/common/searchResultTasks.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/showHide.tpl b/civicrm/templates/CRM/common/showHide.tpl
index df878e3ce3d35132488031d0d633b6a6f678b150..97129438cea12ce9c25b48018ed7a17f197b0cba 100644
--- a/civicrm/templates/CRM/common/showHide.tpl
+++ b/civicrm/templates/CRM/common/showHide.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/showHideByFieldValue.tpl b/civicrm/templates/CRM/common/showHideByFieldValue.tpl
index 62dd871d815e29527424d6043108ea7e5b97aad3..fbd3948e70398abdf2907495badeb4b67cae809a 100644
--- a/civicrm/templates/CRM/common/showHideByFieldValue.tpl
+++ b/civicrm/templates/CRM/common/showHideByFieldValue.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/snippet.tpl b/civicrm/templates/CRM/common/snippet.tpl
index f3581801cc0a5167dd02d0b5c506d5a89c8a82a8..9145a36ee2bc031fabe686d61b74a4a9511a9ff5 100644
--- a/civicrm/templates/CRM/common/snippet.tpl
+++ b/civicrm/templates/CRM/common/snippet.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/status.tpl b/civicrm/templates/CRM/common/status.tpl
index 43ea47210bc1b7851ce431bf06f52a832c026dc2..6b25712a114c7bc4daae4684d51f2dd6f764481c 100644
--- a/civicrm/templates/CRM/common/status.tpl
+++ b/civicrm/templates/CRM/common/status.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/success.tpl b/civicrm/templates/CRM/common/success.tpl
index 697d022af786d67c43bb909fa41074d7e5faebf2..fa2d73ad1b37ce246fcfac788f2f9f3f42bd9bdb 100644
--- a/civicrm/templates/CRM/common/success.tpl
+++ b/civicrm/templates/CRM/common/success.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/unittests.tpl b/civicrm/templates/CRM/common/unittests.tpl
index d078faa0e39cc5948c6b7afa6972f94a992007ed..ecb2906e0ff3497a0b98250cc964cbf452d06c1f 100644
--- a/civicrm/templates/CRM/common/unittests.tpl
+++ b/civicrm/templates/CRM/common/unittests.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/upgradeCleanup.tpl b/civicrm/templates/CRM/common/upgradeCleanup.tpl
index c47599fe50641a51aac0af3352861eb856ed02e2..f7dbe5f8a26cb0f84e047e66344f5d8e4f3a6fe7 100644
--- a/civicrm/templates/CRM/common/upgradeCleanup.tpl
+++ b/civicrm/templates/CRM/common/upgradeCleanup.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/templates/CRM/common/wordpress.tpl b/civicrm/templates/CRM/common/wordpress.tpl
index aa80596bb93eb8847396c17cb31658e974e0519c..c63582df97d547f3b5e5f2f8900edd830c3b2fa0 100644
--- a/civicrm/templates/CRM/common/wordpress.tpl
+++ b/civicrm/templates/CRM/common/wordpress.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 78e7d0eda5989b97f24ccec852decfae00cbde54..72a6b9c47e188d6c0dc599be1ba434d224b758bf 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit5678b6d8b527472271fa54683a38b293::getLoader();
+return ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index fe03cbb2ad6fa84c9124dbefcbf740344e16538c..4c090a43036adb4db1a9ec2e816b147aef242fdf 100644
--- a/civicrm/vendor/composer/autoload_real.php
+++ b/civicrm/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit5678b6d8b527472271fa54683a38b293
+class ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit5678b6d8b527472271fa54683a38b293
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit5678b6d8b527472271fa54683a38b293', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit5678b6d8b527472271fa54683a38b293', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit5678b6d8b527472271fa54683a38b293
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit5678b6d8b527472271fa54683a38b293::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit7a5db276e4436c0b9224956af7d54797::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit5678b6d8b527472271fa54683a38b293
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit5678b6d8b527472271fa54683a38b293::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire5678b6d8b527472271fa54683a38b293($fileIdentifier, $file);
+ composerRequire7a5db276e4436c0b9224956af7d54797($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire5678b6d8b527472271fa54683a38b293($fileIdentifier, $file)
+function composerRequire7a5db276e4436c0b9224956af7d54797($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index 9e0f3c090583e7e74fb8d2d1b8df403e7aa7191a..867a7643512303fa22a9f49a0296df40e03b2d15 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit5678b6d8b527472271fa54683a38b293
+class ComposerStaticInit7a5db276e4436c0b9224956af7d54797
{
public static $files = array (
'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
@@ -371,10 +371,10 @@ class ComposerStaticInit5678b6d8b527472271fa54683a38b293
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit5678b6d8b527472271fa54683a38b293::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit5678b6d8b527472271fa54683a38b293::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit5678b6d8b527472271fa54683a38b293::$prefixesPsr0;
- $loader->classMap = ComposerStaticInit5678b6d8b527472271fa54683a38b293::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$prefixesPsr0;
+ $loader->classMap = ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/schema/Contribute/ContributionSoft.xml b/civicrm/xml/schema/Contribute/ContributionSoft.xml
index cf9d3f384eae0fdc502c4a5de49e4fca8549e365..f1ddfc413ad212e20542844f32edf3fb86648768 100644
--- a/civicrm/xml/schema/Contribute/ContributionSoft.xml
+++ b/civicrm/xml/schema/Contribute/ContributionSoft.xml
@@ -129,6 +129,9 @@
<type>varchar</type>
<title>Soft Contribution PCP Note</title>
<length>255</length>
+ <html>
+ <type>TextArea</type>
+ </html>
<default>NULL</default>
<add>2.2</add>
</field>
diff --git a/civicrm/xml/schema/Core/ActionSchedule.xml b/civicrm/xml/schema/Core/ActionSchedule.xml
index 98d8c55dcb9dde6161ce88cbef183139c8fad343..4c7d78c219bf52e993cba838450bc3b81ef53c36 100644
--- a/civicrm/xml/schema/Core/ActionSchedule.xml
+++ b/civicrm/xml/schema/Core/ActionSchedule.xml
@@ -64,6 +64,7 @@
<name>start_action_offset</name>
<type>int unsigned</type>
<comment>Reminder Interval.</comment>
+ <default>0</default>
<add>3.4</add>
</field>
<field>
@@ -116,6 +117,7 @@
<field>
<name>repetition_frequency_interval</name>
<type>int unsigned</type>
+ <default>0</default>
<comment>Time interval for repeating the reminder.</comment>
<add>3.4</add>
</field>
@@ -137,6 +139,7 @@
<type>int unsigned</type>
<comment>Time interval till repeating the reminder.</comment>
<add>3.4</add>
+ <default>0</default>
</field>
<field>
<name>end_action</name>
diff --git a/civicrm/xml/schema/Event/Participant.xml b/civicrm/xml/schema/Event/Participant.xml
index 5d341014f22ee4dd94b7483b5e7ae85659100ce0..30f9a31720685fb6c8cb221071e1b711f737af60 100644
--- a/civicrm/xml/schema/Event/Participant.xml
+++ b/civicrm/xml/schema/Event/Participant.xml
@@ -135,6 +135,9 @@
<type>varchar</type>
<length>128</length>
<comment>Source of this event registration.</comment>
+ <html>
+ <type>Text</type>
+ </html>
<add>1.7</add>
</field>
<field>
diff --git a/civicrm/xml/templates/civicrm_acl.tpl b/civicrm/xml/templates/civicrm_acl.tpl
index 9ee1d39568d346c573accc94d30f2215378eefdc..66e8e6cd83a8e6bb2fe78dc03c404d1f3efd571b 100644
--- a/civicrm/xml/templates/civicrm_acl.tpl
+++ b/civicrm/xml/templates/civicrm_acl.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/civicrm_country.tpl b/civicrm/xml/templates/civicrm_country.tpl
index 5a1779cfb829dbd614c4355658d8debdbf44ea07..060d9c79f28be83580f743081552e927d557b8cb 100644
--- a/civicrm/xml/templates/civicrm_country.tpl
+++ b/civicrm/xml/templates/civicrm_country.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/civicrm_currency.tpl b/civicrm/xml/templates/civicrm_currency.tpl
index 09d0c033f912f2ef95f765aae56d247211cffd3c..bddd8aef03e6cb5df5b4742923bf157eff3b2106 100644
--- a/civicrm/xml/templates/civicrm_currency.tpl
+++ b/civicrm/xml/templates/civicrm_currency.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/civicrm_data.tpl b/civicrm/xml/templates/civicrm_data.tpl
index fd913a1050c9470060f7e174bbe4d87e8b40eb65..d101300576df8f1dc49ba5fac9ac2b21b522ee65 100644
--- a/civicrm/xml/templates/civicrm_data.tpl
+++ b/civicrm/xml/templates/civicrm_data.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/civicrm_msg_template.tpl b/civicrm/xml/templates/civicrm_msg_template.tpl
index a62d10024541df4e5759c152a4876c42ba662c72..d8a4f6606fd06f20151be9365d2d9e6528a106b7 100644
--- a/civicrm/xml/templates/civicrm_msg_template.tpl
+++ b/civicrm/xml/templates/civicrm_msg_template.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/civicrm_navigation.tpl b/civicrm/xml/templates/civicrm_navigation.tpl
index d8992089116f2c09f54919e1db4d654b013ce6b1..897c8213b04e896b9dd7e4425d22b67cc503f625 100644
--- a/civicrm/xml/templates/civicrm_navigation.tpl
+++ b/civicrm/xml/templates/civicrm_navigation.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/civicrm_sample.tpl b/civicrm/xml/templates/civicrm_sample.tpl
index 50bdcdb81b289ab45f34d55570fc8f8c8bcd75ba..dad2caec7f35910e5f21bad78e41a616fbbd1472 100644
--- a/civicrm/xml/templates/civicrm_sample.tpl
+++ b/civicrm/xml/templates/civicrm_sample.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/civicrm_state_province.tpl b/civicrm/xml/templates/civicrm_state_province.tpl
index f9b95d467374e03deea5c73f8d476c8811af9bed..6a56b960c6e5a89c5f340da94a96ae4f1d3031e8 100644
--- a/civicrm/xml/templates/civicrm_state_province.tpl
+++ b/civicrm/xml/templates/civicrm_state_province.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/drop.tpl b/civicrm/xml/templates/drop.tpl
index c851acc3f719b903fb6db7f6c06b9e464d451e7e..deb61a7f297fd473227e58e12e5babaeed88abd3 100644
--- a/civicrm/xml/templates/drop.tpl
+++ b/civicrm/xml/templates/drop.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/listAll.tpl b/civicrm/xml/templates/listAll.tpl
index 32d6313ec298a47efe0e0fe2ba6969431832afed..33fa586a0ebfb607ce821dc9a82f7b565fe6a6ea 100644
--- a/civicrm/xml/templates/listAll.tpl
+++ b/civicrm/xml/templates/listAll.tpl
@@ -1,39 +1,12 @@
<?php
-
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018 |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM. |
- | |
- | CiviCRM is free software; you can copy, modify, and distribute it |
- | under the terms of the GNU Affero General Public License |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
- | |
- | CiviCRM is distributed in the hope that it will be useful, but |
- | WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
- | See the GNU Affero General Public License for more details. |
- | |
- | You should have received a copy of the GNU Affero General Public |
- | License and the CiviCRM Licensing Exception along |
- | with this program; if not, contact CiviCRM LLC |
- | at info[AT]civicrm[DOT]org. If you have questions about the |
- | GNU Affero General Public License or the licensing of CiviCRM, |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing |
- +--------------------------------------------------------------------+
-*/
-
// (GenCodeChecksum:{$genCodeChecksum})
-return array(
+return [
{foreach from=$tables key=tableName item=table}
- '{$table.className}' => array(
+ '{$table.className}' => [
'name' => '{$table.objectName}',
'class' => '{$table.className}',
'table' => '{$tableName}',
- ),
+ ],
{/foreach}
-);
+];
diff --git a/civicrm/xml/templates/schema.tpl b/civicrm/xml/templates/schema.tpl
index b772a2ab2ae472de35418e01c83d7d241e2e05d5..9b01d5d402e346041e80ef0d712677fe6fa6a26e 100644
--- a/civicrm/xml/templates/schema.tpl
+++ b/civicrm/xml/templates/schema.tpl
@@ -1,5 +1,5 @@
-- +--------------------------------------------------------------------+
--- | CiviCRM version 4.7 |
+-- | CiviCRM version 5 |
-- +--------------------------------------------------------------------+
-- | Copyright CiviCRM LLC (c) 2004-2018 |
-- +--------------------------------------------------------------------+
diff --git a/civicrm/xml/templates/schema_structure.tpl b/civicrm/xml/templates/schema_structure.tpl
index 92bd020ab0c55007fe4262dd16aeb3bb4e600106..a12f402e567adacabb8a606fee61164c4f03c118 100644
--- a/civicrm/xml/templates/schema_structure.tpl
+++ b/civicrm/xml/templates/schema_structure.tpl
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index a84abbe89e37f3cc131dc4f3b4be207715f8cf05..6c3aafa7a2076d689bb3dea6883b707e6f628600 100644
--- a/civicrm/xml/version.xml
+++ b/civicrm/xml/version.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<version>
- <version_no>5.1.2</version_no>
+ <version_no>5.2.0</version_no>
</version>
diff --git a/includes/civicrm.shortcodes.php b/includes/civicrm.shortcodes.php
index a9765671746579d4c4deb4847b11a8a87d20a0d6..cf3068d5ffdd62cbb7125323062b2b5a51189b6d 100644
--- a/includes/civicrm.shortcodes.php
+++ b/includes/civicrm.shortcodes.php
@@ -247,18 +247,6 @@ class CiviCRM_For_WordPress_Shortcodes {
*/
public function render_single( $atts ) {
- // Do not parse shortcodes in REST context for PUT, POST and DELETE methods
- if ( defined( 'REST_REQUEST' ) && REST_REQUEST && ( isset( $_PUT ) || isset( $_POST ) || isset( $_DELETE ) ) ) {
- // Return the original shortcode
- $shortcode = '[civicrm';
- foreach ( $atts as $att => $val ) {
- $shortcode .= ' ' . $att . '="' . $val . '"';
- }
- $shortcode .= ']';
-
- return $shortcode;
- }
-
// check if we've already parsed this shortcode
global $post;
if ( is_object($post) ) {
diff --git a/wp-cli/civicrm.php b/wp-cli/civicrm.php
index 8d8e2caa036b705f80678c6d6fc963b3b3180763..cce0dbd360700c25cfd7072acff8dd233266e528 100644
--- a/wp-cli/civicrm.php
+++ b/wp-cli/civicrm.php
@@ -1293,7 +1293,7 @@ if ( ! defined( 'CIVICRM_WPCLI_LOADED' ) ) {
if ( $tarfile = $this->getOption( $option, false ) ) {
WP_CLI::launch( "gzip -d $tarfile" );
$tarfile = substr( $tarfile, 0, strlen( $tarfile ) - 3 );
- $this->exec( "tar -xf $tarfile -C \"$destination_path\"" );
+ WP_CLI::launch( "tar -xf $tarfile -C \"$destination_path\"" );
return true;
} else {
return false;