From 200ec9e0714854f4d35668b4181d99b7f6020508 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@tadpole.cc>
Date: Thu, 7 Jun 2018 07:50:55 -0400
Subject: [PATCH] civicrm: 5.2.0 release
Signed-off-by: Kevin Cristiano <kcristiano@tadpole.cc>
---
civicrm.php | 3 +-
civicrm/CRM/ACL/API.php | 2 +-
civicrm/CRM/ACL/BAO/ACL.php | 2 +-
civicrm/CRM/ACL/BAO/Cache.php | 2 +-
civicrm/CRM/ACL/BAO/EntityRole.php | 2 +-
civicrm/CRM/ACL/Form/ACL.php | 2 +-
civicrm/CRM/ACL/Form/ACLBasic.php | 2 +-
civicrm/CRM/ACL/Form/EntityRole.php | 2 +-
.../CRM/ACL/Form/WordPress/Permissions.php | 2 +-
civicrm/CRM/ACL/Page/ACL.php | 2 +-
civicrm/CRM/ACL/Page/ACLBasic.php | 2 +-
civicrm/CRM/ACL/Page/EntityRole.php | 2 +-
civicrm/CRM/Activity/ActionMapping.php | 2 +-
civicrm/CRM/Activity/BAO/Activity.php | 155 +++--
.../CRM/Activity/BAO/ActivityAssignment.php | 2 +-
civicrm/CRM/Activity/BAO/ActivityContact.php | 2 +-
civicrm/CRM/Activity/BAO/ActivityTarget.php | 2 +-
civicrm/CRM/Activity/BAO/ICalendar.php | 2 +-
civicrm/CRM/Activity/BAO/Query.php | 2 +-
civicrm/CRM/Activity/Controller/Search.php | 2 +-
civicrm/CRM/Activity/Form/Activity.php | 2 +-
civicrm/CRM/Activity/Form/ActivityFilter.php | 2 +-
civicrm/CRM/Activity/Form/ActivityLinks.php | 2 +-
civicrm/CRM/Activity/Form/ActivityView.php | 2 +-
civicrm/CRM/Activity/Form/Search.php | 2 +-
civicrm/CRM/Activity/Form/Task.php | 2 +-
civicrm/CRM/Activity/Form/Task/AddToTag.php | 2 +-
civicrm/CRM/Activity/Form/Task/Batch.php | 5 +-
civicrm/CRM/Activity/Form/Task/Delete.php | 2 +-
civicrm/CRM/Activity/Form/Task/Email.php | 2 +-
civicrm/CRM/Activity/Form/Task/FileOnCase.php | 2 +-
civicrm/CRM/Activity/Form/Task/PickOption.php | 2 +-
.../CRM/Activity/Form/Task/PickProfile.php | 2 +-
civicrm/CRM/Activity/Form/Task/Print.php | 2 +-
.../CRM/Activity/Form/Task/RemoveFromTag.php | 2 +-
civicrm/CRM/Activity/Form/Task/SMS.php | 2 +-
.../Form/Task/SearchTaskHookSample.php | 2 +-
civicrm/CRM/Activity/Import/Controller.php | 2 +-
civicrm/CRM/Activity/Import/Field.php | 2 +-
.../CRM/Activity/Import/Form/DataSource.php | 2 +-
civicrm/CRM/Activity/Import/Form/MapField.php | 2 +-
civicrm/CRM/Activity/Import/Form/Preview.php | 2 +-
civicrm/CRM/Activity/Import/Form/Summary.php | 2 +-
civicrm/CRM/Activity/Import/Parser.php | 2 +-
.../CRM/Activity/Import/Parser/Activity.php | 2 +-
civicrm/CRM/Activity/Page/AJAX.php | 2 +-
civicrm/CRM/Activity/Page/Tab.php | 2 +-
civicrm/CRM/Activity/Page/UserDashboard.php | 2 +-
civicrm/CRM/Activity/Selector/Activity.php | 2 +-
civicrm/CRM/Activity/Selector/Search.php | 2 +-
civicrm/CRM/Activity/StateMachine/Search.php | 2 +-
civicrm/CRM/Activity/Task.php | 2 +-
civicrm/CRM/Activity/Tokens.php | 2 +-
civicrm/CRM/Admin/Form.php | 2 +-
civicrm/CRM/Admin/Form/CMSUser.php | 2 +-
civicrm/CRM/Admin/Form/ContactType.php | 2 +-
civicrm/CRM/Admin/Form/Extensions.php | 2 +-
civicrm/CRM/Admin/Form/Job.php | 2 +-
civicrm/CRM/Admin/Form/LabelFormats.php | 2 +-
civicrm/CRM/Admin/Form/LocationType.php | 2 +-
civicrm/CRM/Admin/Form/MailSettings.php | 2 +-
civicrm/CRM/Admin/Form/Mapping.php | 2 +-
civicrm/CRM/Admin/Form/MessageTemplates.php | 2 +-
civicrm/CRM/Admin/Form/Navigation.php | 2 +-
civicrm/CRM/Admin/Form/OptionGroup.php | 2 +-
civicrm/CRM/Admin/Form/Options.php | 2 +-
.../CRM/Admin/Form/ParticipantStatusType.php | 2 +-
civicrm/CRM/Admin/Form/PaymentProcessor.php | 2 +-
.../CRM/Admin/Form/PaymentProcessorType.php | 2 +-
civicrm/CRM/Admin/Form/PdfFormats.php | 2 +-
civicrm/CRM/Admin/Form/Persistent.php | 2 +-
civicrm/CRM/Admin/Form/Preferences.php | 2 +-
.../CRM/Admin/Form/Preferences/Address.php | 2 +-
.../CRM/Admin/Form/Preferences/Campaign.php | 2 +-
.../CRM/Admin/Form/Preferences/Contribute.php | 2 +-
.../CRM/Admin/Form/Preferences/Display.php | 2 +-
civicrm/CRM/Admin/Form/Preferences/Event.php | 2 +-
.../CRM/Admin/Form/Preferences/Mailing.php | 2 +-
civicrm/CRM/Admin/Form/Preferences/Member.php | 2 +-
.../CRM/Admin/Form/Preferences/Multisite.php | 2 +-
civicrm/CRM/Admin/Form/PreferencesDate.php | 2 +-
civicrm/CRM/Admin/Form/RelationshipType.php | 16 +-
civicrm/CRM/Admin/Form/ScheduleReminders.php | 13 +-
civicrm/CRM/Admin/Form/Setting.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Case.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Component.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Date.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Debugging.php | 2 +-
.../CRM/Admin/Form/Setting/Localization.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Mail.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Mapping.php | 2 +-
.../CRM/Admin/Form/Setting/Miscellaneous.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Path.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Search.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Smtp.php | 14 +-
civicrm/CRM/Admin/Form/Setting/UF.php | 2 +-
.../Form/Setting/UpdateConfigBackend.php | 2 +-
civicrm/CRM/Admin/Form/Setting/Url.php | 2 +-
civicrm/CRM/Admin/Form/WordReplacements.php | 2 +-
civicrm/CRM/Admin/Page/AJAX.php | 2 +-
civicrm/CRM/Admin/Page/APIExplorer.php | 2 +-
civicrm/CRM/Admin/Page/Access.php | 2 +-
civicrm/CRM/Admin/Page/Admin.php | 2 +-
civicrm/CRM/Admin/Page/CKEditorConfig.php | 2 +-
civicrm/CRM/Admin/Page/ConfigTaskList.php | 2 +-
civicrm/CRM/Admin/Page/ContactType.php | 2 +-
civicrm/CRM/Admin/Page/EventTemplate.php | 2 +-
civicrm/CRM/Admin/Page/Extensions.php | 2 +-
civicrm/CRM/Admin/Page/Job.php | 2 +-
civicrm/CRM/Admin/Page/JobLog.php | 2 +-
civicrm/CRM/Admin/Page/LabelFormats.php | 2 +-
civicrm/CRM/Admin/Page/LocationType.php | 2 +-
civicrm/CRM/Admin/Page/MailSettings.php | 2 +-
civicrm/CRM/Admin/Page/Mapping.php | 2 +-
civicrm/CRM/Admin/Page/MessageTemplates.php | 2 +-
civicrm/CRM/Admin/Page/Navigation.php | 2 +-
civicrm/CRM/Admin/Page/Options.php | 2 +-
.../CRM/Admin/Page/ParticipantStatusType.php | 2 +-
civicrm/CRM/Admin/Page/PaymentProcessor.php | 2 +-
.../CRM/Admin/Page/PaymentProcessorType.php | 2 +-
civicrm/CRM/Admin/Page/PdfFormats.php | 2 +-
civicrm/CRM/Admin/Page/Persistent.php | 2 +-
civicrm/CRM/Admin/Page/PreferencesDate.php | 2 +-
civicrm/CRM/Admin/Page/RelationshipType.php | 2 +-
civicrm/CRM/Admin/Page/ScheduleReminders.php | 2 +-
civicrm/CRM/Admin/Page/Setting.php | 2 +-
civicrm/CRM/Badge/BAO/Badge.php | 2 +-
civicrm/CRM/Badge/BAO/Layout.php | 7 +-
civicrm/CRM/Badge/Form/Layout.php | 2 +-
civicrm/CRM/Badge/Page/AJAX.php | 2 +-
civicrm/CRM/Badge/Page/Layout.php | 2 +-
civicrm/CRM/Batch/BAO/Batch.php | 2 +-
civicrm/CRM/Batch/BAO/EntityBatch.php | 2 +-
civicrm/CRM/Batch/Form/Batch.php | 2 +-
civicrm/CRM/Batch/Form/Entry.php | 2 +-
civicrm/CRM/Batch/Form/Search.php | 2 +-
civicrm/CRM/Batch/Page/AJAX.php | 2 +-
civicrm/CRM/Batch/Page/Batch.php | 2 +-
civicrm/CRM/Bridge/OG/CiviCRM.php | 2 +-
civicrm/CRM/Bridge/OG/Drupal.php | 2 +-
civicrm/CRM/Bridge/OG/Utils.php | 2 +-
civicrm/CRM/Campaign/BAO/Campaign.php | 2 +-
civicrm/CRM/Campaign/BAO/Petition.php | 6 +-
civicrm/CRM/Campaign/BAO/Query.php | 2 +-
civicrm/CRM/Campaign/BAO/Survey.php | 4 +-
civicrm/CRM/Campaign/Controller/Search.php | 2 +-
civicrm/CRM/Campaign/Form/Campaign.php | 2 +-
civicrm/CRM/Campaign/Form/Gotv.php | 2 +-
civicrm/CRM/Campaign/Form/Petition.php | 2 +-
.../CRM/Campaign/Form/Petition/Signature.php | 2 +-
civicrm/CRM/Campaign/Form/Search.php | 2 +-
civicrm/CRM/Campaign/Form/Search/Campaign.php | 2 +-
civicrm/CRM/Campaign/Form/Search/Petition.php | 2 +-
civicrm/CRM/Campaign/Form/Search/Survey.php | 2 +-
civicrm/CRM/Campaign/Form/Survey.php | 2 +-
civicrm/CRM/Campaign/Form/Survey/Delete.php | 2 +-
civicrm/CRM/Campaign/Form/Survey/Main.php | 2 +-
.../CRM/Campaign/Form/Survey/Questions.php | 2 +-
civicrm/CRM/Campaign/Form/Survey/Results.php | 10 +-
.../CRM/Campaign/Form/Survey/TabHeader.php | 2 +-
civicrm/CRM/Campaign/Form/SurveyType.php | 2 +-
civicrm/CRM/Campaign/Form/Task.php | 2 +-
civicrm/CRM/Campaign/Form/Task/Interview.php | 2 +-
civicrm/CRM/Campaign/Form/Task/Print.php | 2 +-
civicrm/CRM/Campaign/Form/Task/Release.php | 2 +-
civicrm/CRM/Campaign/Form/Task/Reserve.php | 2 +-
civicrm/CRM/Campaign/Form/Task/Result.php | 2 +-
civicrm/CRM/Campaign/Info.php | 2 +-
civicrm/CRM/Campaign/Page/AJAX.php | 2 +-
civicrm/CRM/Campaign/Page/DashBoard.php | 2 +-
civicrm/CRM/Campaign/Page/Petition.php | 2 +-
.../CRM/Campaign/Page/Petition/Confirm.php | 2 +-
.../CRM/Campaign/Page/Petition/ThankYou.php | 2 +-
civicrm/CRM/Campaign/Page/SurveyType.php | 2 +-
civicrm/CRM/Campaign/Page/Vote.php | 2 +-
civicrm/CRM/Campaign/PseudoConstant.php | 2 +-
civicrm/CRM/Campaign/Selector/Search.php | 2 +-
civicrm/CRM/Campaign/StateMachine/Search.php | 2 +-
civicrm/CRM/Campaign/Task.php | 2 +-
civicrm/CRM/Case/BAO/Case.php | 6 +-
civicrm/CRM/Case/BAO/CaseContact.php | 2 +-
civicrm/CRM/Case/BAO/CaseType.php | 2 +-
civicrm/CRM/Case/BAO/Query.php | 2 +-
civicrm/CRM/Case/Controller/Search.php | 2 +-
civicrm/CRM/Case/Form/Activity.php | 2 +-
.../Form/Activity/ChangeCaseStartDate.php | 4 +-
.../Case/Form/Activity/ChangeCaseStatus.php | 4 +-
.../CRM/Case/Form/Activity/ChangeCaseType.php | 4 +-
civicrm/CRM/Case/Form/Activity/LinkCases.php | 2 +-
civicrm/CRM/Case/Form/Activity/OpenCase.php | 2 +-
civicrm/CRM/Case/Form/ActivityToCase.php | 2 +-
civicrm/CRM/Case/Form/ActivityView.php | 2 +-
civicrm/CRM/Case/Form/Case.php | 6 +-
civicrm/CRM/Case/Form/CaseView.php | 2 +-
civicrm/CRM/Case/Form/CustomData.php | 2 +-
civicrm/CRM/Case/Form/EditClient.php | 2 +-
civicrm/CRM/Case/Form/Report.php | 2 +-
civicrm/CRM/Case/Form/Search.php | 4 +-
civicrm/CRM/Case/Form/Task.php | 2 +-
civicrm/CRM/Case/Form/Task/Batch.php | 5 +-
civicrm/CRM/Case/Form/Task/Delete.php | 2 +-
civicrm/CRM/Case/Form/Task/PDF.php | 4 +-
civicrm/CRM/Case/Form/Task/PickProfile.php | 2 +-
civicrm/CRM/Case/Form/Task/Print.php | 2 +-
civicrm/CRM/Case/Form/Task/Restore.php | 2 +-
civicrm/CRM/Case/Form/Task/Result.php | 2 +-
.../Case/Form/Task/SearchTaskHookSample.php | 2 +-
civicrm/CRM/Case/Info.php | 2 +-
civicrm/CRM/Case/Page/AJAX.php | 6 +-
civicrm/CRM/Case/Page/CaseDetails.php | 2 +-
civicrm/CRM/Case/Page/DashBoard.php | 2 +-
civicrm/CRM/Case/Page/Tab.php | 2 +-
civicrm/CRM/Case/PseudoConstant.php | 2 +-
civicrm/CRM/Case/Selector/Search.php | 2 +-
civicrm/CRM/Case/StateMachine/Search.php | 2 +-
civicrm/CRM/Case/Task.php | 2 +-
civicrm/CRM/Case/XMLProcessor.php | 2 +-
civicrm/CRM/Case/XMLProcessor/Process.php | 2 +-
civicrm/CRM/Case/XMLProcessor/Report.php | 2 +-
civicrm/CRM/Case/XMLProcessor/Settings.php | 2 +-
civicrm/CRM/Case/XMLRepository.php | 2 +-
civicrm/CRM/Contact/ActionMapping.php | 2 +-
civicrm/CRM/Contact/BAO/Contact.php | 30 +-
civicrm/CRM/Contact/BAO/Contact/Location.php | 2 +-
.../CRM/Contact/BAO/Contact/Permission.php | 2 +-
civicrm/CRM/Contact/BAO/Contact/Utils.php | 2 +-
civicrm/CRM/Contact/BAO/ContactType.php | 2 +-
civicrm/CRM/Contact/BAO/DashboardContact.php | 2 +-
civicrm/CRM/Contact/BAO/Group.php | 2 +-
civicrm/CRM/Contact/BAO/GroupContact.php | 2 +-
civicrm/CRM/Contact/BAO/GroupContactCache.php | 2 +-
civicrm/CRM/Contact/BAO/GroupNesting.php | 2 +-
civicrm/CRM/Contact/BAO/GroupNestingCache.php | 2 +-
civicrm/CRM/Contact/BAO/GroupOrganization.php | 2 +-
civicrm/CRM/Contact/BAO/Household.php | 2 +-
civicrm/CRM/Contact/BAO/Individual.php | 2 +-
civicrm/CRM/Contact/BAO/ProximityQuery.php | 2 +-
civicrm/CRM/Contact/BAO/Query.php | 34 +-
civicrm/CRM/Contact/BAO/Query/Hook.php | 2 +-
civicrm/CRM/Contact/BAO/Query/Interface.php | 2 +-
civicrm/CRM/Contact/BAO/Relationship.php | 73 +-
civicrm/CRM/Contact/BAO/RelationshipType.php | 44 +-
civicrm/CRM/Contact/BAO/SavedSearch.php | 2 +-
civicrm/CRM/Contact/BAO/SearchCustom.php | 2 +-
.../CRM/Contact/BAO/SubscriptionHistory.php | 2 +-
civicrm/CRM/Contact/Controller/Search.php | 2 +-
civicrm/CRM/Contact/Form/Contact.php | 2 +-
civicrm/CRM/Contact/Form/CustomData.php | 2 +-
civicrm/CRM/Contact/Form/DedupeFind.php | 2 +-
civicrm/CRM/Contact/Form/DedupeRules.php | 2 +-
civicrm/CRM/Contact/Form/Domain.php | 2 +-
civicrm/CRM/Contact/Form/Edit/Address.php | 113 ++--
.../Form/Edit/CommunicationPreferences.php | 2 +-
civicrm/CRM/Contact/Form/Edit/CustomData.php | 2 +-
.../CRM/Contact/Form/Edit/Demographics.php | 2 +-
civicrm/CRM/Contact/Form/Edit/Email.php | 2 +-
civicrm/CRM/Contact/Form/Edit/Household.php | 2 +-
civicrm/CRM/Contact/Form/Edit/IM.php | 2 +-
civicrm/CRM/Contact/Form/Edit/Individual.php | 2 +-
civicrm/CRM/Contact/Form/Edit/Lock.php | 2 +-
civicrm/CRM/Contact/Form/Edit/Notes.php | 2 +-
civicrm/CRM/Contact/Form/Edit/OpenID.php | 2 +-
.../CRM/Contact/Form/Edit/Organization.php | 2 +-
civicrm/CRM/Contact/Form/Edit/Phone.php | 2 +-
.../CRM/Contact/Form/Edit/TagsAndGroups.php | 2 +-
civicrm/CRM/Contact/Form/Edit/Website.php | 2 +-
civicrm/CRM/Contact/Form/GroupContact.php | 2 +-
civicrm/CRM/Contact/Form/Inline.php | 2 +-
civicrm/CRM/Contact/Form/Inline/Address.php | 2 +-
.../Form/Inline/CommunicationPreferences.php | 2 +-
.../CRM/Contact/Form/Inline/ContactInfo.php | 2 +-
.../CRM/Contact/Form/Inline/ContactName.php | 2 +-
.../CRM/Contact/Form/Inline/CustomData.php | 2 +-
.../CRM/Contact/Form/Inline/Demographics.php | 2 +-
civicrm/CRM/Contact/Form/Inline/Email.php | 2 +-
civicrm/CRM/Contact/Form/Inline/IM.php | 2 +-
civicrm/CRM/Contact/Form/Inline/Lock.php | 2 +-
civicrm/CRM/Contact/Form/Inline/OpenID.php | 2 +-
civicrm/CRM/Contact/Form/Inline/Phone.php | 2 +-
civicrm/CRM/Contact/Form/Inline/Website.php | 2 +-
civicrm/CRM/Contact/Form/Location.php | 2 +-
civicrm/CRM/Contact/Form/Merge.php | 38 +-
civicrm/CRM/Contact/Form/RelatedContact.php | 2 +-
civicrm/CRM/Contact/Form/Relationship.php | 22 +-
civicrm/CRM/Contact/Form/Search.php | 2 +-
civicrm/CRM/Contact/Form/Search/Advanced.php | 2 +-
civicrm/CRM/Contact/Form/Search/Basic.php | 2 +-
civicrm/CRM/Contact/Form/Search/Builder.php | 30 +-
civicrm/CRM/Contact/Form/Search/Criteria.php | 2 +-
civicrm/CRM/Contact/Form/Search/Custom.php | 2 +-
.../Form/Search/Custom/ActivitySearch.php | 2 +-
.../CRM/Contact/Form/Search/Custom/Base.php | 2 +-
.../CRM/Contact/Form/Search/Custom/Basic.php | 2 +-
.../Form/Search/Custom/ContribSYBNT.php | 2 +-
.../Search/Custom/ContributionAggregate.php | 2 +-
.../Contact/Form/Search/Custom/DateAdded.php | 2 +-
.../Form/Search/Custom/EventAggregate.php | 2 +-
.../Contact/Form/Search/Custom/FullText.php | 2 +-
.../Custom/FullText/AbstractPartialQuery.php | 2 +-
.../Form/Search/Custom/FullText/Activity.php | 2 +-
.../Form/Search/Custom/FullText/Case.php | 2 +-
.../Form/Search/Custom/FullText/Contact.php | 2 +-
.../Search/Custom/FullText/Contribution.php | 2 +-
.../Search/Custom/FullText/Membership.php | 2 +-
.../Search/Custom/FullText/Participant.php | 2 +-
.../CRM/Contact/Form/Search/Custom/Group.php | 2 +-
.../Form/Search/Custom/MultipleValues.php | 2 +-
.../Form/Search/Custom/PostalMailing.php | 2 +-
.../Contact/Form/Search/Custom/PriceSet.php | 2 +-
.../Contact/Form/Search/Custom/Proximity.php | 2 +-
.../Form/Search/Custom/RandomSegment.php | 2 +-
.../CRM/Contact/Form/Search/Custom/Sample.php | 2 +-
.../Form/Search/Custom/TagContributions.php | 2 +-
.../Form/Search/Custom/ZipCodeRange.php | 2 +-
civicrm/CRM/Contact/Form/Search/Interface.php | 2 +-
civicrm/CRM/Contact/Form/Task.php | 2 +-
civicrm/CRM/Contact/Form/Task/AddToGroup.php | 2 +-
.../CRM/Contact/Form/Task/AddToHousehold.php | 2 +-
.../CRM/Contact/Form/Task/AddToIndividual.php | 2 +-
.../Contact/Form/Task/AddToOrganization.php | 2 +-
.../Contact/Form/Task/AddToParentClass.php | 2 +-
civicrm/CRM/Contact/Form/Task/AddToTag.php | 2 +-
.../Contact/Form/Task/AlterPreferences.php | 2 +-
civicrm/CRM/Contact/Form/Task/Batch.php | 5 +-
civicrm/CRM/Contact/Form/Task/Delete.php | 2 +-
civicrm/CRM/Contact/Form/Task/Email.php | 2 +-
civicrm/CRM/Contact/Form/Task/EmailCommon.php | 8 +-
civicrm/CRM/Contact/Form/Task/HookSample.php | 2 +-
civicrm/CRM/Contact/Form/Task/Label.php | 2 +-
civicrm/CRM/Contact/Form/Task/LabelCommon.php | 2 +-
civicrm/CRM/Contact/Form/Task/Map.php | 2 +-
civicrm/CRM/Contact/Form/Task/Map/Event.php | 2 +-
civicrm/CRM/Contact/Form/Task/Merge.php | 2 +-
civicrm/CRM/Contact/Form/Task/PDF.php | 2 +-
.../CRM/Contact/Form/Task/PDFLetterCommon.php | 2 +-
civicrm/CRM/Contact/Form/Task/PickProfile.php | 2 +-
civicrm/CRM/Contact/Form/Task/Print.php | 5 +-
.../CRM/Contact/Form/Task/ProximityCommon.php | 2 +-
.../CRM/Contact/Form/Task/RemoveFromGroup.php | 2 +-
.../CRM/Contact/Form/Task/RemoveFromTag.php | 2 +-
civicrm/CRM/Contact/Form/Task/Result.php | 2 +-
civicrm/CRM/Contact/Form/Task/SMS.php | 2 +-
civicrm/CRM/Contact/Form/Task/SMSCommon.php | 2 +-
civicrm/CRM/Contact/Form/Task/SaveSearch.php | 2 +-
.../Contact/Form/Task/SaveSearch/Update.php | 2 +-
civicrm/CRM/Contact/Form/Task/Useradd.php | 2 +-
civicrm/CRM/Contact/Import/Controller.php | 2 +-
civicrm/CRM/Contact/Import/Field.php | 2 +-
.../CRM/Contact/Import/Form/DataSource.php | 2 +-
civicrm/CRM/Contact/Import/Form/MapField.php | 2 +-
civicrm/CRM/Contact/Import/Form/Preview.php | 2 +-
civicrm/CRM/Contact/Import/Form/Summary.php | 2 +-
civicrm/CRM/Contact/Import/ImportJob.php | 2 +-
civicrm/CRM/Contact/Import/Importer.php | 2 +-
civicrm/CRM/Contact/Import/Page/AJAX.php | 2 +-
civicrm/CRM/Contact/Import/Parser.php | 2 +-
civicrm/CRM/Contact/Import/Parser/Contact.php | 2 +-
civicrm/CRM/Contact/Page/AJAX.php | 16 +-
civicrm/CRM/Contact/Page/CustomSearch.php | 2 +-
civicrm/CRM/Contact/Page/DashBoard.php | 2 +-
civicrm/CRM/Contact/Page/Dashlet.php | 2 +-
civicrm/CRM/Contact/Page/DedupeException.php | 2 +-
civicrm/CRM/Contact/Page/DedupeFind.php | 5 +-
civicrm/CRM/Contact/Page/DedupeMerge.php | 17 +-
civicrm/CRM/Contact/Page/DedupeRules.php | 2 +-
civicrm/CRM/Contact/Page/ImageFile.php | 2 +-
civicrm/CRM/Contact/Page/Inline/Actions.php | 2 +-
civicrm/CRM/Contact/Page/Inline/Address.php | 2 +-
.../Page/Inline/CommunicationPreferences.php | 2 +-
.../CRM/Contact/Page/Inline/ContactInfo.php | 2 +-
.../CRM/Contact/Page/Inline/ContactName.php | 2 +-
.../CRM/Contact/Page/Inline/CustomData.php | 2 +-
.../CRM/Contact/Page/Inline/Demographics.php | 2 +-
civicrm/CRM/Contact/Page/Inline/Email.php | 2 +-
civicrm/CRM/Contact/Page/Inline/IM.php | 2 +-
civicrm/CRM/Contact/Page/Inline/OpenID.php | 2 +-
civicrm/CRM/Contact/Page/Inline/Phone.php | 2 +-
civicrm/CRM/Contact/Page/Inline/Website.php | 2 +-
civicrm/CRM/Contact/Page/SavedSearch.php | 2 +-
civicrm/CRM/Contact/Page/Task.php | 2 +-
civicrm/CRM/Contact/Page/View.php | 2 +-
.../Contact/Page/View/ContactSmartGroup.php | 2 +-
civicrm/CRM/Contact/Page/View/CustomData.php | 2 +-
.../CRM/Contact/Page/View/GroupContact.php | 2 +-
civicrm/CRM/Contact/Page/View/Log.php | 2 +-
civicrm/CRM/Contact/Page/View/Note.php | 2 +-
civicrm/CRM/Contact/Page/View/Print.php | 2 +-
.../CRM/Contact/Page/View/Relationship.php | 2 +-
civicrm/CRM/Contact/Page/View/Summary.php | 2 +-
civicrm/CRM/Contact/Page/View/Tag.php | 2 +-
.../CRM/Contact/Page/View/UserDashBoard.php | 2 +-
.../Page/View/UserDashBoard/GroupContact.php | 2 +-
civicrm/CRM/Contact/Page/View/Useradd.php | 2 +-
civicrm/CRM/Contact/Page/View/Vcard.php | 2 +-
civicrm/CRM/Contact/Selector.php | 2 +-
civicrm/CRM/Contact/Selector/Controller.php | 2 +-
civicrm/CRM/Contact/Selector/Custom.php | 11 +-
civicrm/CRM/Contact/StateMachine/Search.php | 2 +-
civicrm/CRM/Contact/Task.php | 2 +-
.../CRM/Contribute/ActionMapping/ByPage.php | 2 +-
.../CRM/Contribute/ActionMapping/ByType.php | 2 +-
civicrm/CRM/Contribute/BAO/Contribution.php | 23 +-
.../CRM/Contribute/BAO/Contribution/Utils.php | 2 +-
.../CRM/Contribute/BAO/ContributionPage.php | 2 +-
.../CRM/Contribute/BAO/ContributionRecur.php | 2 +-
.../CRM/Contribute/BAO/ContributionSoft.php | 6 +-
civicrm/CRM/Contribute/BAO/ManagePremiums.php | 2 +-
civicrm/CRM/Contribute/BAO/Premium.php | 2 +-
civicrm/CRM/Contribute/BAO/Query.php | 2 +-
civicrm/CRM/Contribute/BAO/Widget.php | 2 +-
.../Contribute/Controller/Contribution.php | 2 +-
.../Controller/ContributionPage.php | 2 +-
civicrm/CRM/Contribute/Controller/Search.php | 2 +-
.../CRM/Contribute/DAO/ContributionSoft.php | 5 +-
civicrm/CRM/Contribute/Form.php | 2 +-
.../Contribute/Form/AbstractEditPayment.php | 2 +-
.../CRM/Contribute/Form/AdditionalInfo.php | 2 +-
.../CRM/Contribute/Form/AdditionalPayment.php | 2 +-
.../Contribute/Form/CancelSubscription.php | 2 +-
civicrm/CRM/Contribute/Form/Contribution.php | 2 +-
.../Contribute/Form/Contribution/Confirm.php | 9 +-
.../CRM/Contribute/Form/Contribution/Main.php | 4 +-
.../Contribute/Form/Contribution/ThankYou.php | 2 +-
.../CRM/Contribute/Form/ContributionBase.php | 2 +-
.../Contribute/Form/ContributionCharts.php | 2 +-
.../CRM/Contribute/Form/ContributionPage.php | 2 +-
.../Form/ContributionPage/AddProduct.php | 2 +-
.../Form/ContributionPage/Amount.php | 13 +-
.../Form/ContributionPage/Custom.php | 2 +-
.../Form/ContributionPage/Delete.php | 2 +-
.../Form/ContributionPage/Premium.php | 2 +-
.../Form/ContributionPage/Settings.php | 2 +-
.../Form/ContributionPage/TabHeader.php | 2 +-
.../Form/ContributionPage/ThankYou.php | 2 +-
.../Form/ContributionPage/Widget.php | 2 +-
.../CRM/Contribute/Form/ContributionView.php | 2 +-
.../CRM/Contribute/Form/ManagePremiums.php | 2 +-
civicrm/CRM/Contribute/Form/Search.php | 2 +-
.../Contribute/Form/SearchContribution.php | 2 +-
civicrm/CRM/Contribute/Form/SoftCredit.php | 2 +-
civicrm/CRM/Contribute/Form/Task.php | 2 +-
civicrm/CRM/Contribute/Form/Task/Batch.php | 5 +-
civicrm/CRM/Contribute/Form/Task/Delete.php | 2 +-
civicrm/CRM/Contribute/Form/Task/Email.php | 2 +-
civicrm/CRM/Contribute/Form/Task/Invoice.php | 2 +-
civicrm/CRM/Contribute/Form/Task/PDF.php | 2 +-
.../CRM/Contribute/Form/Task/PDFLetter.php | 2 +-
.../CRM/Contribute/Form/Task/PickProfile.php | 2 +-
civicrm/CRM/Contribute/Form/Task/Print.php | 2 +-
civicrm/CRM/Contribute/Form/Task/Result.php | 2 +-
.../Form/Task/SearchTaskHookSample.php | 2 +-
civicrm/CRM/Contribute/Form/Task/Status.php | 2 +-
civicrm/CRM/Contribute/Form/UpdateBilling.php | 2 +-
.../Contribute/Form/UpdateSubscription.php | 2 +-
civicrm/CRM/Contribute/Import/Controller.php | 2 +-
civicrm/CRM/Contribute/Import/Field.php | 2 +-
.../CRM/Contribute/Import/Form/DataSource.php | 2 +-
.../CRM/Contribute/Import/Form/MapField.php | 2 +-
.../CRM/Contribute/Import/Form/Preview.php | 2 +-
.../CRM/Contribute/Import/Form/Summary.php | 2 +-
civicrm/CRM/Contribute/Import/Parser.php | 2 +-
.../Contribute/Import/Parser/Contribution.php | 2 +-
civicrm/CRM/Contribute/Info.php | 2 +-
civicrm/CRM/Contribute/Page/AJAX.php | 2 +-
.../CRM/Contribute/Page/ContributionPage.php | 2 +-
.../CRM/Contribute/Page/ContributionRecur.php | 2 +-
civicrm/CRM/Contribute/Page/DashBoard.php | 2 +-
.../CRM/Contribute/Page/ManagePremiums.php | 2 +-
civicrm/CRM/Contribute/Page/PaymentInfo.php | 2 +-
civicrm/CRM/Contribute/Page/Premium.php | 2 +-
.../Contribute/Page/SubscriptionStatus.php | 2 +-
civicrm/CRM/Contribute/Page/Tab.php | 2 +-
civicrm/CRM/Contribute/Page/UserDashboard.php | 2 +-
civicrm/CRM/Contribute/PseudoConstant.php | 2 +-
civicrm/CRM/Contribute/Selector/Search.php | 2 +-
.../Contribute/StateMachine/Contribution.php | 2 +-
.../StateMachine/ContributionPage.php | 2 +-
.../CRM/Contribute/StateMachine/Search.php | 2 +-
civicrm/CRM/Contribute/Task.php | 2 +-
civicrm/CRM/Contribute/Tokens.php | 2 +-
civicrm/CRM/Core/Action.php | 2 +-
civicrm/CRM/Core/BAO/ActionLog.php | 2 +-
civicrm/CRM/Core/BAO/ActionSchedule.php | 2 +-
civicrm/CRM/Core/BAO/Address.php | 2 +-
civicrm/CRM/Core/BAO/Block.php | 2 +-
civicrm/CRM/Core/BAO/CMSUser.php | 2 +-
civicrm/CRM/Core/BAO/Cache.php | 2 +-
civicrm/CRM/Core/BAO/ConfigSetting.php | 2 +-
civicrm/CRM/Core/BAO/Country.php | 2 +-
civicrm/CRM/Core/BAO/CustomField.php | 29 +-
civicrm/CRM/Core/BAO/CustomGroup.php | 34 +-
civicrm/CRM/Core/BAO/CustomOption.php | 2 +-
civicrm/CRM/Core/BAO/CustomQuery.php | 2 +-
civicrm/CRM/Core/BAO/CustomValue.php | 2 +-
civicrm/CRM/Core/BAO/CustomValueTable.php | 2 +-
civicrm/CRM/Core/BAO/Dashboard.php | 2 +-
civicrm/CRM/Core/BAO/Discount.php | 2 +-
civicrm/CRM/Core/BAO/Domain.php | 2 +-
civicrm/CRM/Core/BAO/Email.php | 2 +-
civicrm/CRM/Core/BAO/EntityTag.php | 2 +-
civicrm/CRM/Core/BAO/Extension.php | 2 +-
civicrm/CRM/Core/BAO/File.php | 2 +-
civicrm/CRM/Core/BAO/FinancialTrxn.php | 2 +-
civicrm/CRM/Core/BAO/IM.php | 2 +-
civicrm/CRM/Core/BAO/Job.php | 2 +-
civicrm/CRM/Core/BAO/LabelFormat.php | 2 +-
civicrm/CRM/Core/BAO/Location.php | 2 +-
civicrm/CRM/Core/BAO/LocationType.php | 2 +-
civicrm/CRM/Core/BAO/Log.php | 2 +-
civicrm/CRM/Core/BAO/MailSettings.php | 2 +-
civicrm/CRM/Core/BAO/Mapping.php | 2 +-
civicrm/CRM/Core/BAO/MessageTemplate.php | 2 +-
civicrm/CRM/Core/BAO/Navigation.php | 2 +-
civicrm/CRM/Core/BAO/Note.php | 2 +-
civicrm/CRM/Core/BAO/OpenID.php | 2 +-
civicrm/CRM/Core/BAO/OptionGroup.php | 2 +-
civicrm/CRM/Core/BAO/OptionValue.php | 2 +-
civicrm/CRM/Core/BAO/PaperSize.php | 2 +-
civicrm/CRM/Core/BAO/PdfFormat.php | 2 +-
civicrm/CRM/Core/BAO/Persistent.php | 2 +-
civicrm/CRM/Core/BAO/Phone.php | 2 +-
civicrm/CRM/Core/BAO/PreferencesDate.php | 2 +-
civicrm/CRM/Core/BAO/PrevNextCache.php | 2 +-
civicrm/CRM/Core/BAO/Query.php | 2 +-
civicrm/CRM/Core/BAO/RecurringEntity.php | 2 +-
civicrm/CRM/Core/BAO/SchemaHandler.php | 2 +-
civicrm/CRM/Core/BAO/Setting.php | 2 +-
civicrm/CRM/Core/BAO/StatusPreference.php | 2 +-
civicrm/CRM/Core/BAO/Tag.php | 2 +-
civicrm/CRM/Core/BAO/UFField.php | 2 +-
civicrm/CRM/Core/BAO/UFGroup.php | 2 +-
civicrm/CRM/Core/BAO/UFJoin.php | 2 +-
civicrm/CRM/Core/BAO/UFMatch.php | 2 +-
civicrm/CRM/Core/BAO/Website.php | 2 +-
civicrm/CRM/Core/BAO/WordReplacement.php | 2 +-
civicrm/CRM/Core/Base.php | 2 +-
civicrm/CRM/Core/Block.php | 2 +-
civicrm/CRM/Core/ClassLoader.php | 2 +-
civicrm/CRM/Core/CodeGen/Reflection.php | 55 +-
civicrm/CRM/Core/CodeGen/Util/Template.php | 23 +-
civicrm/CRM/Core/CommunityMessages.php | 2 +-
civicrm/CRM/Core/Component.php | 2 +-
civicrm/CRM/Core/Component/Info.php | 2 +-
civicrm/CRM/Core/Config.php | 2 +-
civicrm/CRM/Core/Config/MagicMerge.php | 2 +-
civicrm/CRM/Core/Config/Runtime.php | 2 +-
civicrm/CRM/Core/Controller.php | 2 +-
civicrm/CRM/Core/Controller/Simple.php | 2 +-
civicrm/CRM/Core/DAO.php | 2 +-
civicrm/CRM/Core/DAO/AllCoreTables.data.php | 638 +++++++++---------
civicrm/CRM/Core/DAO/AllCoreTables.php | 2 +-
civicrm/CRM/Core/DAO/permissions.php | 2 +-
civicrm/CRM/Core/Error.php | 2 +-
civicrm/CRM/Core/Error/Log.php | 2 +-
civicrm/CRM/Core/Exception.php | 2 +-
civicrm/CRM/Core/Form.php | 11 +-
civicrm/CRM/Core/Form/Date.php | 2 +-
civicrm/CRM/Core/Form/RecurringEntity.php | 2 +-
civicrm/CRM/Core/Form/Renderer.php | 2 +-
civicrm/CRM/Core/Form/Search.php | 2 +-
civicrm/CRM/Core/Form/ShortCode.php | 2 +-
civicrm/CRM/Core/Form/Tag.php | 2 +-
civicrm/CRM/Core/Form/Task.php | 2 +-
civicrm/CRM/Core/Form/Task/Batch.php | 2 +-
civicrm/CRM/Core/Form/Task/PickProfile.php | 2 +-
civicrm/CRM/Core/HTMLInputCoder.php | 2 +-
civicrm/CRM/Core/I18n.php | 2 +-
civicrm/CRM/Core/I18n/Form.php | 2 +-
civicrm/CRM/Core/I18n/NativeGettext.php | 2 +-
civicrm/CRM/Core/I18n/PseudoConstant.php | 2 +-
civicrm/CRM/Core/I18n/Schema.php | 2 +-
civicrm/CRM/Core/I18n/SchemaStructure.php | 2 +-
.../Core/I18n/SchemaStructure_4_2_alpha1.php | 2 +-
.../CRM/Core/I18n/SchemaStructure_4_3_1.php | 2 +-
.../Core/I18n/SchemaStructure_4_5_alpha1.php | 2 +-
.../Core/I18n/SchemaStructure_4_5_beta2.php | 2 +-
.../Core/I18n/SchemaStructure_4_7_alpha1.php | 2 +-
civicrm/CRM/Core/IDS.php | 2 +-
civicrm/CRM/Core/InnoDBIndexer.php | 2 +-
civicrm/CRM/Core/Invoke.php | 2 +-
civicrm/CRM/Core/JobManager.php | 2 +-
civicrm/CRM/Core/Joomla.php | 2 +-
civicrm/CRM/Core/Key.php | 2 +-
civicrm/CRM/Core/Lock.php | 2 +-
civicrm/CRM/Core/Menu.php | 2 +-
civicrm/CRM/Core/Module.php | 2 +-
civicrm/CRM/Core/OptionGroup.php | 2 +-
civicrm/CRM/Core/OptionValue.php | 2 +-
civicrm/CRM/Core/Page.php | 2 +-
civicrm/CRM/Core/Page/AJAX.php | 2 +-
civicrm/CRM/Core/Page/AJAX/Attachment.php | 2 +-
civicrm/CRM/Core/Page/AJAX/Location.php | 2 +-
civicrm/CRM/Core/Page/Basic.php | 2 +-
civicrm/CRM/Core/Page/File.php | 2 +-
civicrm/CRM/Core/Page/Inline/Help.php | 2 +-
.../CRM/Core/Page/RecurringEntityPreview.php | 2 +-
civicrm/CRM/Core/Payment.php | 2 +-
civicrm/CRM/Core/Payment/AuthorizeNetIPN.php | 40 +-
civicrm/CRM/Core/Payment/BaseIPN.php | 2 +-
civicrm/CRM/Core/Payment/Elavon.php | 2 +-
civicrm/CRM/Core/Payment/FirstData.php | 2 +-
civicrm/CRM/Core/Payment/Form.php | 2 +-
civicrm/CRM/Core/Payment/Manual.php | 2 +-
civicrm/CRM/Core/Payment/PayPalIPN.php | 2 +-
civicrm/CRM/Core/Payment/PayPalImpl.php | 24 +-
civicrm/CRM/Core/Payment/PayPalProIPN.php | 2 +-
civicrm/CRM/Core/Payment/PayflowPro.php | 6 +-
civicrm/CRM/Core/Payment/PaymentExpress.php | 2 +-
.../CRM/Core/Payment/PaymentExpressIPN.php | 2 +-
.../CRM/Core/Payment/PaymentExpressUtils.php | 2 +-
civicrm/CRM/Core/Payment/ProcessorForm.php | 2 +-
civicrm/CRM/Core/Payment/Realex.php | 2 +-
civicrm/CRM/Core/Payment/eWAY.php | 2 +-
civicrm/CRM/Core/Permission.php | 16 +-
civicrm/CRM/Core/Permission/Backdrop.php | 2 +-
civicrm/CRM/Core/Permission/Base.php | 2 +-
civicrm/CRM/Core/Permission/Drupal.php | 2 +-
civicrm/CRM/Core/Permission/Drupal6.php | 2 +-
civicrm/CRM/Core/Permission/Drupal8.php | 2 +-
civicrm/CRM/Core/Permission/DrupalBase.php | 2 +-
civicrm/CRM/Core/Permission/Joomla.php | 2 +-
civicrm/CRM/Core/Permission/Soap.php | 2 +-
civicrm/CRM/Core/Permission/Temp.php | 2 +-
civicrm/CRM/Core/Permission/UnitTests.php | 2 +-
civicrm/CRM/Core/Permission/WordPress.php | 2 +-
civicrm/CRM/Core/PseudoConstant.php | 2 +-
civicrm/CRM/Core/QuickForm/Action.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Back.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Cancel.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Display.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Done.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Jump.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Next.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Process.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Refresh.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Reload.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Submit.php | 2 +-
civicrm/CRM/Core/QuickForm/Action/Upload.php | 2 +-
.../CRM/Core/QuickForm/GroupMultiSelect.php | 2 +-
.../Core/QuickForm/NestedAdvMultiSelect.php | 2 +-
civicrm/CRM/Core/Report/Excel.php | 2 +-
civicrm/CRM/Core/Resources.php | 2 +-
civicrm/CRM/Core/Resources/Strings.php | 2 +-
civicrm/CRM/Core/ScheduledJob.php | 2 +-
civicrm/CRM/Core/SelectValues.php | 17 +-
civicrm/CRM/Core/Selector/API.php | 2 +-
civicrm/CRM/Core/Selector/Base.php | 2 +-
civicrm/CRM/Core/Selector/Controller.php | 2 +-
civicrm/CRM/Core/Session.php | 2 +-
civicrm/CRM/Core/ShowHideBlocks.php | 2 +-
civicrm/CRM/Core/Smarty.php | 2 +-
.../Core/Smarty/plugins/block.crmButton.php | 2 +-
.../CRM/Core/Smarty/plugins/block.edit.php | 2 +-
.../CRM/Core/Smarty/plugins/block.htxt.php | 2 +-
.../Core/Smarty/plugins/block.localize.php | 2 +-
.../Core/Smarty/plugins/block.serialize.php | 2 +-
civicrm/CRM/Core/Smarty/plugins/block.ts.php | 2 +-
.../Core/Smarty/plugins/function.crmAPI.php | 2 +-
.../Smarty/plugins/function.crmAttributes.php | 2 +-
.../Smarty/plugins/function.crmCrudLink.php | 2 +-
.../Core/Smarty/plugins/function.crmDBTpl.php | 2 +-
.../plugins/function.crmGetAttribute.php | 2 +-
.../Core/Smarty/plugins/function.crmKey.php | 2 +-
.../plugins/function.crmNavigationMenu.php | 2 +-
.../Smarty/plugins/function.crmResPath.php | 2 +-
.../Smarty/plugins/function.crmResURL.php | 2 +-
.../Smarty/plugins/function.crmScript.php | 2 +-
.../Smarty/plugins/function.crmSetting.php | 2 +-
.../Smarty/plugins/function.crmSigner.php | 2 +-
.../Core/Smarty/plugins/function.crmStyle.php | 2 +-
.../Smarty/plugins/function.crmVersion.php | 2 +-
.../Core/Smarty/plugins/function.docURL.php | 2 +-
.../CRM/Core/Smarty/plugins/function.help.php | 2 +-
.../Smarty/plugins/function.isValueChange.php | 2 +-
.../Smarty/plugins/function.sectionTotal.php | 2 +-
.../Smarty/plugins/modifier.colorContrast.php | 2 +-
.../Smarty/plugins/modifier.crmAddClass.php | 2 +-
.../Smarty/plugins/modifier.crmBtnType.php | 2 +-
.../Core/Smarty/plugins/modifier.crmDate.php | 2 +-
.../Smarty/plugins/modifier.crmDelete.php | 2 +-
.../Smarty/plugins/modifier.crmFirstWord.php | 2 +-
.../Smarty/plugins/modifier.crmICalDate.php | 2 +-
.../Smarty/plugins/modifier.crmICalText.php | 2 +-
.../Smarty/plugins/modifier.crmInsert.php | 2 +-
.../Core/Smarty/plugins/modifier.crmMoney.php | 2 +-
.../plugins/modifier.crmNumberFormat.php | 2 +-
.../Smarty/plugins/modifier.crmReplace.php | 2 +-
.../plugins/modifier.crmStripAlternatives.php | 2 +-
.../Core/Smarty/plugins/modifier.htmlize.php | 2 +-
.../CRM/Core/Smarty/plugins/modifier.json.php | 2 +-
.../Smarty/plugins/modifier.mb_truncate.php | 2 +-
.../Smarty/plugins/modifier.substring.php | 2 +-
civicrm/CRM/Core/Smarty/resources/String.php | 2 +-
civicrm/CRM/Core/State.php | 2 +-
civicrm/CRM/Core/StateMachine.php | 2 +-
civicrm/CRM/Core/TableHierarchy.php | 2 +-
civicrm/CRM/Core/Task.php | 2 +-
civicrm/CRM/Core/Transaction.php | 2 +-
civicrm/CRM/Custom/Form/ChangeFieldType.php | 2 +-
civicrm/CRM/Custom/Form/CustomData.php | 2 +-
civicrm/CRM/Custom/Form/CustomDataByType.php | 2 +-
civicrm/CRM/Custom/Form/DeleteField.php | 2 +-
civicrm/CRM/Custom/Form/DeleteGroup.php | 2 +-
civicrm/CRM/Custom/Form/Field.php | 2 +-
civicrm/CRM/Custom/Form/Group.php | 2 +-
civicrm/CRM/Custom/Form/MoveField.php | 2 +-
civicrm/CRM/Custom/Form/Option.php | 2 +-
civicrm/CRM/Custom/Form/Preview.php | 2 +-
civicrm/CRM/Custom/Import/Field.php | 2 +-
civicrm/CRM/Custom/Import/Form/DataSource.php | 2 +-
civicrm/CRM/Custom/Import/Parser.php | 2 +-
civicrm/CRM/Custom/Page/AJAX.php | 2 +-
civicrm/CRM/Custom/Page/Field.php | 2 +-
civicrm/CRM/Custom/Page/Group.php | 2 +-
civicrm/CRM/Custom/Page/Option.php | 2 +-
civicrm/CRM/Cxn/ApiRouter.php | 2 +-
civicrm/CRM/Cxn/BAO/Cxn.php | 2 +-
civicrm/CRM/Dashlet/Page/Activity.php | 2 +-
civicrm/CRM/Dashlet/Page/AllCases.php | 2 +-
civicrm/CRM/Dashlet/Page/Blog.php | 2 +-
civicrm/CRM/Dashlet/Page/CaseDashboard.php | 2 +-
civicrm/CRM/Dashlet/Page/GettingStarted.php | 2 +-
civicrm/CRM/Dashlet/Page/MyCases.php | 2 +-
.../QueryBuilder/IndividualUnsupervised.php | 2 +-
civicrm/CRM/Dedupe/BAO/Rule.php | 2 +-
civicrm/CRM/Dedupe/BAO/RuleGroup.php | 2 +-
civicrm/CRM/Dedupe/Finder.php | 2 +-
civicrm/CRM/Dedupe/Merger.php | 2 +-
civicrm/CRM/Event/ActionMapping.php | 2 +-
civicrm/CRM/Event/BAO/Event.php | 2 +-
civicrm/CRM/Event/BAO/Participant.php | 2 +-
civicrm/CRM/Event/BAO/ParticipantPayment.php | 2 +-
.../CRM/Event/BAO/ParticipantStatusType.php | 2 +-
civicrm/CRM/Event/BAO/Query.php | 2 +-
civicrm/CRM/Event/Badge.php | 2 +-
civicrm/CRM/Event/Badge/NameTent.php | 2 +-
civicrm/CRM/Event/Badge/Simple.php | 2 +-
civicrm/CRM/Event/Cart/BAO/MerParticipant.php | 2 +-
civicrm/CRM/Event/Controller/Registration.php | 2 +-
civicrm/CRM/Event/Controller/Search.php | 2 +-
civicrm/CRM/Event/DAO/Participant.php | 5 +-
civicrm/CRM/Event/Form/EventFees.php | 4 +-
civicrm/CRM/Event/Form/ManageEvent.php | 2 +-
.../CRM/Event/Form/ManageEvent/Conference.php | 2 +-
civicrm/CRM/Event/Form/ManageEvent/Delete.php | 2 +-
.../CRM/Event/Form/ManageEvent/EventInfo.php | 2 +-
civicrm/CRM/Event/Form/ManageEvent/Fee.php | 2 +-
.../CRM/Event/Form/ManageEvent/Location.php | 2 +-
.../Event/Form/ManageEvent/Registration.php | 2 +-
.../Form/ManageEvent/ScheduleReminders.php | 2 +-
.../CRM/Event/Form/ManageEvent/TabHeader.php | 2 +-
civicrm/CRM/Event/Form/Participant.php | 11 +-
.../Event/Form/ParticipantFeeSelection.php | 2 +-
civicrm/CRM/Event/Form/ParticipantView.php | 19 +-
civicrm/CRM/Event/Form/Registration.php | 2 +-
.../Registration/AdditionalParticipant.php | 2 +-
.../CRM/Event/Form/Registration/Confirm.php | 2 +-
.../Form/Registration/ParticipantConfirm.php | 2 +-
.../CRM/Event/Form/Registration/Register.php | 2 +-
.../CRM/Event/Form/Registration/ThankYou.php | 2 +-
civicrm/CRM/Event/Form/Search.php | 2 +-
civicrm/CRM/Event/Form/SearchEvent.php | 2 +-
civicrm/CRM/Event/Form/SelfSvcTransfer.php | 53 +-
civicrm/CRM/Event/Form/SelfSvcUpdate.php | 33 +-
civicrm/CRM/Event/Form/Task.php | 2 +-
civicrm/CRM/Event/Form/Task/AddToGroup.php | 2 +-
civicrm/CRM/Event/Form/Task/Badge.php | 2 +-
civicrm/CRM/Event/Form/Task/Batch.php | 137 ++--
civicrm/CRM/Event/Form/Task/Cancel.php | 2 +-
civicrm/CRM/Event/Form/Task/Delete.php | 2 +-
civicrm/CRM/Event/Form/Task/Email.php | 2 +-
civicrm/CRM/Event/Form/Task/PDF.php | 2 +-
.../CRM/Event/Form/Task/ParticipantStatus.php | 2 +-
civicrm/CRM/Event/Form/Task/PickProfile.php | 2 +-
civicrm/CRM/Event/Form/Task/Print.php | 2 +-
civicrm/CRM/Event/Form/Task/Result.php | 2 +-
civicrm/CRM/Event/Form/Task/SaveSearch.php | 2 +-
.../CRM/Event/Form/Task/SaveSearch/Update.php | 2 +-
.../Event/Form/Task/SearchTaskHookSample.php | 2 +-
civicrm/CRM/Event/Import/Controller.php | 2 +-
civicrm/CRM/Event/Import/Field.php | 2 +-
civicrm/CRM/Event/Import/Form/DataSource.php | 2 +-
civicrm/CRM/Event/Import/Form/MapField.php | 2 +-
civicrm/CRM/Event/Import/Form/Preview.php | 2 +-
civicrm/CRM/Event/Import/Form/Summary.php | 2 +-
civicrm/CRM/Event/Import/Parser.php | 2 +-
.../CRM/Event/Import/Parser/Participant.php | 2 +-
civicrm/CRM/Event/Info.php | 2 +-
civicrm/CRM/Event/Page/AJAX.php | 2 +-
civicrm/CRM/Event/Page/DashBoard.php | 2 +-
civicrm/CRM/Event/Page/EventInfo.php | 2 +-
civicrm/CRM/Event/Page/ICalendar.php | 2 +-
civicrm/CRM/Event/Page/ManageEvent.php | 2 +-
civicrm/CRM/Event/Page/ParticipantListing.php | 2 +-
.../Event/Page/ParticipantListing/Name.php | 2 +-
.../Page/ParticipantListing/NameAndEmail.php | 2 +-
.../ParticipantListing/NameStatusAndDate.php | 2 +-
.../Event/Page/ParticipantListing/Simple.php | 2 +-
civicrm/CRM/Event/Page/Tab.php | 2 +-
civicrm/CRM/Event/Page/UserDashboard.php | 2 +-
civicrm/CRM/Event/PseudoConstant.php | 2 +-
civicrm/CRM/Event/Selector/Search.php | 16 +-
.../CRM/Event/StateMachine/Registration.php | 2 +-
civicrm/CRM/Event/StateMachine/Search.php | 2 +-
civicrm/CRM/Event/Task.php | 2 +-
civicrm/CRM/Event/Tokens.php | 2 +-
civicrm/CRM/Export/BAO/Export.php | 11 +-
civicrm/CRM/Export/Controller/Standalone.php | 2 +-
civicrm/CRM/Export/Form/Map.php | 2 +-
civicrm/CRM/Export/Form/Select.php | 8 +-
.../CRM/Export/StateMachine/Standalone.php | 2 +-
civicrm/CRM/Extension/Browser.php | 2 +-
civicrm/CRM/Extension/ClassLoader.php | 2 +-
civicrm/CRM/Extension/Container/Basic.php | 2 +-
.../CRM/Extension/Container/Collection.php | 2 +-
civicrm/CRM/Extension/Container/Default.php | 2 +-
civicrm/CRM/Extension/Container/Interface.php | 2 +-
civicrm/CRM/Extension/Container/Static.php | 2 +-
civicrm/CRM/Extension/Downloader.php | 2 +-
civicrm/CRM/Extension/Exception.php | 2 +-
.../Exception/DependencyException.php | 2 +-
.../Extension/Exception/MissingException.php | 2 +-
.../Extension/Exception/ParseException.php | 2 +-
civicrm/CRM/Extension/Info.php | 2 +-
civicrm/CRM/Extension/Manager.php | 2 +-
civicrm/CRM/Extension/Manager/Base.php | 2 +-
civicrm/CRM/Extension/Manager/Interface.php | 2 +-
civicrm/CRM/Extension/Manager/Module.php | 2 +-
civicrm/CRM/Extension/Manager/Payment.php | 2 +-
civicrm/CRM/Extension/Manager/Report.php | 2 +-
civicrm/CRM/Extension/Manager/Search.php | 2 +-
civicrm/CRM/Extension/Mapper.php | 2 +-
civicrm/CRM/Extension/System.php | 2 +-
civicrm/CRM/Extension/Upgrades.php | 2 +-
civicrm/CRM/Financial/BAO/ExportFormat.php | 2 +-
.../CRM/Financial/BAO/ExportFormat/CSV.php | 2 +-
.../CRM/Financial/BAO/ExportFormat/IIF.php | 2 +-
.../CRM/Financial/BAO/FinancialAccount.php | 2 +-
civicrm/CRM/Financial/BAO/FinancialItem.php | 2 +-
civicrm/CRM/Financial/BAO/FinancialType.php | 2 +-
.../Financial/BAO/FinancialTypeAccount.php | 2 +-
.../CRM/Financial/BAO/PaymentProcessor.php | 53 +-
.../Financial/BAO/PaymentProcessorType.php | 2 +-
.../CRM/Financial/Form/BatchTransaction.php | 2 +-
civicrm/CRM/Financial/Form/Export.php | 2 +-
.../CRM/Financial/Form/FinancialAccount.php | 2 +-
civicrm/CRM/Financial/Form/FinancialBatch.php | 2 +-
civicrm/CRM/Financial/Form/FinancialType.php | 2 +-
.../Financial/Form/FinancialTypeAccount.php | 2 +-
civicrm/CRM/Financial/Form/Payment.php | 2 +-
civicrm/CRM/Financial/Form/PaymentEdit.php | 2 +-
civicrm/CRM/Financial/Form/Search.php | 2 +-
civicrm/CRM/Financial/Page/AJAX.php | 2 +-
civicrm/CRM/Financial/Page/Batch.php | 2 +-
.../CRM/Financial/Page/BatchTransaction.php | 2 +-
.../CRM/Financial/Page/FinancialAccount.php | 2 +-
civicrm/CRM/Financial/Page/FinancialBatch.php | 2 +-
civicrm/CRM/Financial/Page/FinancialType.php | 2 +-
.../Financial/Page/FinancialTypeAccount.php | 2 +-
civicrm/CRM/Friend/BAO/Friend.php | 2 +-
civicrm/CRM/Friend/Form.php | 2 +-
civicrm/CRM/Friend/Form/Contribute.php | 2 +-
civicrm/CRM/Friend/Form/Event.php | 2 +-
civicrm/CRM/Grant/BAO/Grant.php | 2 +-
civicrm/CRM/Grant/BAO/Query.php | 16 +-
civicrm/CRM/Grant/Controller/Search.php | 2 +-
civicrm/CRM/Grant/Form/Grant.php | 2 +-
civicrm/CRM/Grant/Form/GrantView.php | 2 +-
civicrm/CRM/Grant/Form/Search.php | 2 +-
civicrm/CRM/Grant/Form/Task.php | 2 +-
civicrm/CRM/Grant/Form/Task/Delete.php | 2 +-
civicrm/CRM/Grant/Form/Task/Print.php | 2 +-
civicrm/CRM/Grant/Form/Task/Result.php | 2 +-
.../Grant/Form/Task/SearchTaskHookSample.php | 2 +-
civicrm/CRM/Grant/Form/Task/Update.php | 2 +-
civicrm/CRM/Grant/Info.php | 2 +-
civicrm/CRM/Grant/Page/DashBoard.php | 2 +-
civicrm/CRM/Grant/Page/Tab.php | 2 +-
civicrm/CRM/Grant/Selector/Search.php | 2 +-
civicrm/CRM/Grant/StateMachine/Search.php | 2 +-
civicrm/CRM/Grant/Task.php | 2 +-
civicrm/CRM/Group/Controller.php | 2 +-
civicrm/CRM/Group/Form/Edit.php | 2 +-
civicrm/CRM/Group/Form/Search.php | 2 +-
civicrm/CRM/Group/Page/AJAX.php | 2 +-
civicrm/CRM/Group/Page/Group.php | 2 +-
civicrm/CRM/Group/StateMachine.php | 2 +-
civicrm/CRM/Import/DataSource.php | 2 +-
civicrm/CRM/Import/DataSource/CSV.php | 2 +-
civicrm/CRM/Import/DataSource/SQL.php | 2 +-
civicrm/CRM/Import/Form/DataSource.php | 2 +-
civicrm/CRM/Import/Form/MapField.php | 2 +-
civicrm/CRM/Import/Form/Preview.php | 2 +-
civicrm/CRM/Import/Form/Summary.php | 2 +-
civicrm/CRM/Import/Parser.php | 2 +-
civicrm/CRM/Import/StateMachine.php | 2 +-
civicrm/CRM/Logging/Differ.php | 2 +-
civicrm/CRM/Logging/ReportDetail.php | 2 +-
civicrm/CRM/Logging/ReportSummary.php | 8 +-
civicrm/CRM/Logging/Reverter.php | 2 +-
civicrm/CRM/Logging/Schema.php | 2 +-
civicrm/CRM/Mailing/ActionTokens.php | 2 +-
civicrm/CRM/Mailing/BAO/BouncePattern.php | 2 +-
civicrm/CRM/Mailing/BAO/Component.php | 2 +-
civicrm/CRM/Mailing/BAO/Mailing.php | 13 +-
civicrm/CRM/Mailing/BAO/MailingAB.php | 2 +-
civicrm/CRM/Mailing/BAO/MailingJob.php | 2 +-
civicrm/CRM/Mailing/BAO/Query.php | 2 +-
civicrm/CRM/Mailing/BAO/Recipients.php | 2 +-
civicrm/CRM/Mailing/BAO/Spool.php | 2 +-
civicrm/CRM/Mailing/BAO/TrackableURL.php | 2 +-
civicrm/CRM/Mailing/Config.php | 2 +-
civicrm/CRM/Mailing/Controller/Send.php | 2 +-
civicrm/CRM/Mailing/Event/BAO/Bounce.php | 2 +-
civicrm/CRM/Mailing/Event/BAO/Confirm.php | 2 +-
civicrm/CRM/Mailing/Event/BAO/Delivered.php | 2 +-
civicrm/CRM/Mailing/Event/BAO/Forward.php | 2 +-
civicrm/CRM/Mailing/Event/BAO/Opened.php | 2 +-
civicrm/CRM/Mailing/Event/BAO/Queue.php | 2 +-
civicrm/CRM/Mailing/Event/BAO/Reply.php | 2 +-
civicrm/CRM/Mailing/Event/BAO/Resubscribe.php | 2 +-
civicrm/CRM/Mailing/Event/BAO/Subscribe.php | 2 +-
.../Mailing/Event/BAO/TrackableURLOpen.php | 27 +-
civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php | 2 +-
civicrm/CRM/Mailing/Form/Approve.php | 2 +-
civicrm/CRM/Mailing/Form/Browse.php | 2 +-
civicrm/CRM/Mailing/Form/Component.php | 2 +-
civicrm/CRM/Mailing/Form/ForwardMailing.php | 2 +-
civicrm/CRM/Mailing/Form/Optout.php | 2 +-
civicrm/CRM/Mailing/Form/Search.php | 2 +-
civicrm/CRM/Mailing/Form/Subscribe.php | 2 +-
civicrm/CRM/Mailing/Form/Task.php | 2 +-
.../CRM/Mailing/Form/Task/AdhocMailing.php | 2 +-
civicrm/CRM/Mailing/Form/Task/Print.php | 2 +-
civicrm/CRM/Mailing/Form/Unsubscribe.php | 2 +-
civicrm/CRM/Mailing/Info.php | 4 +-
civicrm/CRM/Mailing/MailStore.php | 2 +-
civicrm/CRM/Mailing/MailStore/Imap.php | 2 +-
civicrm/CRM/Mailing/MailStore/Localdir.php | 2 +-
civicrm/CRM/Mailing/MailStore/Maildir.php | 2 +-
civicrm/CRM/Mailing/MailStore/Mbox.php | 2 +-
civicrm/CRM/Mailing/MailStore/Pop3.php | 2 +-
civicrm/CRM/Mailing/Page/AJAX.php | 2 +-
civicrm/CRM/Mailing/Page/Browse.php | 2 +-
civicrm/CRM/Mailing/Page/Common.php | 2 +-
civicrm/CRM/Mailing/Page/Component.php | 2 +-
civicrm/CRM/Mailing/Page/Confirm.php | 2 +-
civicrm/CRM/Mailing/Page/Event.php | 2 +-
civicrm/CRM/Mailing/Page/Optout.php | 2 +-
civicrm/CRM/Mailing/Page/Preview.php | 2 +-
civicrm/CRM/Mailing/Page/Report.php | 2 +-
civicrm/CRM/Mailing/Page/Resubscribe.php | 2 +-
civicrm/CRM/Mailing/Page/Tab.php | 2 +-
civicrm/CRM/Mailing/Page/Unsubscribe.php | 2 +-
civicrm/CRM/Mailing/Page/View.php | 2 +-
civicrm/CRM/Mailing/PseudoConstant.php | 2 +-
civicrm/CRM/Mailing/Selector/Browse.php | 2 +-
civicrm/CRM/Mailing/Selector/Event.php | 2 +-
civicrm/CRM/Mailing/Selector/Search.php | 2 +-
civicrm/CRM/Mailing/Task.php | 2 +-
civicrm/CRM/Mailing/Tokens.php | 2 +-
civicrm/CRM/Member/ActionMapping.php | 2 +-
civicrm/CRM/Member/BAO/Membership.php | 2 +-
civicrm/CRM/Member/BAO/MembershipBlock.php | 2 +-
civicrm/CRM/Member/BAO/MembershipLog.php | 2 +-
civicrm/CRM/Member/BAO/MembershipPayment.php | 2 +-
civicrm/CRM/Member/BAO/MembershipStatus.php | 2 +-
civicrm/CRM/Member/BAO/MembershipType.php | 2 +-
civicrm/CRM/Member/BAO/Query.php | 2 +-
civicrm/CRM/Member/Controller/Search.php | 2 +-
civicrm/CRM/Member/Form.php | 2 +-
civicrm/CRM/Member/Form/Membership.php | 2 +-
civicrm/CRM/Member/Form/MembershipBlock.php | 2 +-
civicrm/CRM/Member/Form/MembershipConfig.php | 2 +-
civicrm/CRM/Member/Form/MembershipRenewal.php | 2 +-
civicrm/CRM/Member/Form/MembershipStatus.php | 2 +-
civicrm/CRM/Member/Form/MembershipType.php | 2 +-
civicrm/CRM/Member/Form/MembershipView.php | 2 +-
civicrm/CRM/Member/Form/Search.php | 2 +-
civicrm/CRM/Member/Form/Task.php | 2 +-
civicrm/CRM/Member/Form/Task/Batch.php | 7 +-
civicrm/CRM/Member/Form/Task/Delete.php | 2 +-
civicrm/CRM/Member/Form/Task/Email.php | 2 +-
civicrm/CRM/Member/Form/Task/Label.php | 2 +-
civicrm/CRM/Member/Form/Task/PDFLetter.php | 2 +-
civicrm/CRM/Member/Form/Task/PickProfile.php | 2 +-
civicrm/CRM/Member/Form/Task/Print.php | 2 +-
civicrm/CRM/Member/Form/Task/Result.php | 2 +-
.../Member/Form/Task/SearchTaskHookSample.php | 2 +-
civicrm/CRM/Member/Import/Controller.php | 2 +-
civicrm/CRM/Member/Import/Field.php | 2 +-
civicrm/CRM/Member/Import/Form/DataSource.php | 2 +-
civicrm/CRM/Member/Import/Form/MapField.php | 2 +-
civicrm/CRM/Member/Import/Form/Preview.php | 2 +-
civicrm/CRM/Member/Import/Form/Summary.php | 2 +-
civicrm/CRM/Member/Import/Parser.php | 2 +-
.../CRM/Member/Import/Parser/Membership.php | 2 +-
civicrm/CRM/Member/Info.php | 2 +-
civicrm/CRM/Member/Page/AJAX.php | 2 +-
civicrm/CRM/Member/Page/DashBoard.php | 2 +-
civicrm/CRM/Member/Page/MembershipStatus.php | 2 +-
civicrm/CRM/Member/Page/MembershipType.php | 2 +-
civicrm/CRM/Member/Page/Tab.php | 2 +-
civicrm/CRM/Member/Page/UserDashboard.php | 2 +-
civicrm/CRM/Member/PseudoConstant.php | 2 +-
civicrm/CRM/Member/Selector/Search.php | 2 +-
civicrm/CRM/Member/StateMachine/Search.php | 2 +-
civicrm/CRM/Member/StatusOverrideTypes.php | 2 +-
civicrm/CRM/Member/Task.php | 2 +-
civicrm/CRM/Member/Tokens.php | 2 +-
civicrm/CRM/Note/Form/Note.php | 2 +-
civicrm/CRM/PCP/BAO/PCP.php | 11 +-
civicrm/CRM/PCP/BAO/PCPBlock.php | 2 +-
civicrm/CRM/PCP/Controller/PCP.php | 2 +-
civicrm/CRM/PCP/Form/Campaign.php | 4 +-
civicrm/CRM/PCP/Form/Contribute.php | 2 +-
civicrm/CRM/PCP/Form/Event.php | 2 +-
civicrm/CRM/PCP/Form/PCP.php | 2 +-
civicrm/CRM/PCP/Form/PCPAccount.php | 2 +-
civicrm/CRM/PCP/Page/PCP.php | 2 +-
civicrm/CRM/PCP/Page/PCPInfo.php | 4 +-
civicrm/CRM/PCP/StateMachine/PCP.php | 2 +-
civicrm/CRM/Pledge/BAO/Pledge.php | 2 +-
civicrm/CRM/Pledge/BAO/PledgeBlock.php | 2 +-
civicrm/CRM/Pledge/BAO/PledgePayment.php | 2 +-
civicrm/CRM/Pledge/BAO/Query.php | 2 +-
civicrm/CRM/Pledge/Controller/Search.php | 2 +-
civicrm/CRM/Pledge/Form/Payment.php | 2 +-
civicrm/CRM/Pledge/Form/Pledge.php | 2 +-
civicrm/CRM/Pledge/Form/PledgeView.php | 2 +-
civicrm/CRM/Pledge/Form/Search.php | 2 +-
civicrm/CRM/Pledge/Form/Task.php | 2 +-
civicrm/CRM/Pledge/Form/Task/Delete.php | 2 +-
civicrm/CRM/Pledge/Form/Task/Print.php | 2 +-
civicrm/CRM/Pledge/Form/Task/Result.php | 2 +-
.../Pledge/Form/Task/SearchTaskHookSample.php | 2 +-
civicrm/CRM/Pledge/Info.php | 2 +-
civicrm/CRM/Pledge/Page/AJAX.php | 2 +-
civicrm/CRM/Pledge/Page/DashBoard.php | 2 +-
civicrm/CRM/Pledge/Page/Payment.php | 2 +-
civicrm/CRM/Pledge/Page/Tab.php | 2 +-
civicrm/CRM/Pledge/Page/UserDashboard.php | 2 +-
civicrm/CRM/Pledge/Selector/Search.php | 2 +-
civicrm/CRM/Pledge/StateMachine/Search.php | 2 +-
civicrm/CRM/Pledge/Task.php | 2 +-
civicrm/CRM/Price/BAO/LineItem.php | 2 +-
civicrm/CRM/Price/BAO/PriceField.php | 2 +-
civicrm/CRM/Price/BAO/PriceFieldValue.php | 2 +-
civicrm/CRM/Price/BAO/PriceSet.php | 2 +-
civicrm/CRM/Price/Form/DeleteField.php | 2 +-
civicrm/CRM/Price/Form/DeleteSet.php | 2 +-
civicrm/CRM/Price/Form/Field.php | 2 +-
civicrm/CRM/Price/Form/Option.php | 2 +-
civicrm/CRM/Price/Form/Preview.php | 2 +-
civicrm/CRM/Price/Form/Set.php | 2 +-
civicrm/CRM/Price/Page/Field.php | 2 +-
civicrm/CRM/Price/Page/Option.php | 2 +-
civicrm/CRM/Price/Page/Set.php | 4 +-
civicrm/CRM/Profile/Form.php | 8 +-
civicrm/CRM/Profile/Form/Dynamic.php | 2 +-
civicrm/CRM/Profile/Form/Edit.php | 2 +-
civicrm/CRM/Profile/Form/Search.php | 2 +-
civicrm/CRM/Profile/Page/Dynamic.php | 2 +-
civicrm/CRM/Profile/Page/Listings.php | 2 +-
.../Page/MultipleRecordFieldsListing.php | 2 +-
civicrm/CRM/Profile/Page/Router.php | 2 +-
civicrm/CRM/Profile/Page/View.php | 2 +-
civicrm/CRM/Profile/Selector/Listings.php | 2 +-
civicrm/CRM/Queue/BAO/QueueItem.php | 2 +-
civicrm/CRM/Queue/ErrorPolicy.php | 2 +-
civicrm/CRM/Queue/Menu.php | 2 +-
civicrm/CRM/Queue/Page/AJAX.php | 2 +-
civicrm/CRM/Queue/Page/Runner.php | 2 +-
civicrm/CRM/Queue/Queue.php | 2 +-
civicrm/CRM/Queue/Queue/Memory.php | 2 +-
civicrm/CRM/Queue/Queue/Sql.php | 2 +-
civicrm/CRM/Queue/Runner.php | 2 +-
civicrm/CRM/Queue/Service.php | 2 +-
civicrm/CRM/Queue/Task.php | 2 +-
civicrm/CRM/Queue/TaskContext.php | 2 +-
civicrm/CRM/Report/BAO/Hook.php | 2 +-
civicrm/CRM/Report/BAO/HookInterface.php | 2 +-
civicrm/CRM/Report/BAO/ReportInstance.php | 2 +-
civicrm/CRM/Report/Form.php | 478 +++++++++++--
civicrm/CRM/Report/Form/Activity.php | 2 +-
civicrm/CRM/Report/Form/ActivitySummary.php | 2 +-
.../Report/Form/Campaign/SurveyDetails.php | 2 +-
civicrm/CRM/Report/Form/Case/Demographics.php | 2 +-
civicrm/CRM/Report/Form/Case/Detail.php | 2 +-
civicrm/CRM/Report/Form/Case/Summary.php | 2 +-
civicrm/CRM/Report/Form/Case/TimeSpent.php | 2 +-
.../Report/Form/Contact/CurrentEmployer.php | 2 +-
civicrm/CRM/Report/Form/Contact/Detail.php | 2 +-
civicrm/CRM/Report/Form/Contact/Log.php | 2 +-
.../CRM/Report/Form/Contact/LoggingDetail.php | 2 +-
.../Report/Form/Contact/LoggingSummary.php | 9 +-
.../CRM/Report/Form/Contact/Relationship.php | 6 +-
civicrm/CRM/Report/Form/Contact/Summary.php | 47 +-
.../Report/Form/Contribute/Bookkeeping.php | 7 +-
.../Form/Contribute/DeferredRevenue.php | 2 +-
civicrm/CRM/Report/Form/Contribute/Detail.php | 68 +-
.../CRM/Report/Form/Contribute/History.php | 2 +-
.../Form/Contribute/HouseholdSummary.php | 2 +-
civicrm/CRM/Report/Form/Contribute/Lybunt.php | 3 +-
.../Form/Contribute/OrganizationSummary.php | 2 +-
civicrm/CRM/Report/Form/Contribute/PCP.php | 2 +-
civicrm/CRM/Report/Form/Contribute/Recur.php | 2 +-
.../Report/Form/Contribute/RecurSummary.php | 2 +-
civicrm/CRM/Report/Form/Contribute/Repeat.php | 2 +-
.../CRM/Report/Form/Contribute/SoftCredit.php | 4 +-
.../CRM/Report/Form/Contribute/Summary.php | 4 +-
civicrm/CRM/Report/Form/Contribute/Sybunt.php | 8 +-
.../CRM/Report/Form/Contribute/TopDonor.php | 2 +-
civicrm/CRM/Report/Form/Event.php | 2 +-
civicrm/CRM/Report/Form/Event/Income.php | 2 +-
.../Report/Form/Event/IncomeCountSummary.php | 10 +-
.../Form/Event/ParticipantListCount.php | 2 +-
.../Report/Form/Event/ParticipantListing.php | 2 +-
civicrm/CRM/Report/Form/Event/Summary.php | 8 +-
civicrm/CRM/Report/Form/Extended.php | 2 +-
civicrm/CRM/Report/Form/Grant/Detail.php | 2 +-
civicrm/CRM/Report/Form/Grant/Statistics.php | 2 +-
civicrm/CRM/Report/Form/Instance.php | 2 +-
civicrm/CRM/Report/Form/Mailing/Bounce.php | 4 +-
civicrm/CRM/Report/Form/Mailing/Clicks.php | 4 +-
civicrm/CRM/Report/Form/Mailing/Detail.php | 4 +-
civicrm/CRM/Report/Form/Mailing/Opened.php | 3 +-
civicrm/CRM/Report/Form/Mailing/Summary.php | 2 +-
.../Report/Form/Member/ContributionDetail.php | 2 +-
civicrm/CRM/Report/Form/Member/Detail.php | 2 +-
civicrm/CRM/Report/Form/Member/Lapse.php | 2 +-
civicrm/CRM/Report/Form/Member/Summary.php | 8 +-
.../CRM/Report/Form/Membership/Summary.php | 2 +-
civicrm/CRM/Report/Form/Pledge/Detail.php | 2 +-
civicrm/CRM/Report/Form/Pledge/Pbnp.php | 2 +-
civicrm/CRM/Report/Form/Pledge/Summary.php | 2 +-
civicrm/CRM/Report/Form/Register.php | 2 +-
civicrm/CRM/Report/Form/Walklist/Walklist.php | 2 +-
civicrm/CRM/Report/Info.php | 2 +-
civicrm/CRM/Report/Interface.php | 2 +-
civicrm/CRM/Report/Page/Instance.php | 2 +-
civicrm/CRM/Report/Page/InstanceList.php | 2 +-
civicrm/CRM/Report/Page/Options.php | 2 +-
civicrm/CRM/Report/Page/Report.php | 2 +-
civicrm/CRM/Report/Page/TemplateList.php | 2 +-
civicrm/CRM/Report/Utils/Get.php | 2 +-
civicrm/CRM/Report/Utils/Report.php | 2 +-
civicrm/CRM/SMS/BAO/Provider.php | 2 +-
civicrm/CRM/SMS/Controller/Send.php | 2 +-
civicrm/CRM/SMS/Form/Group.php | 2 +-
civicrm/CRM/SMS/Form/Provider.php | 2 +-
civicrm/CRM/SMS/Form/Schedule.php | 2 +-
civicrm/CRM/SMS/Form/Upload.php | 2 +-
civicrm/CRM/SMS/Message.php | 2 +-
civicrm/CRM/SMS/Page/Callback.php | 2 +-
civicrm/CRM/SMS/Page/Provider.php | 2 +-
civicrm/CRM/SMS/Provider.php | 28 +-
civicrm/CRM/SMS/StateMachine/Send.php | 2 +-
civicrm/CRM/Tag/Form/Edit.php | 2 +-
civicrm/CRM/Tag/Form/Merge.php | 2 +-
civicrm/CRM/Tag/Form/Tag.php | 2 +-
civicrm/CRM/Tag/Page/Tag.php | 2 +-
civicrm/CRM/UF/Form/AbstractPreview.php | 2 +-
civicrm/CRM/UF/Form/AdvanceSetting.php | 2 +-
civicrm/CRM/UF/Form/Field.php | 2 +-
civicrm/CRM/UF/Form/Group.php | 2 +-
civicrm/CRM/UF/Form/Inline/Preview.php | 2 +-
civicrm/CRM/UF/Form/Inline/PreviewById.php | 2 +-
civicrm/CRM/UF/Form/Preview.php | 2 +-
civicrm/CRM/UF/Page/AJAX.php | 2 +-
civicrm/CRM/UF/Page/Field.php | 2 +-
civicrm/CRM/UF/Page/Group.php | 2 +-
civicrm/CRM/Upgrade/Controller.php | 2 +-
civicrm/CRM/Upgrade/Form.php | 2 +-
civicrm/CRM/Upgrade/Headless.php | 2 +-
civicrm/CRM/Upgrade/Incremental/Base.php | 2 +-
civicrm/CRM/Upgrade/Incremental/General.php | 2 +-
.../CRM/Upgrade/Incremental/php/FiveOne.php | 2 +-
.../CRM/Upgrade/Incremental/php/FiveTwo.php | 87 +++
.../CRM/Upgrade/Incremental/php/FiveZero.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourFive.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourFour.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourSeven.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourSix.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourThree.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourTwo.php | 2 +-
.../CRM/Upgrade/Incremental/php/Template.php | 2 +-
.../Upgrade/Incremental/sql/5.1.2.mysql.tpl | 1 -
.../Upgrade/Incremental/sql/5.2.0.mysql.tpl | 1 +
.../Incremental/sql/5.2.alpha1.mysql.tpl | 10 +
.../Incremental/sql/5.2.beta1.mysql.tpl | 1 +
.../CRM/Upgrade/Incremental/sql/README.txt | 2 +-
civicrm/CRM/Upgrade/Page/Cleanup.php | 2 +-
civicrm/CRM/Upgrade/Page/Upgrade.php | 2 +-
.../Upgrade/Snapshot/V4p2/Price/BAO/Field.php | 2 +-
.../Snapshot/V4p2/Price/BAO/FieldValue.php | 2 +-
.../Snapshot/V4p2/Price/BAO/LineItem.php | 2 +-
.../Upgrade/Snapshot/V4p2/Price/BAO/Set.php | 2 +-
.../Upgrade/Snapshot/V4p2/Price/DAO/Field.php | 2 +-
.../Snapshot/V4p2/Price/DAO/FieldValue.php | 2 +-
.../Snapshot/V4p2/Price/DAO/LineItem.php | 2 +-
.../Upgrade/Snapshot/V4p2/Price/DAO/Set.php | 2 +-
.../Snapshot/V4p2/Price/DAO/SetEntity.php | 2 +-
civicrm/CRM/Upgrade/StateMachine.php | 2 +-
civicrm/CRM/Utils/API/AbstractFieldCoder.php | 2 +-
civicrm/CRM/Utils/API/HTMLInputCoder.php | 2 +-
civicrm/CRM/Utils/API/MatchOption.php | 2 +-
civicrm/CRM/Utils/API/NullOutputCoder.php | 2 +-
civicrm/CRM/Utils/API/ReloadOption.php | 2 +-
civicrm/CRM/Utils/Address.php | 2 +-
civicrm/CRM/Utils/Address/BatchUpdate.php | 2 +-
civicrm/CRM/Utils/Address/USPS.php | 2 +-
civicrm/CRM/Utils/Array.php | 2 +-
civicrm/CRM/Utils/AutoClean.php | 2 +-
civicrm/CRM/Utils/Cache.php | 2 +-
civicrm/CRM/Utils/Cache/APCcache.php | 2 +-
civicrm/CRM/Utils/Cache/ArrayCache.php | 2 +-
civicrm/CRM/Utils/Cache/Interface.php | 2 +-
civicrm/CRM/Utils/Cache/Memcache.php | 2 +-
civicrm/CRM/Utils/Cache/Memcached.php | 2 +-
civicrm/CRM/Utils/Cache/NoCache.php | 2 +-
civicrm/CRM/Utils/Cache/Redis.php | 2 +-
civicrm/CRM/Utils/Cache/SerializeCache.php | 2 +-
civicrm/CRM/Utils/Cache/SqlGroup.php | 2 +-
civicrm/CRM/Utils/Check.php | 2 +-
civicrm/CRM/Utils/Check/Component.php | 2 +-
civicrm/CRM/Utils/Check/Component/Case.php | 2 +-
civicrm/CRM/Utils/Check/Component/Env.php | 2 +-
.../Check/Component/FinancialTypeAcls.php | 2 +-
.../Utils/Check/Component/OptionGroups.php | 2 +-
.../CRM/Utils/Check/Component/PriceFields.php | 2 +-
civicrm/CRM/Utils/Check/Component/Schema.php | 2 +-
.../CRM/Utils/Check/Component/Security.php | 2 +-
civicrm/CRM/Utils/Check/Component/Source.php | 2 +-
.../CRM/Utils/Check/Component/Timestamps.php | 2 +-
civicrm/CRM/Utils/Check/Message.php | 2 +-
civicrm/CRM/Utils/Color.php | 2 +-
civicrm/CRM/Utils/ConsoleTee.php | 2 +-
civicrm/CRM/Utils/Constant.php | 2 +-
civicrm/CRM/Utils/Crypt.php | 2 +-
civicrm/CRM/Utils/Date.php | 30 +-
civicrm/CRM/Utils/DeprecatedUtils.php | 2 +-
civicrm/CRM/Utils/EnglishNumber.php | 2 +-
civicrm/CRM/Utils/FakeObject.php | 2 +-
civicrm/CRM/Utils/File.php | 2 +-
civicrm/CRM/Utils/Geocode.php | 2 +-
civicrm/CRM/Utils/Geocode/Google.php | 2 +-
civicrm/CRM/Utils/GeocodeProvider.php | 2 +-
civicrm/CRM/Utils/GlobalStack.php | 2 +-
civicrm/CRM/Utils/Hook.php | 2 +-
civicrm/CRM/Utils/Hook/Backdrop.php | 2 +-
civicrm/CRM/Utils/Hook/Drupal.php | 2 +-
civicrm/CRM/Utils/Hook/Drupal6.php | 2 +-
civicrm/CRM/Utils/Hook/Drupal8.php | 2 +-
civicrm/CRM/Utils/Hook/DrupalBase.php | 2 +-
civicrm/CRM/Utils/Hook/Joomla.php | 2 +-
civicrm/CRM/Utils/Hook/Soap.php | 2 +-
civicrm/CRM/Utils/Hook/UnitTests.php | 2 +-
civicrm/CRM/Utils/Hook/WordPress.php | 2 +-
civicrm/CRM/Utils/Http.php | 2 +-
civicrm/CRM/Utils/HttpClient.php | 2 +-
civicrm/CRM/Utils/ICalendar.php | 2 +-
civicrm/CRM/Utils/JS.php | 2 +-
civicrm/CRM/Utils/JSON.php | 2 +-
civicrm/CRM/Utils/Mail.php | 2 +-
civicrm/CRM/Utils/Mail/EmailProcessor.php | 2 +-
civicrm/CRM/Utils/Mail/Incoming.php | 2 +-
civicrm/CRM/Utils/Migrate/Export.php | 2 +-
civicrm/CRM/Utils/Migrate/ExportJSON.php | 2 +-
civicrm/CRM/Utils/Migrate/Import.php | 2 +-
civicrm/CRM/Utils/Migrate/ImportJSON.php | 2 +-
civicrm/CRM/Utils/Money.php | 2 +-
civicrm/CRM/Utils/Network.php | 2 +-
civicrm/CRM/Utils/Number.php | 2 +-
civicrm/CRM/Utils/OpenFlashChart.php | 2 +-
civicrm/CRM/Utils/OptionBag.php | 2 +-
civicrm/CRM/Utils/PDF/Document.php | 2 +-
civicrm/CRM/Utils/PDF/Label.php | 2 +-
civicrm/CRM/Utils/PDF/Utils.php | 2 +-
civicrm/CRM/Utils/Pager.php | 2 +-
civicrm/CRM/Utils/PagerAToZ.php | 2 +-
civicrm/CRM/Utils/PseudoConstant.php | 2 +-
civicrm/CRM/Utils/QueryFormatter.php | 2 +-
civicrm/CRM/Utils/REST.php | 2 +-
civicrm/CRM/Utils/ReCAPTCHA.php | 2 +-
civicrm/CRM/Utils/Recent.php | 2 +-
civicrm/CRM/Utils/Request.php | 2 +-
civicrm/CRM/Utils/Rule.php | 2 +-
civicrm/CRM/Utils/SQL.php | 15 +-
civicrm/CRM/Utils/SQL/Select.php | 2 +-
civicrm/CRM/Utils/Signer.php | 2 +-
civicrm/CRM/Utils/SoapServer.php | 2 +-
civicrm/CRM/Utils/Sort.php | 2 +-
civicrm/CRM/Utils/String.php | 2 +-
civicrm/CRM/Utils/System.php | 2 +-
civicrm/CRM/Utils/System/Backdrop.php | 2 +-
civicrm/CRM/Utils/System/Drupal.php | 2 +-
civicrm/CRM/Utils/System/Drupal6.php | 2 +-
civicrm/CRM/Utils/System/Drupal8.php | 14 +-
civicrm/CRM/Utils/System/DrupalBase.php | 2 +-
civicrm/CRM/Utils/System/Joomla.php | 12 +-
civicrm/CRM/Utils/System/Soap.php | 2 +-
civicrm/CRM/Utils/System/UnitTests.php | 2 +-
civicrm/CRM/Utils/System/WordPress.php | 2 +-
civicrm/CRM/Utils/SystemLogger.php | 2 +-
civicrm/CRM/Utils/Time.php | 2 +-
civicrm/CRM/Utils/Token.php | 12 +-
civicrm/CRM/Utils/Type.php | 2 +-
civicrm/CRM/Utils/Url.php | 2 +-
civicrm/CRM/Utils/Verp.php | 2 +-
civicrm/CRM/Utils/VersionCheck.php | 9 +-
civicrm/CRM/Utils/VisualBundle.php | 2 +-
civicrm/CRM/Utils/Weight.php | 2 +-
civicrm/CRM/Utils/Wrapper.php | 2 +-
civicrm/CRM/Utils/XML.php | 2 +-
civicrm/CRM/Utils/Zip.php | 2 +-
civicrm/Civi/API/Api3SelectQuery.php | 2 +-
civicrm/Civi/API/Event/AuthorizeEvent.php | 2 +-
civicrm/Civi/API/Event/Event.php | 2 +-
civicrm/Civi/API/Event/ExceptionEvent.php | 2 +-
civicrm/Civi/API/Event/PrepareEvent.php | 2 +-
civicrm/Civi/API/Event/ResolveEvent.php | 2 +-
civicrm/Civi/API/Event/RespondEvent.php | 2 +-
civicrm/Civi/API/Events.php | 2 +-
civicrm/Civi/API/Kernel.php | 2 +-
civicrm/Civi/API/Provider/AdhocProvider.php | 2 +-
.../API/Provider/MagicFunctionProvider.php | 2 +-
.../Civi/API/Provider/ProviderInterface.php | 2 +-
.../Civi/API/Provider/ReflectionProvider.php | 2 +-
civicrm/Civi/API/Provider/StaticProvider.php | 2 +-
civicrm/Civi/API/Request.php | 2 +-
civicrm/Civi/API/SelectQuery.php | 2 +-
.../API/Subscriber/APIv3SchemaAdapter.php | 2 +-
.../Civi/API/Subscriber/ChainSubscriber.php | 2 +-
.../API/Subscriber/DynamicFKAuthorization.php | 2 +-
.../Civi/API/Subscriber/I18nSubscriber.php | 2 +-
.../Civi/API/Subscriber/PermissionCheck.php | 2 +-
.../API/Subscriber/TransactionSubscriber.php | 2 +-
.../API/Subscriber/WhitelistSubscriber.php | 2 +-
.../Civi/API/Subscriber/WrapperAdapter.php | 2 +-
.../Civi/API/Subscriber/XDebugSubscriber.php | 2 +-
civicrm/Civi/API/WhitelistRule.php | 2 +-
civicrm/Civi/ActionSchedule/Mapping.php | 2 +-
.../Civi/ActionSchedule/MappingInterface.php | 2 +-
.../Civi/ActionSchedule/RecipientBuilder.php | 2 +-
civicrm/Civi/CCase/Analyzer.php | 2 +-
civicrm/Civi/CCase/CaseChangeListener.php | 2 +-
civicrm/Civi/CCase/Event/CaseChangeEvent.php | 2 +-
civicrm/Civi/CCase/Events.php | 2 +-
civicrm/Civi/Core/DAO/Event/PostDelete.php | 2 +-
civicrm/Civi/Core/DAO/Event/PostUpdate.php | 2 +-
civicrm/Civi/Core/DAO/Event/PreDelete.php | 2 +-
civicrm/Civi/Core/DatabaseInitializer.php | 2 +-
civicrm/Civi/Core/Event/GenericHookEvent.php | 2 +-
civicrm/Civi/Core/Event/PostEvent.php | 2 +-
civicrm/Civi/Core/Event/PreEvent.php | 2 +-
.../Civi/Core/Event/SystemInstallEvent.php | 2 +-
.../Core/Event/UnhandledExceptionEvent.php | 2 +-
civicrm/Civi/Core/InstallationCanary.php | 2 +-
civicrm/Civi/Core/LocalizationInitializer.php | 2 +-
civicrm/Civi/Core/Lock/LockInterface.php | 2 +-
civicrm/Civi/Core/Lock/LockManager.php | 2 +-
civicrm/Civi/Core/Lock/NullLock.php | 2 +-
civicrm/Civi/Core/SettingsBag.php | 2 +-
civicrm/Civi/Core/SettingsManager.php | 2 +-
civicrm/Civi/Core/SettingsMetadata.php | 2 +-
.../Civi/Core/SqlTrigger/StaticTriggers.php | 2 +-
.../Core/SqlTrigger/TimestampTriggers.php | 2 +-
civicrm/Civi/Core/SqlTriggers.php | 2 +-
civicrm/Civi/Core/Transaction/Frame.php | 2 +-
civicrm/Civi/Core/Transaction/Manager.php | 2 +-
civicrm/Civi/Test/Api3TestTrait.php | 2 +-
.../Civi/Token/AbstractTokenSubscriber.php | 2 +-
civicrm/ang/crmCaseType.js | 10 +-
civicrm/ang/crmMailing/BlockMailing.html | 8 +-
civicrm/ang/crmMailing/BlockPreview.html | 11 +-
civicrm/ang/crmMailing/BlockPreview.js | 15 +-
civicrm/ang/crmMailingAB/EditCtrl/report.html | 2 +-
civicrm/ang/crmMailingAB/ReportCtrl.js | 6 +-
civicrm/api/v3/Acl.php | 2 +-
civicrm/api/v3/AclRole.php | 2 +-
civicrm/api/v3/ActionSchedule.php | 2 +-
civicrm/api/v3/Activity.php | 2 +-
civicrm/api/v3/ActivityContact.php | 2 +-
civicrm/api/v3/ActivityType.php | 2 +-
civicrm/api/v3/Address.php | 2 +-
civicrm/api/v3/Attachment.php | 2 +-
civicrm/api/v3/Batch.php | 2 +-
civicrm/api/v3/Campaign.php | 2 +-
civicrm/api/v3/Case.php | 2 +-
civicrm/api/v3/CaseContact.php | 2 +-
civicrm/api/v3/CaseType.php | 2 +-
civicrm/api/v3/Constant.php | 2 +-
civicrm/api/v3/Contact.php | 2 +-
civicrm/api/v3/ContactType.php | 2 +-
civicrm/api/v3/Contribution.php | 2 +-
civicrm/api/v3/ContributionPage.php | 2 +-
civicrm/api/v3/ContributionProduct.php | 2 +-
civicrm/api/v3/ContributionRecur.php | 2 +-
civicrm/api/v3/ContributionSoft.php | 2 +-
civicrm/api/v3/Country.php | 2 +-
civicrm/api/v3/CustomField.php | 2 +-
civicrm/api/v3/CustomGroup.php | 2 +-
civicrm/api/v3/CustomSearch.php | 2 +-
civicrm/api/v3/CustomValue.php | 2 +-
civicrm/api/v3/Cxn.php | 2 +-
civicrm/api/v3/CxnApp.php | 2 +-
civicrm/api/v3/Dashboard.php | 2 +-
civicrm/api/v3/DashboardContact.php | 2 +-
civicrm/api/v3/Domain.php | 2 +-
civicrm/api/v3/Email.php | 2 +-
civicrm/api/v3/EntityBatch.php | 2 +-
civicrm/api/v3/EntityFinancialAccount.php | 2 +-
civicrm/api/v3/EntityFinancialTrxn.php | 2 +-
civicrm/api/v3/EntityTag.php | 2 +-
civicrm/api/v3/Event.php | 2 +-
civicrm/api/v3/Extension.php | 2 +-
civicrm/api/v3/File.php | 2 +-
civicrm/api/v3/FinancialAccount.php | 2 +-
civicrm/api/v3/FinancialItem.php | 2 +-
civicrm/api/v3/FinancialTrxn.php | 2 +-
civicrm/api/v3/FinancialType.php | 2 +-
civicrm/api/v3/Generic.php | 9 +-
civicrm/api/v3/Generic/Getactions.php | 2 +-
civicrm/api/v3/Generic/Getlist.php | 2 +-
civicrm/api/v3/Generic/Getunique.php | 54 ++
civicrm/api/v3/Generic/Setvalue.php | 2 +-
civicrm/api/v3/Generic/Update.php | 2 +-
civicrm/api/v3/Generic/Validate.php | 2 +-
civicrm/api/v3/Grant.php | 2 +-
civicrm/api/v3/Group.php | 2 +-
civicrm/api/v3/GroupContact.php | 2 +-
civicrm/api/v3/GroupNesting.php | 2 +-
civicrm/api/v3/GroupOrganization.php | 2 +-
civicrm/api/v3/Im.php | 2 +-
civicrm/api/v3/Job.php | 2 +-
civicrm/api/v3/JobLog.php | 2 +-
civicrm/api/v3/LineItem.php | 2 +-
civicrm/api/v3/LocBlock.php | 2 +-
civicrm/api/v3/LocationType.php | 2 +-
civicrm/api/v3/Logging.php | 2 +-
civicrm/api/v3/MailSettings.php | 2 +-
civicrm/api/v3/Mailing.php | 10 +-
civicrm/api/v3/MailingAB.php | 2 +-
civicrm/api/v3/MailingComponent.php | 2 +-
civicrm/api/v3/MailingContact.php | 2 +-
civicrm/api/v3/MailingEventConfirm.php | 2 +-
civicrm/api/v3/MailingEventQueue.php | 2 +-
civicrm/api/v3/MailingEventResubscribe.php | 2 +-
civicrm/api/v3/MailingEventSubscribe.php | 2 +-
civicrm/api/v3/MailingEventUnsubscribe.php | 2 +-
civicrm/api/v3/MailingGroup.php | 2 +-
civicrm/api/v3/MailingJob.php | 2 +-
civicrm/api/v3/MailingRecipients.php | 2 +-
civicrm/api/v3/Mapping.php | 2 +-
civicrm/api/v3/MappingField.php | 2 +-
civicrm/api/v3/Membership.php | 2 +-
civicrm/api/v3/MembershipBlock.php | 2 +-
civicrm/api/v3/MembershipLog.php | 2 +-
civicrm/api/v3/MembershipPayment.php | 2 +-
civicrm/api/v3/MembershipStatus.php | 2 +-
civicrm/api/v3/MembershipType.php | 2 +-
civicrm/api/v3/MessageTemplate.php | 2 +-
civicrm/api/v3/Navigation.php | 2 +-
civicrm/api/v3/Note.php | 2 +-
civicrm/api/v3/OpenID.php | 2 +-
civicrm/api/v3/OptionGroup.php | 2 +-
civicrm/api/v3/OptionValue.php | 2 +-
civicrm/api/v3/Order.php | 2 +-
civicrm/api/v3/Participant.php | 2 +-
civicrm/api/v3/ParticipantPayment.php | 2 +-
civicrm/api/v3/ParticipantStatusType.php | 2 +-
civicrm/api/v3/Payment.php | 2 +-
civicrm/api/v3/PaymentProcessor.php | 2 +-
civicrm/api/v3/PaymentProcessorType.php | 2 +-
civicrm/api/v3/PaymentToken.php | 2 +-
civicrm/api/v3/Pcp.php | 2 +-
civicrm/api/v3/Phone.php | 2 +-
civicrm/api/v3/Phone/Get.php | 2 +-
civicrm/api/v3/Pledge.php | 2 +-
civicrm/api/v3/PledgePayment.php | 2 +-
civicrm/api/v3/Premium.php | 2 +-
civicrm/api/v3/PriceField.php | 2 +-
civicrm/api/v3/PriceFieldValue.php | 2 +-
civicrm/api/v3/PriceSet.php | 2 +-
civicrm/api/v3/PrintLabel.php | 2 +-
civicrm/api/v3/Product.php | 2 +-
civicrm/api/v3/Profile.php | 2 +-
civicrm/api/v3/RecurringEntity.php | 2 +-
civicrm/api/v3/Relationship.php | 52 +-
civicrm/api/v3/RelationshipType.php | 2 +-
civicrm/api/v3/ReportInstance.php | 2 +-
civicrm/api/v3/ReportTemplate.php | 2 +-
civicrm/api/v3/RuleGroup.php | 2 +-
civicrm/api/v3/SavedSearch.php | 2 +-
civicrm/api/v3/Setting.php | 2 +-
civicrm/api/v3/SmsProvider.php | 2 +-
civicrm/api/v3/StateProvince.php | 2 +-
civicrm/api/v3/StatusPreference.php | 2 +-
civicrm/api/v3/Survey.php | 2 +-
civicrm/api/v3/SurveyRespondant.php | 2 +-
civicrm/api/v3/System.php | 2 +-
civicrm/api/v3/SystemLog.php | 2 +-
civicrm/api/v3/Tag.php | 2 +-
civicrm/api/v3/UFField.php | 2 +-
civicrm/api/v3/UFGroup.php | 2 +-
civicrm/api/v3/UFJoin.php | 2 +-
civicrm/api/v3/UFMatch.php | 2 +-
civicrm/api/v3/User.php | 2 +-
civicrm/api/v3/Website.php | 2 +-
civicrm/api/v3/WordReplacement.php | 2 +-
civicrm/api/v3/utils.php | 2 +-
civicrm/bin/ContributionProcessor.php | 2 +-
civicrm/bin/cli.class.php | 2 +-
civicrm/bin/cli.php | 2 +-
civicrm/bin/cron.php | 2 +-
civicrm/bin/csv/delete.php | 2 +-
civicrm/bin/csv/export.php | 2 +-
civicrm/bin/csv/import.php | 2 +-
civicrm/bin/migrate/export.php | 2 +-
civicrm/bin/migrate/exportJSON.php | 2 +-
civicrm/bin/migrate/import.php | 2 +-
civicrm/bin/migrate/importJSON.php | 2 +-
civicrm/bin/migrate/move.php | 2 +-
civicrm/civicrm-version.php | 2 +-
civicrm/extern/authorizeIPN.php | 2 +-
civicrm/extern/cxn.php | 2 +-
civicrm/extern/ipn.php | 2 +-
civicrm/extern/rest.php | 2 +-
civicrm/extern/soap.php | 2 +-
civicrm/extern/widget.php | 2 +-
civicrm/install/civicrm.php | 2 +-
civicrm/js/crm.optionEdit.js | 7 +-
civicrm/packages/Mail/mail.php | 3 +-
civicrm/packages/Mail/sendmail.php | 3 +-
civicrm/packages/Mail/smtp.php | 3 +-
.../packages/kcfinder/core/class/uploader.php | 45 +-
civicrm/release-notes.md | 11 +
civicrm/release-notes/5.2.0.md | 503 ++++++++++++++
civicrm/settings/Address.setting.php | 2 +-
civicrm/settings/Campaign.setting.php | 2 +-
civicrm/settings/Case.setting.php | 2 +-
civicrm/settings/Contribute.setting.php | 2 +-
civicrm/settings/Core.setting.php | 3 +-
civicrm/settings/Developer.setting.php | 2 +-
civicrm/settings/Directory.setting.php | 2 +-
civicrm/settings/Event.setting.php | 2 +-
civicrm/settings/Extension.setting.php | 2 +-
civicrm/settings/Localization.setting.php | 2 +-
civicrm/settings/Mailing.setting.php | 2 +-
civicrm/settings/Map.setting.php | 2 +-
civicrm/settings/Member.setting.php | 2 +-
civicrm/settings/Multisite.setting.php | 2 +-
civicrm/settings/Search.setting.php | 2 +-
civicrm/settings/Url.setting.php | 2 +-
civicrm/sql/case_sample.mysql | 2 +-
civicrm/sql/civicrm.mysql | 12 +-
civicrm/sql/civicrm_acl.mysql | 4 +-
civicrm/sql/civicrm_case_sql.mysql | 2 +-
civicrm/sql/civicrm_data.mysql | 14 +-
civicrm/sql/civicrm_demo_processor.mysql | 2 +-
civicrm/sql/civicrm_devel_config.mysql | 2 +-
civicrm/sql/civicrm_drop.mysql | 4 +-
civicrm/sql/civicrm_generated.mysql | 6 +-
civicrm/sql/civicrm_navigation.mysql | 4 +-
civicrm/sql/civicrm_sample.mysql | 4 +-
civicrm/sql/civicrm_sample_custom_data.mysql | 2 +-
civicrm/templates/CRM/ACL/Form/ACL.tpl | 2 +-
civicrm/templates/CRM/ACL/Form/ACLBasic.tpl | 2 +-
civicrm/templates/CRM/ACL/Form/EntityRole.tpl | 2 +-
.../CRM/ACL/Form/WordPress/Permissions.tpl | 2 +-
civicrm/templates/CRM/ACL/Header.tpl | 2 +-
civicrm/templates/CRM/ACL/Page/ACL.tpl | 2 +-
civicrm/templates/CRM/ACL/Page/ACLBasic.tpl | 2 +-
civicrm/templates/CRM/ACL/Page/EntityRole.tpl | 2 +-
.../templates/CRM/Activity/Calendar/ICal.tpl | 2 +-
.../templates/CRM/Activity/Form/Activity.hlp | 2 +-
.../templates/CRM/Activity/Form/Activity.tpl | 2 +-
.../CRM/Activity/Form/ActivityJs.tpl | 2 +-
.../CRM/Activity/Form/ActivityLinks.tpl | 2 +-
.../CRM/Activity/Form/ActivityView.tpl | 2 +-
.../templates/CRM/Activity/Form/Search.tpl | 2 +-
.../CRM/Activity/Form/Search/Common.tpl | 2 +-
.../CRM/Activity/Form/Search/EmptyResults.tpl | 2 +-
.../templates/CRM/Activity/Form/Selector.tpl | 2 +-
civicrm/templates/CRM/Activity/Form/Task.tpl | 2 +-
.../CRM/Activity/Form/Task/AddToTag.tpl | 2 +-
.../CRM/Activity/Form/Task/Batch.tpl | 2 +-
.../CRM/Activity/Form/Task/Delete.tpl | 2 +-
.../CRM/Activity/Form/Task/Email.tpl | 2 +-
.../CRM/Activity/Form/Task/FileOnCase.tpl | 2 +-
.../CRM/Activity/Form/Task/PickOption.tpl | 2 +-
.../CRM/Activity/Form/Task/PickProfile.tpl | 2 +-
.../CRM/Activity/Form/Task/Print.tpl | 2 +-
.../CRM/Activity/Form/Task/RemoveFromTag.tpl | 2 +-
.../templates/CRM/Activity/Form/Task/SMS.tpl | 2 +-
.../Form/Task/SearchTaskHookSample.tpl | 2 +-
.../CRM/Activity/Import/Form/DataSource.hlp | 2 +-
.../CRM/Activity/Import/Form/DataSource.tpl | 2 +-
.../CRM/Activity/Import/Form/MapField.tpl | 2 +-
.../CRM/Activity/Import/Form/MapTable.tpl | 2 +-
.../CRM/Activity/Import/Form/Preview.tpl | 2 +-
.../CRM/Activity/Import/Form/Summary.tpl | 2 +-
civicrm/templates/CRM/Activity/Page/Tab.tpl | 2 +-
.../CRM/Activity/Page/UserDashboard.tpl | 2 +-
.../CRM/Activity/Selector/Activity.tpl | 2 +-
.../CRM/Activity/Selector/Selector.tpl | 2 +-
civicrm/templates/CRM/Admin/Form/CMSUser.tpl | 2 +-
.../templates/CRM/Admin/Form/ContactType.tpl | 2 +-
.../templates/CRM/Admin/Form/Extensions.tpl | 2 +-
civicrm/templates/CRM/Admin/Form/Job.tpl | 2 +-
.../templates/CRM/Admin/Form/LabelFormats.tpl | 2 +-
.../templates/CRM/Admin/Form/LocationType.tpl | 2 +-
.../templates/CRM/Admin/Form/MailSettings.tpl | 2 +-
civicrm/templates/CRM/Admin/Form/Mapping.tpl | 2 +-
.../CRM/Admin/Form/MessageTemplates.tpl | 2 +-
.../templates/CRM/Admin/Form/Navigation.hlp | 2 +-
.../templates/CRM/Admin/Form/Navigation.tpl | 2 +-
.../templates/CRM/Admin/Form/OptionGroup.tpl | 2 +-
civicrm/templates/CRM/Admin/Form/Options.tpl | 2 +-
.../CRM/Admin/Form/ParticipantStatusType.tpl | 2 +-
.../CRM/Admin/Form/PaymentProcessor.tpl | 2 +-
.../CRM/Admin/Form/PaymentProcessorType.tpl | 2 +-
.../templates/CRM/Admin/Form/PdfFormats.tpl | 2 +-
.../CRM/Admin/Form/Preferences/Address.hlp | 2 +-
.../CRM/Admin/Form/Preferences/Address.tpl | 2 +-
.../CRM/Admin/Form/Preferences/Campaign.tpl | 2 +-
.../CRM/Admin/Form/Preferences/Contribute.hlp | 2 +-
.../CRM/Admin/Form/Preferences/Contribute.tpl | 2 +-
.../CRM/Admin/Form/Preferences/Display.hlp | 2 +-
.../CRM/Admin/Form/Preferences/Display.tpl | 2 +-
.../CRM/Admin/Form/Preferences/Event.tpl | 2 +-
.../CRM/Admin/Form/Preferences/Mailing.tpl | 2 +-
.../CRM/Admin/Form/Preferences/Member.tpl | 2 +-
.../CRM/Admin/Form/Preferences/Multisite.tpl | 2 +-
.../CRM/Admin/Form/PreferencesDate.tpl | 2 +-
.../CRM/Admin/Form/RelationshipType.tpl | 2 +-
.../CRM/Admin/Form/ScheduleReminders.tpl | 6 +-
.../templates/CRM/Admin/Form/Setting/Case.tpl | 2 +-
.../CRM/Admin/Form/Setting/Component.hlp | 2 +-
.../CRM/Admin/Form/Setting/Component.tpl | 2 +-
.../templates/CRM/Admin/Form/Setting/Date.hlp | 2 +-
.../templates/CRM/Admin/Form/Setting/Date.tpl | 2 +-
.../CRM/Admin/Form/Setting/Debugging.hlp | 2 +-
.../CRM/Admin/Form/Setting/Debugging.tpl | 2 +-
.../CRM/Admin/Form/Setting/Event.tpl | 2 +-
.../CRM/Admin/Form/Setting/Localization.hlp | 2 +-
.../CRM/Admin/Form/Setting/Localization.tpl | 2 +-
.../templates/CRM/Admin/Form/Setting/Mail.tpl | 2 +-
.../CRM/Admin/Form/Setting/Mapping.hlp | 2 +-
.../CRM/Admin/Form/Setting/Mapping.tpl | 2 +-
.../CRM/Admin/Form/Setting/Miscellaneous.tpl | 2 +-
.../templates/CRM/Admin/Form/Setting/Path.tpl | 2 +-
.../CRM/Admin/Form/Setting/Search.tpl | 2 +-
.../CRM/Admin/Form/Setting/SettingForm.tpl | 2 +-
.../templates/CRM/Admin/Form/Setting/Smtp.hlp | 2 +-
.../templates/CRM/Admin/Form/Setting/Smtp.tpl | 2 +-
.../templates/CRM/Admin/Form/Setting/UF.tpl | 2 +-
.../Form/Setting/UpdateConfigBackend.tpl | 2 +-
.../templates/CRM/Admin/Form/Setting/Url.hlp | 2 +-
.../templates/CRM/Admin/Form/Setting/Url.tpl | 2 +-
.../CRM/Admin/Form/WordReplacements.hlp | 2 +-
.../CRM/Admin/Form/WordReplacements.tpl | 2 +-
.../templates/CRM/Admin/Page/APIExplorer.hlp | 2 +-
.../templates/CRM/Admin/Page/APIExplorer.tpl | 17 +-
civicrm/templates/CRM/Admin/Page/Access.tpl | 2 +-
civicrm/templates/CRM/Admin/Page/Admin.tpl | 2 +-
.../CRM/Admin/Page/CKEditorConfig.tpl | 2 +-
.../CRM/Admin/Page/ConfigTaskList.tpl | 2 +-
.../templates/CRM/Admin/Page/ContactType.hlp | 2 +-
.../templates/CRM/Admin/Page/ContactType.tpl | 2 +-
.../CRM/Admin/Page/EventTemplate.tpl | 2 +-
.../templates/CRM/Admin/Page/Extensions.tpl | 2 +-
civicrm/templates/CRM/Admin/Page/Job.tpl | 2 +-
civicrm/templates/CRM/Admin/Page/JobLog.tpl | 2 +-
.../templates/CRM/Admin/Page/LabelFormats.tpl | 2 +-
.../templates/CRM/Admin/Page/LocationType.tpl | 2 +-
.../templates/CRM/Admin/Page/MailSettings.tpl | 2 +-
civicrm/templates/CRM/Admin/Page/Mapping.tpl | 2 +-
.../CRM/Admin/Page/MessageTemplates.hlp | 2 +-
.../CRM/Admin/Page/MessageTemplates.tpl | 2 +-
.../templates/CRM/Admin/Page/Navigation.hlp | 2 +-
.../templates/CRM/Admin/Page/Navigation.tpl | 2 +-
.../templates/CRM/Admin/Page/OptionGroup.tpl | 2 +-
civicrm/templates/CRM/Admin/Page/Options.hlp | 2 +-
civicrm/templates/CRM/Admin/Page/Options.tpl | 2 +-
.../CRM/Admin/Page/ParticipantStatusType.hlp | 2 +-
.../CRM/Admin/Page/ParticipantStatusType.tpl | 2 +-
.../CRM/Admin/Page/PaymentProcessor.hlp | 2 +-
.../CRM/Admin/Page/PaymentProcessor.tpl | 2 +-
.../CRM/Admin/Page/PaymentProcessorType.tpl | 2 +-
.../templates/CRM/Admin/Page/PdfFormats.tpl | 2 +-
.../CRM/Admin/Page/PreferencesDate.tpl | 2 +-
.../CRM/Admin/Page/RelationshipType.hlp | 2 +-
.../CRM/Admin/Page/RelationshipType.tpl | 2 +-
.../templates/CRM/Admin/Page/Reminders.tpl | 2 +-
.../CRM/Admin/Page/ScheduleReminders.hlp | 2 +-
.../CRM/Admin/Page/ScheduleReminders.tpl | 2 +-
civicrm/templates/CRM/Admin/Page/Setting.tpl | 2 +-
civicrm/templates/CRM/Badge/Form/Layout.tpl | 2 +-
civicrm/templates/CRM/Badge/Page/Layout.hlp | 2 +-
civicrm/templates/CRM/Badge/Page/Layout.tpl | 2 +-
civicrm/templates/CRM/Batch/Form/Batch.tpl | 2 +-
civicrm/templates/CRM/Batch/Form/Entry.tpl | 2 +-
civicrm/templates/CRM/Batch/Form/Search.tpl | 2 +-
civicrm/templates/CRM/Batch/Page/Batch.tpl | 2 +-
civicrm/templates/CRM/Block/Add.tpl | 2 +-
civicrm/templates/CRM/Block/CreateNew.tpl | 2 +-
civicrm/templates/CRM/Block/Dashboard.tpl | 2 +-
civicrm/templates/CRM/Block/Event.tpl | 2 +-
.../templates/CRM/Block/FullTextSearch.tpl | 2 +-
civicrm/templates/CRM/Block/LangSwitch.tpl | 2 +-
civicrm/templates/CRM/Block/Mail.tpl | 2 +-
.../templates/CRM/Block/RecentlyViewed.tpl | 2 +-
civicrm/templates/CRM/Block/Subject.tpl | 2 +-
civicrm/templates/CRM/Block/blocks.tpl | 2 +-
.../templates/CRM/Campaign/Form/Campaign.tpl | 2 +-
civicrm/templates/CRM/Campaign/Form/Gotv.tpl | 2 +-
.../templates/CRM/Campaign/Form/Petition.tpl | 2 +-
.../CRM/Campaign/Form/Petition/Signature.tpl | 2 +-
.../CRM/Campaign/Form/ResultOptions.tpl | 2 +-
.../templates/CRM/Campaign/Form/Search.tpl | 2 +-
.../CRM/Campaign/Form/Search/Campaign.tpl | 2 +-
.../CRM/Campaign/Form/Search/Common.tpl | 2 +-
.../CRM/Campaign/Form/Search/EmptyResults.tpl | 2 +-
.../CRM/Campaign/Form/Search/Petition.tpl | 2 +-
.../CRM/Campaign/Form/Search/Survey.tpl | 2 +-
.../templates/CRM/Campaign/Form/Selector.tpl | 2 +-
.../CRM/Campaign/Form/Survey/Delete.tpl | 2 +-
.../CRM/Campaign/Form/Survey/Main.tpl | 2 +-
.../CRM/Campaign/Form/Survey/Questions.tpl | 2 +-
.../CRM/Campaign/Form/Survey/Results.tpl | 2 +-
.../CRM/Campaign/Form/Survey/Tab.tpl | 2 +-
.../CRM/Campaign/Form/Task/Interview.tpl | 2 +-
.../CRM/Campaign/Form/Task/Print.tpl | 2 +-
.../CRM/Campaign/Form/Task/Release.tpl | 2 +-
.../CRM/Campaign/Form/Task/Reserve.tpl | 2 +-
.../CRM/Campaign/Form/Task/Result.tpl | 2 +-
.../Campaign/Form/addCampaignToComponent.hlp | 2 +-
.../templates/CRM/Campaign/Page/DashBoard.tpl | 2 +-
.../templates/CRM/Campaign/Page/Petition.tpl | 2 +-
.../CRM/Campaign/Page/Petition/Confirm.tpl | 2 +-
.../CRM/Campaign/Page/Petition/ThankYou.tpl | 2 +-
civicrm/templates/CRM/Campaign/Page/Vote.tpl | 2 +-
civicrm/templates/CRM/Case/Audit/Audit.tpl | 2 +-
civicrm/templates/CRM/Case/Audit/Report.tpl | 2 +-
civicrm/templates/CRM/Case/Form/Activity.tpl | 2 +-
.../Form/Activity/ChangeCaseStartDate.tpl | 2 +-
.../Case/Form/Activity/ChangeCaseStatus.tpl | 2 +-
.../CRM/Case/Form/Activity/ChangeCaseType.tpl | 2 +-
.../CRM/Case/Form/Activity/LinkCases.tpl | 2 +-
.../CRM/Case/Form/Activity/OpenCase.tpl | 2 +-
.../templates/CRM/Case/Form/ActivityTab.tpl | 2 +-
.../CRM/Case/Form/ActivityToCase.tpl | 2 +-
.../templates/CRM/Case/Form/ActivityView.tpl | 2 +-
civicrm/templates/CRM/Case/Form/Case.hlp | 2 +-
civicrm/templates/CRM/Case/Form/Case.tpl | 2 +-
.../templates/CRM/Case/Form/CaseFilter.tpl | 2 +-
civicrm/templates/CRM/Case/Form/CaseView.tpl | 2 +-
.../templates/CRM/Case/Form/CustomData.tpl | 2 +-
.../templates/CRM/Case/Form/EditClient.tpl | 2 +-
civicrm/templates/CRM/Case/Form/Report.tpl | 2 +-
civicrm/templates/CRM/Case/Form/Search.tpl | 2 +-
.../Case/Form/Search/AdvancedSearchPane.tpl | 2 +-
.../templates/CRM/Case/Form/Search/Common.tpl | 2 +-
.../CRM/Case/Form/Search/EmptyResults.tpl | 2 +-
civicrm/templates/CRM/Case/Form/Selector.tpl | 2 +-
civicrm/templates/CRM/Case/Form/Task.tpl | 2 +-
.../templates/CRM/Case/Form/Task/Batch.tpl | 2 +-
.../templates/CRM/Case/Form/Task/Delete.tpl | 2 +-
civicrm/templates/CRM/Case/Form/Task/PDF.tpl | 2 +-
.../CRM/Case/Form/Task/PickProfile.tpl | 2 +-
.../templates/CRM/Case/Form/Task/Print.tpl | 2 +-
.../templates/CRM/Case/Form/Task/Restore.tpl | 2 +-
.../CRM/Case/Form/ViewRelatedCases.tpl | 2 +-
.../templates/CRM/Case/Page/CaseDetails.tpl | 2 +-
.../CRM/Case/Page/ConfigureError.tpl | 2 +-
.../CRM/Case/Page/CustomDataView.tpl | 2 +-
civicrm/templates/CRM/Case/Page/DashBoard.tpl | 2 +-
.../CRM/Case/Page/DashboardSelector.tpl | 2 +-
civicrm/templates/CRM/Case/Page/Tab.tpl | 2 +-
.../CRM/Case/XMLProcessor/Report.tpl | 2 +-
.../templates/CRM/Contact/Form/Contact.hlp | 2 +-
.../templates/CRM/Contact/Form/Contact.tpl | 2 +-
.../templates/CRM/Contact/Form/CustomData.tpl | 2 +-
.../templates/CRM/Contact/Form/DedupeFind.tpl | 4 +-
.../CRM/Contact/Form/DedupeRules.tpl | 2 +-
civicrm/templates/CRM/Contact/Form/Domain.hlp | 2 +-
civicrm/templates/CRM/Contact/Form/Domain.tpl | 2 +-
.../CRM/Contact/Form/Edit/Address.tpl | 2 +-
.../Contact/Form/Edit/Address/CustomData.tpl | 2 +-
.../Form/Edit/Address/address_name.tpl | 2 +-
.../Form/Edit/Address/city_postal_code.tpl | 2 +-
.../Edit/Address/country_state_province.tpl | 2 +-
.../CRM/Contact/Form/Edit/Address/county.tpl | 2 +-
.../Contact/Form/Edit/Address/geo_code.tpl | 2 +-
.../Form/Edit/Address/street_address.tpl | 2 +-
.../Edit/Address/supplemental_address_1.tpl | 2 +-
.../Edit/Address/supplemental_address_2.tpl | 2 +-
.../Edit/Address/supplemental_address_3.tpl | 2 +-
.../Form/Edit/CommunicationPreferences.js.tpl | 2 +-
.../Form/Edit/CommunicationPreferences.tpl | 2 +-
.../CRM/Contact/Form/Edit/CustomData.tpl | 2 +-
.../CRM/Contact/Form/Edit/Demographics.tpl | 2 +-
.../templates/CRM/Contact/Form/Edit/Email.tpl | 2 +-
.../CRM/Contact/Form/Edit/Household.tpl | 2 +-
.../templates/CRM/Contact/Form/Edit/IM.tpl | 2 +-
.../CRM/Contact/Form/Edit/Individual.tpl | 2 +-
.../templates/CRM/Contact/Form/Edit/Notes.tpl | 2 +-
.../CRM/Contact/Form/Edit/OpenID.tpl | 2 +-
.../CRM/Contact/Form/Edit/Organization.tpl | 2 +-
.../templates/CRM/Contact/Form/Edit/Phone.tpl | 2 +-
.../CRM/Contact/Form/Edit/TagsAndGroups.tpl | 2 +-
.../CRM/Contact/Form/Edit/Tagtree.tpl | 2 +-
.../CRM/Contact/Form/Edit/Website.tpl | 2 +-
.../CRM/Contact/Form/GroupContact.tpl | 2 +-
.../CRM/Contact/Form/Inline/Address.tpl | 2 +-
.../Form/Inline/CommunicationPreferences.tpl | 2 +-
.../CRM/Contact/Form/Inline/ContactInfo.tpl | 2 +-
.../CRM/Contact/Form/Inline/ContactName.tpl | 2 +-
.../CRM/Contact/Form/Inline/CustomData.tpl | 2 +-
.../CRM/Contact/Form/Inline/Demographics.tpl | 2 +-
.../CRM/Contact/Form/Inline/Email.tpl | 2 +-
.../templates/CRM/Contact/Form/Inline/IM.tpl | 2 +-
.../CRM/Contact/Form/Inline/OpenID.tpl | 2 +-
.../CRM/Contact/Form/Inline/Phone.tpl | 2 +-
.../CRM/Contact/Form/Inline/Website.tpl | 2 +-
civicrm/templates/CRM/Contact/Form/Merge.hlp | 2 +-
civicrm/templates/CRM/Contact/Form/Merge.tpl | 2 +-
.../templates/CRM/Contact/Form/OnBehalfOf.tpl | 2 +-
.../CRM/Contact/Form/RelatedContact.tpl | 2 +-
.../CRM/Contact/Form/Relationship.tpl | 88 ++-
.../CRM/Contact/Form/Search/Advanced.hlp | 2 +-
.../CRM/Contact/Form/Search/Advanced.tpl | 2 +-
.../Contact/Form/Search/AdvancedCriteria.tpl | 2 +-
.../CRM/Contact/Form/Search/Basic.hlp | 2 +-
.../CRM/Contact/Form/Search/Basic.tpl | 2 +-
.../CRM/Contact/Form/Search/BasicCriteria.tpl | 2 +-
.../CRM/Contact/Form/Search/Builder.hlp | 2 +-
.../CRM/Contact/Form/Search/Builder.js | 29 +-
.../CRM/Contact/Form/Search/Builder.tpl | 2 +-
.../Contact/Form/Search/Criteria/Activity.tpl | 2 +-
.../Contact/Form/Search/Criteria/Basic.tpl | 2 +-
.../Form/Search/Criteria/ChangeLog.tpl | 2 +-
.../Contact/Form/Search/Criteria/Custom.tpl | 2 +-
.../Form/Search/Criteria/Demographics.tpl | 2 +-
.../Contact/Form/Search/Criteria/Location.hlp | 2 +-
.../Contact/Form/Search/Criteria/Location.tpl | 2 +-
.../Contact/Form/Search/Criteria/Notes.tpl | 2 +-
.../Form/Search/Criteria/Relationship.tpl | 2 +-
.../CRM/Contact/Form/Search/Criteria/Task.tpl | 2 +-
.../CRM/Contact/Form/Search/Custom.tpl | 2 +-
.../Form/Search/Custom/ActivitySearch.tpl | 2 +-
.../Form/Search/Custom/ContribSYBNT.tpl | 2 +-
.../Search/Custom/ContributionAggregate.tpl | 2 +-
.../Form/Search/Custom/EmptyResults.tpl | 2 +-
.../Form/Search/Custom/EventDetails.tpl | 2 +-
.../Contact/Form/Search/Custom/FullText.hlp | 2 +-
.../Contact/Form/Search/Custom/FullText.tpl | 2 +-
.../Form/Search/Custom/MultipleValues.tpl | 2 +-
.../Search/Custom/MultipleValuesCriteria.tpl | 2 +-
.../Contact/Form/Search/Custom/Proximity.tpl | 2 +-
.../CRM/Contact/Form/Search/Custom/Sample.tpl | 2 +-
.../CRM/Contact/Form/Search/EmptyResults.tpl | 2 +-
.../CRM/Contact/Form/Search/Intro.tpl | 2 +-
.../CRM/Contact/Form/Search/ResultTasks.tpl | 2 +-
.../CRM/Contact/Form/Search/table.tpl | 2 +-
.../templates/CRM/Contact/Form/Selector.tpl | 2 +-
.../CRM/Contact/Form/ShareAddress.tpl | 2 +-
civicrm/templates/CRM/Contact/Form/Task.tpl | 2 +-
.../CRM/Contact/Form/Task/AddToGroup.tpl | 2 +-
.../CRM/Contact/Form/Task/AddToHousehold.tpl | 2 +-
.../CRM/Contact/Form/Task/AddToIndividual.tpl | 2 +-
.../Contact/Form/Task/AddToOrganization.tpl | 2 +-
.../Contact/Form/Task/AddToParentClass.tpl | 2 +-
.../CRM/Contact/Form/Task/AddToTag.tpl | 2 +-
.../Contact/Form/Task/AlterPreferences.tpl | 2 +-
.../templates/CRM/Contact/Form/Task/Batch.tpl | 2 +-
.../CRM/Contact/Form/Task/Delete.tpl | 2 +-
.../templates/CRM/Contact/Form/Task/Email.hlp | 2 +-
.../templates/CRM/Contact/Form/Task/Email.tpl | 2 +-
.../CRM/Contact/Form/Task/EmailCommon.tpl | 2 +-
.../CRM/Contact/Form/Task/GMapsInput.tpl | 2 +-
.../CRM/Contact/Form/Task/HookSample.tpl | 2 +-
.../templates/CRM/Contact/Form/Task/Label.hlp | 2 +-
.../templates/CRM/Contact/Form/Task/Label.tpl | 2 +-
.../templates/CRM/Contact/Form/Task/Map.tpl | 2 +-
.../CRM/Contact/Form/Task/Map/Google.tpl | 2 +-
.../Contact/Form/Task/Map/OpenStreetMaps.tpl | 2 +-
.../templates/CRM/Contact/Form/Task/PDF.tpl | 2 +-
.../CRM/Contact/Form/Task/PDFLetterCommon.hlp | 2 +-
.../CRM/Contact/Form/Task/PDFLetterCommon.tpl | 2 +-
.../CRM/Contact/Form/Task/PickProfile.tpl | 2 +-
.../templates/CRM/Contact/Form/Task/Print.tpl | 21 +-
.../CRM/Contact/Form/Task/ProximityCommon.tpl | 2 +-
.../CRM/Contact/Form/Task/RemoveFromGroup.tpl | 2 +-
.../CRM/Contact/Form/Task/RemoveFromTag.tpl | 2 +-
.../CRM/Contact/Form/Task/Result.tpl | 2 +-
.../templates/CRM/Contact/Form/Task/SMS.hlp | 2 +-
.../templates/CRM/Contact/Form/Task/SMS.tpl | 2 +-
.../CRM/Contact/Form/Task/SMSCommon.tpl | 2 +-
.../CRM/Contact/Form/Task/SaveSearch.tpl | 2 +-
.../Contact/Form/Task/SaveSearch/Update.tpl | 2 +-
.../CRM/Contact/Form/Task/Unhold.tpl | 2 +-
.../templates/CRM/Contact/Import/Form/CSV.tpl | 2 +-
.../CRM/Contact/Import/Form/DataSource.hlp | 2 +-
.../CRM/Contact/Import/Form/DataSource.tpl | 2 +-
.../CRM/Contact/Import/Form/MapField.tpl | 2 +-
.../CRM/Contact/Import/Form/MapTable.tpl | 2 +-
.../CRM/Contact/Import/Form/Mapper.tpl | 2 +-
.../CRM/Contact/Import/Form/Preview.tpl | 2 +-
.../templates/CRM/Contact/Import/Form/SQL.tpl | 2 +-
.../CRM/Contact/Import/Form/Summary.tpl | 2 +-
.../CRM/Contact/Page/ContactImage.tpl | 2 +-
.../CRM/Contact/Page/CustomSearch.hlp | 2 +-
.../CRM/Contact/Page/CustomSearch.tpl | 2 +-
.../templates/CRM/Contact/Page/DashBoard.tpl | 2 +-
.../CRM/Contact/Page/DashBoardDashlet.tpl | 2 +-
.../templates/CRM/Contact/Page/Dashboard.hlp | 2 +-
.../templates/CRM/Contact/Page/Dashlet.tpl | 2 +-
.../CRM/Contact/Page/DedupeException.tpl | 2 +-
.../templates/CRM/Contact/Page/DedupeFind.tpl | 7 +-
.../CRM/Contact/Page/DedupeMerge.tpl | 2 +-
.../CRM/Contact/Page/DedupeRules.hlp | 2 +-
.../CRM/Contact/Page/DedupeRules.tpl | 2 +-
.../CRM/Contact/Page/Inline/Actions.tpl | 2 +-
.../CRM/Contact/Page/Inline/Address.tpl | 2 +-
.../Page/Inline/CommunicationPreferences.tpl | 2 +-
.../CRM/Contact/Page/Inline/ContactInfo.tpl | 2 +-
.../CRM/Contact/Page/Inline/ContactName.tpl | 2 +-
.../CRM/Contact/Page/Inline/CustomData.tpl | 2 +-
.../CRM/Contact/Page/Inline/Demographics.tpl | 2 +-
.../CRM/Contact/Page/Inline/Email.tpl | 2 +-
.../templates/CRM/Contact/Page/Inline/IM.tpl | 2 +-
.../CRM/Contact/Page/Inline/OpenID.tpl | 2 +-
.../CRM/Contact/Page/Inline/Phone.tpl | 2 +-
.../CRM/Contact/Page/Inline/Website.tpl | 2 +-
.../CRM/Contact/Page/SavedSearch.tpl | 2 +-
.../Contact/Page/View/ContactSmartGroup.tpl | 2 +-
.../CRM/Contact/Page/View/CustomData.tpl | 2 +-
.../Contact/Page/View/CustomDataFieldView.tpl | 2 +-
.../CRM/Contact/Page/View/CustomDataView.tpl | 2 +-
.../CRM/Contact/Page/View/Delete.tpl | 2 +-
.../templates/CRM/Contact/Page/View/Email.tpl | 2 +-
.../templates/CRM/Contact/Page/View/Group.tpl | 2 +-
.../CRM/Contact/Page/View/GroupContact.tpl | 2 +-
.../templates/CRM/Contact/Page/View/Log.tpl | 2 +-
.../templates/CRM/Contact/Page/View/Note.tpl | 2 +-
.../templates/CRM/Contact/Page/View/Print.tpl | 2 +-
.../CRM/Contact/Page/View/Relationship.tpl | 2 +-
.../Page/View/RelationshipSelector.tpl | 2 +-
.../templates/CRM/Contact/Page/View/SMS.tpl | 2 +-
.../CRM/Contact/Page/View/Summary.hlp | 2 +-
.../CRM/Contact/Page/View/Summary.tpl | 2 +-
.../CRM/Contact/Page/View/SummaryHook.tpl | 2 +-
.../templates/CRM/Contact/Page/View/Tag.tpl | 2 +-
.../CRM/Contact/Page/View/UserDashBoard.tpl | 2 +-
.../Page/View/UserDashBoard/GroupContact.tpl | 2 +-
.../CRM/Contact/Page/View/Useradd.tpl | 2 +-
civicrm/templates/CRM/Contact/Selector.tpl | 2 +-
.../CRM/Contribute/Form/AcceptCreditCard.tpl | 2 +-
.../Form/AdditionalInfo/AdditionalDetail.tpl | 2 +-
.../Form/AdditionalInfo/CreditCard.tpl | 2 +-
.../Form/AdditionalInfo/DirectDebit.tpl | 2 +-
.../Form/AdditionalInfo/PaymentReminders.tpl | 2 +-
.../Form/AdditionalInfo/Premium.tpl | 2 +-
.../CRM/Contribute/Form/AdditionalPayment.hlp | 2 +-
.../CRM/Contribute/Form/AdditionalPayment.tpl | 2 +-
.../Contribute/Form/CancelSubscription.tpl | 2 +-
.../CRM/Contribute/Form/Contribution.tpl | 20 +-
.../Form/Contribution/AuthorizeNetARB.tpl | 2 +-
.../Contribute/Form/Contribution/Confirm.tpl | 2 +-
.../CRM/Contribute/Form/Contribution/Main.tpl | 2 +-
.../Form/Contribution/MembershipBlock.tpl | 2 +-
.../Form/Contribution/OnBehalfOf.tpl | 2 +-
.../Form/Contribution/PremiumBlock.tpl | 2 +-
.../Form/Contribution/PreviewHeader.tpl | 2 +-
.../Contribute/Form/Contribution/ThankYou.tpl | 2 +-
.../Contribute/Form/ContributionCharts.tpl | 2 +-
.../Form/ContributionPage/AddProduct.hlp | 2 +-
.../Form/ContributionPage/AddProduct.tpl | 2 +-
.../Form/ContributionPage/Amount.tpl | 2 +-
.../Form/ContributionPage/Custom.hlp | 2 +-
.../Form/ContributionPage/Custom.tpl | 2 +-
.../Form/ContributionPage/Delete.tpl | 2 +-
.../Contribute/Form/ContributionPage/PCP.hlp | 2 +-
.../Form/ContributionPage/Premium.tpl | 2 +-
.../Form/ContributionPage/Settings.hlp | 2 +-
.../Form/ContributionPage/Settings.tpl | 2 +-
.../Contribute/Form/ContributionPage/Tab.hlp | 2 +-
.../Contribute/Form/ContributionPage/Tab.tpl | 2 +-
.../Form/ContributionPage/ThankYou.hlp | 2 +-
.../Form/ContributionPage/ThankYou.tpl | 2 +-
.../Form/ContributionPage/Widget.hlp | 2 +-
.../Form/ContributionPage/Widget.tpl | 4 +-
.../CRM/Contribute/Form/ContributionView.tpl | 2 +-
.../CRM/Contribute/Form/ManagePremiums.tpl | 2 +-
.../templates/CRM/Contribute/Form/PCP.js.tpl | 2 +-
.../CRM/Contribute/Form/PCP/Campaign.tpl | 2 +-
.../CRM/Contribute/Form/PCP/Delete.tpl | 2 +-
.../templates/CRM/Contribute/Form/PCP/PCP.tpl | 2 +-
.../CRM/Contribute/Form/PCP/PCPAccount.tpl | 2 +-
.../CRM/Contribute/Form/PaymentInfoBlock.tpl | 2 +-
.../CRM/Contribute/Form/PaymentInstrument.tpl | 2 +-
.../templates/CRM/Contribute/Form/Preview.tpl | 2 +-
.../templates/CRM/Contribute/Form/Search.tpl | 2 +-
.../Form/Search/AdvancedSearchPane.tpl | 2 +-
.../CRM/Contribute/Form/Search/Common.tpl | 2 +-
.../Form/Search/ContributionRecur.tpl | 2 +-
.../Contribute/Form/Search/EmptyResults.tpl | 2 +-
.../Contribute/Form/SearchContribution.tpl | 2 +-
.../CRM/Contribute/Form/Selector.tpl | 2 +-
.../CRM/Contribute/Form/SoftCredit.tpl | 2 +-
.../templates/CRM/Contribute/Form/Task.tpl | 2 +-
.../CRM/Contribute/Form/Task/Batch.tpl | 2 +-
.../CRM/Contribute/Form/Task/Delete.tpl | 2 +-
.../CRM/Contribute/Form/Task/Email.tpl | 2 +-
.../CRM/Contribute/Form/Task/Invoice.hlp | 2 +-
.../CRM/Contribute/Form/Task/Invoice.tpl | 2 +-
.../CRM/Contribute/Form/Task/PDF.tpl | 2 +-
.../CRM/Contribute/Form/Task/PDFLetter.hlp | 2 +-
.../CRM/Contribute/Form/Task/PDFLetter.tpl | 2 +-
.../CRM/Contribute/Form/Task/PickProfile.tpl | 2 +-
.../CRM/Contribute/Form/Task/Print.tpl | 2 +-
.../CRM/Contribute/Form/Task/Result.tpl | 2 +-
.../CRM/Contribute/Form/Task/Status.tpl | 2 +-
.../CRM/Contribute/Form/UpdateBilling.tpl | 2 +-
.../Contribute/Form/UpdateSubscription.tpl | 2 +-
.../CRM/Contribute/Import/Form/DataSource.hlp | 2 +-
.../CRM/Contribute/Import/Form/DataSource.tpl | 2 +-
.../CRM/Contribute/Import/Form/MapField.tpl | 2 +-
.../CRM/Contribute/Import/Form/MapTable.tpl | 2 +-
.../CRM/Contribute/Import/Form/Preview.tpl | 2 +-
.../CRM/Contribute/Import/Form/Summary.tpl | 2 +-
.../CRM/Contribute/Page/ContributionPage.hlp | 2 +-
.../CRM/Contribute/Page/ContributionPage.tpl | 2 +-
.../CRM/Contribute/Page/ContributionRecur.tpl | 2 +-
.../CRM/Contribute/Page/ContributionSoft.tpl | 2 +-
.../Contribute/Page/ContributionTotals.tpl | 2 +-
.../CRM/Contribute/Page/ContributionType.tpl | 2 +-
.../CRM/Contribute/Page/DashBoard.hlp | 2 +-
.../CRM/Contribute/Page/DashBoard.tpl | 2 +-
.../CRM/Contribute/Page/ManagePremiums.tpl | 2 +-
.../CRM/Contribute/Page/PaymentInfo.tpl | 2 +-
.../CRM/Contribute/Page/PcpUserDashboard.tpl | 2 +-
.../templates/CRM/Contribute/Page/Premium.tpl | 2 +-
.../Contribute/Page/SubscriptionStatus.tpl | 2 +-
civicrm/templates/CRM/Contribute/Page/Tab.hlp | 2 +-
civicrm/templates/CRM/Contribute/Page/Tab.tpl | 2 +-
.../CRM/Contribute/Page/UserDashboard.tpl | 2 +-
civicrm/templates/CRM/Core/AgeRange.tpl | 2 +-
civicrm/templates/CRM/Core/BillingBlock.tpl | 2 +-
.../CRM/Core/BillingBlockWrapper.tpl | 2 +-
civicrm/templates/CRM/Core/Calendar/GData.tpl | 2 +-
civicrm/templates/CRM/Core/Calendar/ICal.tpl | 2 +-
civicrm/templates/CRM/Core/Calendar/Rss.tpl | 2 +-
civicrm/templates/CRM/Core/Date.tpl | 2 +-
civicrm/templates/CRM/Core/DateRange.tpl | 2 +-
.../CRM/Core/Form/RecurringEntity.hlp | 2 +-
.../CRM/Core/Form/RecurringEntity.tpl | 2 +-
civicrm/templates/CRM/Core/Form/ShortCode.tpl | 2 +-
.../templates/CRM/Core/Form/Task/Batch.tpl | 2 +-
.../CRM/Core/Form/Task/PickProfile.tpl | 2 +-
civicrm/templates/CRM/Core/I18n/Dialog.tpl | 2 +-
civicrm/templates/CRM/Core/I18n/Form.tpl | 2 +-
.../CRM/Core/Page/RecurringEntityPreview.tpl | 2 +-
.../CRM/Custom/Form/ChangeFieldType.tpl | 2 +-
.../CRM/Custom/Form/ContactReference.tpl | 2 +-
.../templates/CRM/Custom/Form/CustomData.tpl | 2 +-
.../templates/CRM/Custom/Form/CustomField.hlp | 2 +-
.../templates/CRM/Custom/Form/CustomField.tpl | 2 +-
.../templates/CRM/Custom/Form/DeleteField.tpl | 2 +-
.../templates/CRM/Custom/Form/DeleteFile.tpl | 2 +-
.../templates/CRM/Custom/Form/DeleteGroup.tpl | 2 +-
civicrm/templates/CRM/Custom/Form/Edit.tpl | 16 +
.../CRM/Custom/Form/Edit/CustomField.tpl | 2 +-
civicrm/templates/CRM/Custom/Form/Field.hlp | 2 +-
civicrm/templates/CRM/Custom/Form/Field.tpl | 2 +-
civicrm/templates/CRM/Custom/Form/Group.tpl | 2 +-
.../templates/CRM/Custom/Form/MoveField.tpl | 2 +-
.../CRM/Custom/Form/MultiValueSearch.js.tpl | 2 +-
civicrm/templates/CRM/Custom/Form/Option.tpl | 2 +-
.../CRM/Custom/Form/Optionfields.tpl | 2 +-
civicrm/templates/CRM/Custom/Form/Preview.tpl | 2 +-
civicrm/templates/CRM/Custom/Form/Search.tpl | 2 +-
.../CRM/Custom/Import/Form/DataSource.hlp | 2 +-
.../CRM/Custom/Import/Form/DataSource.tpl | 2 +-
.../CRM/Custom/Import/Form/MapField.tpl | 2 +-
.../CRM/Custom/Import/Form/Preview.tpl | 2 +-
.../CRM/Custom/Import/Form/Summary.tpl | 2 +-
.../CRM/Custom/Page/CustomDataView.tpl | 2 +-
civicrm/templates/CRM/Custom/Page/Field.tpl | 2 +-
civicrm/templates/CRM/Custom/Page/Group.hlp | 2 +-
civicrm/templates/CRM/Custom/Page/Group.tpl | 2 +-
civicrm/templates/CRM/Custom/Page/Option.tpl | 2 +-
.../templates/CRM/Dashlet/Page/Activity.tpl | 2 +-
.../templates/CRM/Dashlet/Page/AllCases.tpl | 2 +-
civicrm/templates/CRM/Dashlet/Page/Blog.tpl | 2 +-
.../CRM/Dashlet/Page/CaseDashboard.tpl | 2 +-
.../CRM/Dashlet/Page/GettingStarted.tpl | 2 +-
.../templates/CRM/Dashlet/Page/MyCases.tpl | 2 +-
.../templates/CRM/Event/Form/EventFees.tpl | 120 ++--
.../CRM/Event/Form/ManageEvent/Conference.tpl | 2 +-
.../Form/ManageEvent/ConfirmRepeatMode.tpl | 2 +-
.../CRM/Event/Form/ManageEvent/Delete.tpl | 2 +-
.../CRM/Event/Form/ManageEvent/EventInfo.hlp | 2 +-
.../CRM/Event/Form/ManageEvent/EventInfo.tpl | 2 +-
.../CRM/Event/Form/ManageEvent/Fee.tpl | 2 +-
.../CRM/Event/Form/ManageEvent/Location.tpl | 2 +-
.../Event/Form/ManageEvent/Registration.hlp | 2 +-
.../Event/Form/ManageEvent/Registration.tpl | 2 +-
.../CRM/Event/Form/ManageEvent/Repeat.tpl | 2 +-
.../CRM/Event/Form/ManageEvent/Tab.hlp | 2 +-
.../CRM/Event/Form/ManageEvent/Tab.tpl | 2 +-
.../templates/CRM/Event/Form/Participant.tpl | 2 +-
.../Event/Form/ParticipantFeeSelection.tpl | 2 +-
.../CRM/Event/Form/ParticipantView.tpl | 5 +-
.../Registration/AdditionalParticipant.tpl | 2 +-
.../CRM/Event/Form/Registration/Confirm.tpl | 2 +-
.../Form/Registration/DisplayProfile.tpl | 2 +-
.../Form/Registration/EventInfoBlock.tpl | 2 +-
.../Form/Registration/ParticipantConfirm.tpl | 2 +-
.../Event/Form/Registration/PreviewHeader.tpl | 2 +-
.../CRM/Event/Form/Registration/Register.tpl | 2 +-
.../CRM/Event/Form/Registration/ThankYou.tpl | 2 +-
civicrm/templates/CRM/Event/Form/Search.tpl | 2 +-
.../Event/Form/Search/AdvancedSearchPane.tpl | 2 +-
.../CRM/Event/Form/Search/Common.tpl | 2 +-
.../CRM/Event/Form/Search/EmptyResults.tpl | 2 +-
.../CRM/Event/Form/Search/Results.hlp | 2 +-
.../templates/CRM/Event/Form/SearchEvent.tpl | 2 +-
civicrm/templates/CRM/Event/Form/Selector.tpl | 2 +-
.../CRM/Event/Form/SelfSvcTransfer.tpl | 44 +-
.../CRM/Event/Form/SelfSvcUpdate.tpl | 2 +-
civicrm/templates/CRM/Event/Form/Task.tpl | 2 +-
.../CRM/Event/Form/Task/AddToGroup.tpl | 2 +-
.../templates/CRM/Event/Form/Task/Badge.tpl | 2 +-
.../templates/CRM/Event/Form/Task/Batch.tpl | 2 +-
.../templates/CRM/Event/Form/Task/Cancel.tpl | 2 +-
.../templates/CRM/Event/Form/Task/Delete.tpl | 2 +-
.../templates/CRM/Event/Form/Task/Email.tpl | 2 +-
civicrm/templates/CRM/Event/Form/Task/PDF.tpl | 2 +-
.../CRM/Event/Form/Task/ParticipantStatus.hlp | 2 +-
.../CRM/Event/Form/Task/ParticipantStatus.tpl | 2 +-
.../CRM/Event/Form/Task/PickProfile.tpl | 2 +-
.../templates/CRM/Event/Form/Task/Print.tpl | 2 +-
.../templates/CRM/Event/Form/Task/Result.tpl | 2 +-
.../CRM/Event/Form/Task/SaveSearch.tpl | 2 +-
.../CRM/Event/Form/Task/SaveSearch/Update.tpl | 2 +-
.../CRM/Event/Import/Form/DataSource.hlp | 2 +-
.../CRM/Event/Import/Form/DataSource.tpl | 2 +-
.../CRM/Event/Import/Form/MapField.tpl | 2 +-
.../CRM/Event/Import/Form/MapTable.tpl | 2 +-
.../CRM/Event/Import/Form/Preview.tpl | 2 +-
.../CRM/Event/Import/Form/Summary.tpl | 2 +-
.../templates/CRM/Event/Page/DashBoard.hlp | 2 +-
.../templates/CRM/Event/Page/DashBoard.tpl | 2 +-
.../templates/CRM/Event/Page/EventInfo.tpl | 2 +-
.../templates/CRM/Event/Page/ICalendar.tpl | 2 +-
.../templates/CRM/Event/Page/ManageEvent.hlp | 2 +-
.../templates/CRM/Event/Page/ManageEvent.tpl | 2 +-
.../Event/Page/ParticipantListing/Name.tpl | 2 +-
.../Page/ParticipantListing/NameAndEmail.tpl | 2 +-
.../ParticipantListing/NameStatusAndDate.tpl | 2 +-
civicrm/templates/CRM/Event/Page/Tab.tpl | 2 +-
.../CRM/Event/Page/UserDashboard.tpl | 2 +-
.../templates/CRM/Event/Page/iCalLinks.tpl | 2 +-
civicrm/templates/CRM/Export/Form/Map.tpl | 2 +-
civicrm/templates/CRM/Export/Form/Select.tpl | 2 +-
civicrm/templates/CRM/Export/Form/table.tpl | 2 +-
.../CRM/Financial/ExportFormat/IIF.tpl | 2 +-
.../CRM/Financial/Form/BatchTransaction.tpl | 2 +-
.../templates/CRM/Financial/Form/Export.tpl | 2 +-
.../CRM/Financial/Form/FinancialAccount.hlp | 2 +-
.../CRM/Financial/Form/FinancialAccount.tpl | 2 +-
.../CRM/Financial/Form/FinancialBatch.tpl | 2 +-
.../CRM/Financial/Form/FinancialType.tpl | 2 +-
.../Financial/Form/FinancialTypeAccount.tpl | 2 +-
.../templates/CRM/Financial/Form/Payment.tpl | 2 +-
.../CRM/Financial/Form/PaymentEdit.tpl | 2 +-
.../CRM/Financial/Form/PaypalExpress.tpl | 2 +-
.../CRM/Financial/Form/PaypalPro.tpl | 2 +-
.../templates/CRM/Financial/Form/Search.tpl | 2 +-
.../templates/CRM/Financial/Page/Batch.tpl | 2 +-
.../CRM/Financial/Page/BatchTransaction.tpl | 2 +-
.../CRM/Financial/Page/FinancialAccount.tpl | 2 +-
.../CRM/Financial/Page/FinancialBatch.hlp | 2 +-
.../CRM/Financial/Page/FinancialBatch.tpl | 2 +-
.../CRM/Financial/Page/FinancialType.tpl | 2 +-
.../Financial/Page/FinancialTypeAccount.tpl | 2 +-
civicrm/templates/CRM/Form/attachment.tpl | 2 +-
civicrm/templates/CRM/Form/basicForm.tpl | 2 +-
civicrm/templates/CRM/Form/body.tpl | 2 +-
civicrm/templates/CRM/Form/default.tpl | 2 +-
civicrm/templates/CRM/Form/element.tpl | 2 +-
civicrm/templates/CRM/Form/error.tpl | 2 +-
civicrm/templates/CRM/Form/label.tpl | 2 +-
civicrm/templates/CRM/Form/validate.tpl | 2 +-
civicrm/templates/CRM/Friend/Form.tpl | 2 +-
.../templates/CRM/Friend/Form/Contribute.tpl | 2 +-
civicrm/templates/CRM/Friend/Form/Event.tpl | 2 +-
civicrm/templates/CRM/Friend/Form/Friend.tpl | 2 +-
civicrm/templates/CRM/Friend/Form/Pledge.tpl | 2 +-
civicrm/templates/CRM/Grant/Form/Grant.tpl | 2 +-
.../templates/CRM/Grant/Form/GrantView.tpl | 2 +-
civicrm/templates/CRM/Grant/Form/Search.tpl | 2 +-
.../Grant/Form/Search/AdvancedSearchPane.tpl | 2 +-
.../CRM/Grant/Form/Search/Common.tpl | 2 +-
.../CRM/Grant/Form/Search/EmptyResults.tpl | 2 +-
civicrm/templates/CRM/Grant/Form/Selector.tpl | 2 +-
civicrm/templates/CRM/Grant/Form/Task.tpl | 2 +-
.../templates/CRM/Grant/Form/Task/Delete.tpl | 2 +-
.../templates/CRM/Grant/Form/Task/Print.tpl | 2 +-
.../templates/CRM/Grant/Form/Task/Update.tpl | 2 +-
.../templates/CRM/Grant/Page/DashBoard.tpl | 2 +-
civicrm/templates/CRM/Grant/Page/Tab.tpl | 2 +-
civicrm/templates/CRM/Group/Form/Delete.tpl | 2 +-
civicrm/templates/CRM/Group/Form/Edit.tpl | 2 +-
.../templates/CRM/Group/Form/GroupsCommon.tpl | 2 +-
civicrm/templates/CRM/Group/Form/Search.tpl | 2 +-
civicrm/templates/CRM/Group/Page/Group.hlp | 2 +-
civicrm/templates/CRM/Group/Page/Group.tpl | 2 +-
.../templates/CRM/Group/Page/GroupRows.tpl | 2 +-
.../templates/CRM/Logging/ReportDetail.tpl | 2 +-
.../templates/CRM/Logging/ReportSummary.tpl | 2 +-
.../templates/CRM/Mailing/Form/Approve.tpl | 2 +-
.../templates/CRM/Mailing/Form/Component.tpl | 2 +-
civicrm/templates/CRM/Mailing/Form/Count.tpl | 2 +-
.../CRM/Mailing/Form/ForwardMailing.tpl | 2 +-
civicrm/templates/CRM/Mailing/Form/Group.hlp | 2 +-
civicrm/templates/CRM/Mailing/Form/Group.tpl | 2 +-
.../CRM/Mailing/Form/InsertTokens.tpl | 2 +-
civicrm/templates/CRM/Mailing/Form/Optout.tpl | 2 +-
.../templates/CRM/Mailing/Form/Schedule.hlp | 2 +-
.../templates/CRM/Mailing/Form/Schedule.tpl | 2 +-
civicrm/templates/CRM/Mailing/Form/Search.tpl | 2 +-
.../templates/CRM/Mailing/Form/Selector.tpl | 2 +-
.../templates/CRM/Mailing/Form/Settings.hlp | 2 +-
.../templates/CRM/Mailing/Form/Settings.tpl | 2 +-
.../templates/CRM/Mailing/Form/Subscribe.tpl | 2 +-
civicrm/templates/CRM/Mailing/Form/Task.tpl | 2 +-
.../templates/CRM/Mailing/Form/Task/Print.tpl | 2 +-
civicrm/templates/CRM/Mailing/Form/Test.hlp | 2 +-
civicrm/templates/CRM/Mailing/Form/Test.tpl | 2 +-
.../CRM/Mailing/Form/Unsubscribe.tpl | 2 +-
civicrm/templates/CRM/Mailing/Form/Upload.hlp | 2 +-
civicrm/templates/CRM/Mailing/Form/Upload.tpl | 2 +-
civicrm/templates/CRM/Mailing/MailingUI.hlp | 2 +-
civicrm/templates/CRM/Mailing/Page/Browse.hlp | 2 +-
civicrm/templates/CRM/Mailing/Page/Browse.tpl | 2 +-
.../templates/CRM/Mailing/Page/Component.tpl | 2 +-
.../templates/CRM/Mailing/Page/Confirm.tpl | 2 +-
civicrm/templates/CRM/Mailing/Page/Event.tpl | 2 +-
civicrm/templates/CRM/Mailing/Page/Report.tpl | 6 +-
.../CRM/Mailing/Page/Resubscribe.tpl | 2 +-
civicrm/templates/CRM/Mailing/Page/Tab.tpl | 2 +-
.../templates/CRM/Member/Form/Membership.hlp | 2 +-
.../templates/CRM/Member/Form/Membership.tpl | 2 +-
.../CRM/Member/Form/MembershipBlock.hlp | 2 +-
.../CRM/Member/Form/MembershipBlock.tpl | 2 +-
.../CRM/Member/Form/MembershipRelated.tpl | 2 +-
.../CRM/Member/Form/MembershipRenewal.tpl | 2 +-
.../CRM/Member/Form/MembershipStatus.tpl | 2 +-
.../CRM/Member/Form/MembershipType.tpl | 2 +-
.../CRM/Member/Form/MembershipView.tpl | 2 +-
civicrm/templates/CRM/Member/Form/Search.hlp | 2 +-
civicrm/templates/CRM/Member/Form/Search.tpl | 2 +-
.../Member/Form/Search/AdvancedSearchPane.tpl | 2 +-
.../CRM/Member/Form/Search/Common.tpl | 2 +-
.../CRM/Member/Form/Search/EmptyResults.tpl | 2 +-
.../templates/CRM/Member/Form/Selector.tpl | 2 +-
civicrm/templates/CRM/Member/Form/Task.tpl | 2 +-
.../templates/CRM/Member/Form/Task/Batch.tpl | 2 +-
.../templates/CRM/Member/Form/Task/Delete.tpl | 2 +-
.../templates/CRM/Member/Form/Task/Email.tpl | 2 +-
.../templates/CRM/Member/Form/Task/Label.tpl | 2 +-
.../CRM/Member/Form/Task/PDFLetter.tpl | 2 +-
.../CRM/Member/Form/Task/PickProfile.tpl | 2 +-
.../templates/CRM/Member/Form/Task/Print.tpl | 2 +-
.../templates/CRM/Member/Form/Task/Result.tpl | 2 +-
.../CRM/Member/Import/Form/DataSource.hlp | 2 +-
.../CRM/Member/Import/Form/DataSource.tpl | 2 +-
.../CRM/Member/Import/Form/MapField.tpl | 2 +-
.../CRM/Member/Import/Form/MapTable.tpl | 2 +-
.../CRM/Member/Import/Form/Preview.tpl | 2 +-
.../CRM/Member/Import/Form/Summary.tpl | 2 +-
.../templates/CRM/Member/Page/DashBoard.hlp | 2 +-
.../templates/CRM/Member/Page/DashBoard.tpl | 2 +-
.../CRM/Member/Page/MembershipStatus.tpl | 2 +-
.../CRM/Member/Page/MembershipType.hlp | 2 +-
.../CRM/Member/Page/MembershipType.tpl | 2 +-
civicrm/templates/CRM/Member/Page/Tab.hlp | 2 +-
civicrm/templates/CRM/Member/Page/Tab.tpl | 2 +-
.../CRM/Member/Page/UserDashboard.tpl | 2 +-
civicrm/templates/CRM/Note/Form/Note.tpl | 2 +-
civicrm/templates/CRM/PCP/Form/Campaign.tpl | 2 +-
civicrm/templates/CRM/PCP/Form/Contribute.hlp | 2 +-
civicrm/templates/CRM/PCP/Form/Contribute.tpl | 2 +-
civicrm/templates/CRM/PCP/Form/Event.hlp | 2 +-
civicrm/templates/CRM/PCP/Form/Event.tpl | 2 +-
civicrm/templates/CRM/PCP/Form/PCP.tpl | 2 +-
civicrm/templates/CRM/PCP/Form/PCP/Delete.tpl | 2 +-
civicrm/templates/CRM/PCP/Form/PCP/PCP.tpl | 2 +-
civicrm/templates/CRM/PCP/Form/PCPAccount.tpl | 2 +-
civicrm/templates/CRM/PCP/Page/Contribute.tpl | 2 +-
civicrm/templates/CRM/PCP/Page/Event.tpl | 2 +-
civicrm/templates/CRM/PCP/Page/PCP.hlp | 2 +-
civicrm/templates/CRM/PCP/Page/PCP.tpl | 2 +-
civicrm/templates/CRM/PCP/Page/PCPInfo.tpl | 2 +-
civicrm/templates/CRM/Pledge/Form/Payment.tpl | 2 +-
civicrm/templates/CRM/Pledge/Form/Pledge.tpl | 2 +-
.../templates/CRM/Pledge/Form/PledgeView.tpl | 2 +-
civicrm/templates/CRM/Pledge/Form/Search.tpl | 2 +-
.../Pledge/Form/Search/AdvancedSearchPane.tpl | 2 +-
.../CRM/Pledge/Form/Search/Common.tpl | 2 +-
.../CRM/Pledge/Form/Search/EmptyResults.tpl | 2 +-
.../templates/CRM/Pledge/Form/Selector.tpl | 2 +-
civicrm/templates/CRM/Pledge/Form/Task.tpl | 2 +-
.../templates/CRM/Pledge/Form/Task/Delete.tpl | 2 +-
.../templates/CRM/Pledge/Form/Task/Print.tpl | 2 +-
.../templates/CRM/Pledge/Form/Task/Result.tpl | 2 +-
.../CRM/Pledge/Form/Task/SaveSearch.tpl | 2 +-
.../Pledge/Form/Task/SaveSearch/Update.tpl | 2 +-
.../templates/CRM/Pledge/Page/DashBoard.tpl | 2 +-
civicrm/templates/CRM/Pledge/Page/Payment.hlp | 2 +-
civicrm/templates/CRM/Pledge/Page/Payment.tpl | 2 +-
civicrm/templates/CRM/Pledge/Page/Tab.hlp | 2 +-
civicrm/templates/CRM/Pledge/Page/Tab.tpl | 2 +-
.../CRM/Pledge/Page/UserDashboard.tpl | 2 +-
.../templates/CRM/Price/Form/Calculate.tpl | 2 +-
.../templates/CRM/Price/Form/DeleteField.tpl | 2 +-
.../templates/CRM/Price/Form/DeleteSet.tpl | 2 +-
civicrm/templates/CRM/Price/Form/Field.tpl | 2 +-
civicrm/templates/CRM/Price/Form/LineItem.tpl | 2 +-
civicrm/templates/CRM/Price/Form/Option.tpl | 2 +-
.../templates/CRM/Price/Form/OptionFields.tpl | 2 +-
.../CRM/Price/Form/ParticipantCount.tpl | 2 +-
civicrm/templates/CRM/Price/Form/Preview.tpl | 2 +-
civicrm/templates/CRM/Price/Form/PriceSet.tpl | 2 +-
civicrm/templates/CRM/Price/Form/Set.tpl | 2 +-
civicrm/templates/CRM/Price/Page/Field.hlp | 2 +-
civicrm/templates/CRM/Price/Page/Field.tpl | 2 +-
civicrm/templates/CRM/Price/Page/LineItem.tpl | 2 +-
civicrm/templates/CRM/Price/Page/Option.tpl | 2 +-
civicrm/templates/CRM/Price/Page/Set.tpl | 2 +-
civicrm/templates/CRM/Price/Page/table.tpl | 2 +-
.../templates/CRM/Profile/Form/Dynamic.tpl | 2 +-
civicrm/templates/CRM/Profile/Form/Edit.tpl | 2 +-
.../CRM/Profile/Form/GreetingType.tpl | 2 +-
civicrm/templates/CRM/Profile/Form/Search.tpl | 2 +-
.../templates/CRM/Profile/Page/Dynamic.tpl | 2 +-
.../templates/CRM/Profile/Page/Listings.tpl | 2 +-
.../Page/MultipleRecordFieldsListing.tpl | 2 +-
.../templates/CRM/Profile/Page/Overlay.tpl | 2 +-
civicrm/templates/CRM/Profile/Page/View.tpl | 2 +-
civicrm/templates/CRM/Report/Form.tpl | 2 +-
civicrm/templates/CRM/Report/Form/Actions.tpl | 2 +-
.../templates/CRM/Report/Form/Activity.tpl | 2 +-
.../CRM/Report/Form/ActivitySummary.tpl | 2 +-
.../Report/Form/Campaign/SurveyCoverSheet.tpl | 2 +-
.../Report/Form/Campaign/SurveyDetails.tpl | 2 +-
.../CRM/Report/Form/Case/Demographics.tpl | 2 +-
.../templates/CRM/Report/Form/Case/Detail.tpl | 2 +-
.../CRM/Report/Form/Case/Summary.tpl | 2 +-
.../CRM/Report/Form/Case/TimeSpent.tpl | 2 +-
.../Report/Form/Contact/CurrentEmployer.tpl | 2 +-
.../CRM/Report/Form/Contact/Detail.tpl | 2 +-
.../templates/CRM/Report/Form/Contact/Log.tpl | 2 +-
.../CRM/Report/Form/Contact/LoggingDetail.tpl | 2 +-
.../Report/Form/Contact/LoggingSummary.tpl | 2 +-
.../CRM/Report/Form/Contact/Relationship.tpl | 2 +-
.../CRM/Report/Form/Contact/Summary.tpl | 2 +-
.../Report/Form/Contribute/Bookkeeping.tpl | 2 +-
.../Form/Contribute/DeferredRevenue.tpl | 2 +-
.../CRM/Report/Form/Contribute/Detail.tpl | 2 +-
.../CRM/Report/Form/Contribute/History.tpl | 2 +-
.../Form/Contribute/HouseholdSummary.tpl | 2 +-
.../Report/Form/Contribute/LoggingDetail.tpl | 2 +-
.../Report/Form/Contribute/LoggingSummary.tpl | 2 +-
.../CRM/Report/Form/Contribute/Lybunt.tpl | 2 +-
.../Form/Contribute/OrganizationSummary.tpl | 2 +-
.../CRM/Report/Form/Contribute/PCP.tpl | 2 +-
.../Report/Form/Contribute/RecurSummary.tpl | 2 +-
.../CRM/Report/Form/Contribute/Repeat.tpl | 2 +-
.../CRM/Report/Form/Contribute/SoftCredit.tpl | 2 +-
.../CRM/Report/Form/Contribute/Summary.tpl | 2 +-
.../CRM/Report/Form/Contribute/Sybunt.tpl | 2 +-
.../CRM/Report/Form/Contribute/TopDonor.tpl | 2 +-
.../templates/CRM/Report/Form/Criteria.tpl | 2 +-
.../CRM/Report/Form/ErrorMessage.tpl | 2 +-
.../CRM/Report/Form/Event/Income.tpl | 2 +-
.../Report/Form/Event/IncomeCountSummary.tpl | 2 +-
.../Form/Event/ParticipantListCount.tpl | 2 +-
.../Report/Form/Event/ParticipantListing.tpl | 2 +-
.../CRM/Report/Form/Event/Summary.tpl | 2 +-
civicrm/templates/CRM/Report/Form/Fields.tpl | 2 +-
.../CRM/Report/Form/Grant/Detail.tpl | 2 +-
.../CRM/Report/Form/Grant/Statistics.tpl | 2 +-
.../CRM/Report/Form/Layout/Graph.tpl | 2 +-
.../CRM/Report/Form/Layout/Overlay.tpl | 2 +-
.../CRM/Report/Form/Layout/Table.tpl | 2 +-
.../CRM/Report/Form/Mailing/Bounce.tpl | 2 +-
.../CRM/Report/Form/Mailing/Clicks.tpl | 2 +-
.../CRM/Report/Form/Mailing/Detail.tpl | 2 +-
.../CRM/Report/Form/Mailing/Opened.tpl | 2 +-
.../CRM/Report/Form/Mailing/Summary.tpl | 2 +-
.../Report/Form/Member/ContributionDetail.tpl | 2 +-
.../CRM/Report/Form/Member/Detail.tpl | 2 +-
.../CRM/Report/Form/Member/Lapse.tpl | 2 +-
.../CRM/Report/Form/Member/Summary.tpl | 2 +-
.../CRM/Report/Form/Membership/Summary.tpl | 2 +-
.../CRM/Report/Form/Pledge/Detail.tpl | 2 +-
.../templates/CRM/Report/Form/Pledge/Pbnp.tpl | 2 +-
.../CRM/Report/Form/Pledge/Summary.tpl | 2 +-
.../templates/CRM/Report/Form/Register.tpl | 2 +-
.../templates/CRM/Report/Form/Statistics.tpl | 2 +-
.../CRM/Report/Form/Tabs/FieldSelection.tpl | 2 +-
.../CRM/Report/Form/Tabs/Filters.tpl | 2 +-
.../CRM/Report/Form/Tabs/GroupBy.tpl | 2 +-
.../CRM/Report/Form/Tabs/Instance.tpl | 2 +-
.../CRM/Report/Form/Tabs/OrderBy.tpl | 2 +-
.../CRM/Report/Form/Tabs/ReportOptions.tpl | 2 +-
.../CRM/Report/Form/Tabs/Settings.hlp | 2 +-
.../CRM/Report/Form/Walklist/Walklist.tpl | 2 +-
.../CRM/Report/Page/InstanceList.tpl | 2 +-
civicrm/templates/CRM/Report/Page/Options.tpl | 2 +-
.../CRM/Report/Page/TemplateList.tpl | 2 +-
civicrm/templates/CRM/SMS/Form/Group.hlp | 2 +-
civicrm/templates/CRM/SMS/Form/Group.tpl | 2 +-
civicrm/templates/CRM/SMS/Form/Provider.tpl | 2 +-
civicrm/templates/CRM/SMS/Form/Schedule.hlp | 2 +-
civicrm/templates/CRM/SMS/Form/Schedule.tpl | 2 +-
civicrm/templates/CRM/SMS/Form/Task/SMS.tpl | 2 +-
civicrm/templates/CRM/SMS/Form/Upload.hlp | 2 +-
civicrm/templates/CRM/SMS/Form/Upload.tpl | 2 +-
civicrm/templates/CRM/SMS/Page/Provider.tpl | 2 +-
civicrm/templates/CRM/Tag/Form/Edit.tpl | 2 +-
civicrm/templates/CRM/Tag/Form/Merge.tpl | 2 +-
civicrm/templates/CRM/Tag/Form/Tag.tpl | 2 +-
civicrm/templates/CRM/Tag/Form/Tagtree.tpl | 2 +-
civicrm/templates/CRM/Tag/Page/Tag.tpl | 2 +-
.../templates/CRM/UF/Form/AdvanceSetting.tpl | 2 +-
civicrm/templates/CRM/UF/Form/Block.tpl | 2 +-
civicrm/templates/CRM/UF/Form/Field.tpl | 2 +-
civicrm/templates/CRM/UF/Form/Group.hlp | 2 +-
civicrm/templates/CRM/UF/Form/Group.tpl | 2 +-
civicrm/templates/CRM/UF/Form/Preview.tpl | 2 +-
civicrm/templates/CRM/UF/Page/Field.tpl | 2 +-
civicrm/templates/CRM/UF/Page/Group.hlp | 2 +-
civicrm/templates/CRM/UF/Page/Group.tpl | 2 +-
civicrm/templates/CRM/Upgrade/Base.tpl | 2 +-
civicrm/templates/CRM/Widget/widget.tpl | 2 +-
civicrm/templates/CRM/common/CMSUser.tpl | 2 +-
civicrm/templates/CRM/common/ReCAPTCHA.tpl | 2 +-
civicrm/templates/CRM/common/SectionNav.tpl | 2 +-
.../templates/CRM/common/SocialNetwork.tpl | 2 +-
civicrm/templates/CRM/common/TabHeader.tpl | 2 +-
civicrm/templates/CRM/common/Tagset.tpl | 2 +-
.../templates/CRM/common/TrackingFields.tpl | 2 +-
civicrm/templates/CRM/common/WizardHeader.tpl | 2 +-
civicrm/templates/CRM/common/accesskeys.hlp | 2 +-
civicrm/templates/CRM/common/accesskeys.tpl | 2 +-
.../templates/CRM/common/additionalBlocks.tpl | 2 +-
civicrm/templates/CRM/common/backdrop.tpl | 2 +-
civicrm/templates/CRM/common/batchCopy.tpl | 2 +-
.../CRM/common/checkUsernameAvailable.tpl | 2 +-
.../CRM/common/civicrm.settings.php.template | 9 +-
.../templates/CRM/common/contactFooter.tpl | 2 +-
civicrm/templates/CRM/common/customData.tpl | 2 +-
civicrm/templates/CRM/common/dashboard.tpl | 2 +-
civicrm/templates/CRM/common/debug.tpl | 2 +-
.../CRM/common/deferredFinancialType.tpl | 2 +-
.../CRM/common/displaySearchCriteria.tpl | 2 +-
civicrm/templates/CRM/common/drupal.tpl | 2 +-
civicrm/templates/CRM/common/drupal6.tpl | 2 +-
civicrm/templates/CRM/common/drupal8.tpl | 2 +-
.../templates/CRM/common/enableDisableApi.tpl | 10 +-
civicrm/templates/CRM/common/fatal.tpl | 2 +-
civicrm/templates/CRM/common/footer.tpl | 2 +-
civicrm/templates/CRM/common/formButtons.tpl | 2 +-
.../templates/CRM/common/highLightImport.tpl | 2 +-
.../templates/CRM/common/importProgress.tpl | 2 +-
civicrm/templates/CRM/common/info.tpl | 2 +-
civicrm/templates/CRM/common/jcalendar.tpl | 2 +-
civicrm/templates/CRM/common/joomla.tpl | 2 +-
civicrm/templates/CRM/common/jsortable.tpl | 2 +-
civicrm/templates/CRM/common/l10n.js.tpl | 2 +-
civicrm/templates/CRM/common/localNav.tpl | 2 +-
civicrm/templates/CRM/common/logButton.tpl | 2 +-
.../templates/CRM/common/navigation.js.tpl | 2 +-
.../templates/CRM/common/openFlashChart.tpl | 2 +-
civicrm/templates/CRM/common/pager.tpl | 2 +-
civicrm/templates/CRM/common/pagerAToZ.tpl | 2 +-
civicrm/templates/CRM/common/paymentBlock.tpl | 2 +-
civicrm/templates/CRM/common/print.tpl | 2 +-
civicrm/templates/CRM/common/printBody.tpl | 2 +-
civicrm/templates/CRM/common/publicFooter.tpl | 2 +-
.../templates/CRM/common/recentlyViewed.tpl | 2 +-
.../CRM/common/searchResultTasks.tpl | 2 +-
civicrm/templates/CRM/common/showHide.tpl | 2 +-
.../CRM/common/showHideByFieldValue.tpl | 2 +-
civicrm/templates/CRM/common/snippet.tpl | 2 +-
civicrm/templates/CRM/common/status.tpl | 2 +-
civicrm/templates/CRM/common/success.tpl | 2 +-
civicrm/templates/CRM/common/unittests.tpl | 2 +-
.../templates/CRM/common/upgradeCleanup.tpl | 2 +-
civicrm/templates/CRM/common/wordpress.tpl | 2 +-
civicrm/vendor/autoload.php | 2 +-
civicrm/vendor/composer/autoload_real.php | 14 +-
civicrm/vendor/composer/autoload_static.php | 10 +-
.../schema/Contribute/ContributionSoft.xml | 3 +
civicrm/xml/schema/Core/ActionSchedule.xml | 3 +
civicrm/xml/schema/Event/Participant.xml | 3 +
civicrm/xml/templates/civicrm_acl.tpl | 2 +-
civicrm/xml/templates/civicrm_country.tpl | 2 +-
civicrm/xml/templates/civicrm_currency.tpl | 2 +-
civicrm/xml/templates/civicrm_data.tpl | 2 +-
.../xml/templates/civicrm_msg_template.tpl | 2 +-
civicrm/xml/templates/civicrm_navigation.tpl | 2 +-
civicrm/xml/templates/civicrm_sample.tpl | 2 +-
.../xml/templates/civicrm_state_province.tpl | 2 +-
civicrm/xml/templates/drop.tpl | 2 +-
civicrm/xml/templates/listAll.tpl | 35 +-
civicrm/xml/templates/schema.tpl | 2 +-
civicrm/xml/templates/schema_structure.tpl | 2 +-
civicrm/xml/version.xml | 2 +-
includes/civicrm.shortcodes.php | 12 -
wp-cli/civicrm.php | 2 +-
2528 files changed, 5252 insertions(+), 3827 deletions(-)
create mode 100644 civicrm/CRM/Upgrade/Incremental/php/FiveTwo.php
delete mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.1.2.mysql.tpl
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.2.0.mysql.tpl
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.2.alpha1.mysql.tpl
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/5.2.beta1.mysql.tpl
create mode 100644 civicrm/api/v3/Generic/Getunique.php
create mode 100644 civicrm/release-notes/5.2.0.md
create mode 100644 civicrm/templates/CRM/Custom/Form/Edit.tpl
diff --git a/civicrm.php b/civicrm.php
index 2d5e7e7cd8..6309ce4ebe 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 1271722fdf..b3eacfc3f0 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 fc6fd265d7..cd9c25dfee 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 33e9ae33f6..66f712b2da 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 22eb7bf3de..757edce1cf 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 30009f898d..9419ea41b6 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 14a1e2a53f..91e7cf6219 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 bed9ed4ed4..1fcca49337 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 b952957d85..8310106827 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 f333f1d6c8..23806ed566 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 bc4e995d61..d5a7b03b17 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 2f66d4c743..a6d69605f5 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 f0bb5d7d07..ef42d2b6c0 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 e3ff859b88..f3e04b0355 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 1ec56d0c3b..324089dbe8 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 7486cf553e..205e68910b 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 26aaab0c8b..a670d0ac41 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 805c350a51..9f7ba9bbb4 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 d460e262b8..79e36aec00 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 6efc8fddd3..ff8c340881 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 5b8fe0b676..a82cbade69 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 3a73c3b676..791df3ff0b 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 6f3a9a818e..665d55df0c 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 a1dac67084..1adf70a582 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 f7327f6052..9e3ffd5960 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 5e8e62f6c0..254579876b 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 58025d1b21..63b737d477 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 e76f0e3ebd..dfb0ae0034 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 ab88458eb3..f79214d540 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 7e82085155..9ad8351f73 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 b900e83e4d..9fc6d71d74 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 4d65b9264a..982ce6212d 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 4cdaec3622..b41617d639 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 bf763931b7..83c75010c9 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 088ae89f61..9119fb9433 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 78e2a78305..66ac85cc1a 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 dc2193f7c5..6d5abe7f77 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 589827d79e..87ee20d501 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 c867b4a080..3d8dc4ba75 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 b89f477c97..2b21546cfe 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 4a6917d35b..5331ddc5f6 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 05a499fc42..d4bd983823 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 ffb993220e..5aee781ef0 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 3920b17caa..f04f49fbb4 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 abfa3b5b45..bebd5a001d 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 b5df7881b9..63d342f291 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 97791e8ed2..658a350b19 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 256ba40278..365e8dd0b6 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 385aa8dcc0..e7f2541bed 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 4d4fe541d1..7e5a2a02c7 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 9eb4827765..58e81ac215 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 8e1a594e62..010f26559d 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 9f4af94b54..793057f5d0 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 cf781cc44b..5fa9ba5b06 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 f8dfbf07a8..dac43f5b2f 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 9f63a17575..b75b298d97 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 cced34a566..cd4edfc505 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 2169f29e02..74776dd0d4 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 67cc7aa908..0fe3c93a2a 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 835b3f5575..7979db2dab 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 fd90c12890..305e7ce6fa 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 2555f20e65..bffc604477 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 6a0b2c86aa..b980e17e72 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 54ad6dcc58..dcf689c4b1 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 f0b37f25a0..059a5bf878 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 07ea080b35..ab26fb3919 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 b7b73668ec..1e1edf75e4 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 32706c6109..16be41ca04 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 d6c512f864..f816170567 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 175d713c18..b546df708c 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 0687708013..07abc68bac 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 149325d9b5..c379954b73 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 244aa62cc8..a778f39538 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 4fb6434224..196a24a75e 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 db7f076f15..f650ec51de 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 5783c70c97..16e0c193ff 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 1e3607f83a..67009eacf9 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 166fa1afba..e26a56a57f 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 a8efcbe3cb..8ae9eabcf1 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 35acc53d3e..1a8460357e 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 e400a2b33a..b26ec56aea 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 9f939d2bbb..55d3616a69 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 beec68bb85..612bcebff9 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 f7ed1b6246..e19ff51286 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 14d82de76a..6d8ec8d855 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 1498ef0c2a..42181b0c49 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 186a7954f4..9a5ccfa6dd 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 6ab965f4f5..15567af9b9 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 68b911097c..fcd0981f7b 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 b16347b472..88907a8f38 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 e4d36781ad..2efd68125c 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 a62e88c2b2..b09068e82c 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 253b214224..8f5ed454c8 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 d086773dc4..0c79505c8d 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 2dbc9c53eb..500eb282ff 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 69c824e07f..030ebea0ab 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 3026a30074..68711ff42a 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 7246ccc1c5..fee0714229 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 664d4b9df0..29338517e4 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 3303dcc2de..2cfe371650 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 10360483d8..678cef4a8f 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 db0ffc860a..43d790b010 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 fbafa003cc..ac19ae54c0 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 51321a1713..a99ae20aee 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 b9df4b91e2..a9f9abaa78 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 596c26fe7e..ceb953074c 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 8edade59f0..07f04fe6f2 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 126ca59baa..a2d5e9cbad 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 25e6c0a2fb..92237cccda 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 177cdbee0b..a23346a1fe 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 5c99d8ee6d..fce9cc28f4 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 23e7d71e44..2ea031d2b6 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 3054686adb..45ff2b21d9 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 2a0e57a272..cf65b2ae26 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 f4c1907f6b..8eefe4846b 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 865f01ae1e..899a9a2810 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 dbfe1b9005..5aae68d188 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 6b9c9d326e..453961b40a 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 76ddb1619a..ee4c9c53a2 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 6b6ed0232f..ea409c5f22 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 dcebf0b193..3c5a5db23d 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 8032f4beab..e19b517cd1 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 5dd5e5909f..920b046f23 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 14962e9728..873dbdb068 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 64921da5b0..275fcfe83c 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 296c3566a3..731f4a900d 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 e7925b5c47..f8ad052bb4 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 762f479eba..1c5ce80219 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 fe51abb1c3..fbab91e3c0 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 608e3f0bc5..22e20df2ee 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 da191e151a..dd18bac0eb 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 f7ec3dce4f..ceae073122 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 d13e6e899d..528ba65117 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 bdad95626d..6f1ff34439 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 5173aac2f5..0e1a00cd31 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 1ff788772f..b9c3262838 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 a02427ba5d..b06cd75450 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 23fd267172..bfea527f58 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 bc8220a4b8..c6a3dcf098 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 042a6fcb99..f4bc5b6ad5 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 871931033b..764e99aa72 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 48896de1d7..8345d7fac4 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 9e19ca136c..43246cc66f 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 c22316de29..d584980eba 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 626ed8f0fd..df9b49022b 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 e0adbceb04..adca7e8182 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 9feb418b7f..916d2dcbbe 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 2158502053..cb0c7396cd 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 7185ac8c5e..9ebc4725a0 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 31823573e4..64e3626b1a 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 a8f5d7ff93..8c31f28e2e 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 bab970a3dd..ecd37a6cdb 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 1c6e01ea00..05b0d98bfe 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 cca82c0fd8..973c571e04 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 2a465cb6c1..dacb5c6e6e 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 d283ba722f..94187cee41 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 8a2f88f13c..57974875e1 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 858237343f..cc1918fa9f 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 d8c070c6ee..f041d2b5b3 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 6b4aea1d7d..bdf1d218cf 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 afae24df23..cad02eabe6 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 3a27eb0b33..5d7bbd6a9b 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 046da10cdd..c368b0773f 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 e6fe1c6e48..c6b8d39135 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 d6ec8a139e..051a8c0dde 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 6c7ebbe7be..4d591dfe4a 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 29a9a7e0af..76341640c4 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 d8d6f91599..85f5761664 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 f1534cbefe..2de7235039 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 0f179b6adc..e99dd4a47b 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 41e115b455..41d3b4251c 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 2fca570d41..ea4c278570 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 8a8eea4672..71862e5b06 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 0a15c6140f..d66d425c03 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 449129372a..0bbec6fcab 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 fa7f401348..4b3adb7466 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 0127fec731..6f7d3fccab 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 8f036637d2..abc092b2d3 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 13906d6030..b5f298d12a 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 91bebdf123..9602becaa7 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 ab8d134ab8..df577aa4ab 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 ee220afd20..42cc1baedd 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 d9a45cc297..0a2bb28275 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 7481f1d531..1c7c4dfcb1 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 852fed9e19..d39768a0aa 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 14494ed04a..3a798291bc 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 bb0d603f50..c00901c9ab 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 ba3f46725d..ff2d192d53 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 967b6536ea..8967710d70 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 afd7ac2189..fe1cecef3e 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 87967baa63..d69c124071 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 9459d9c21c..e18b086d19 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 8b993f697e..5f59008df4 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 d05d41cd4c..3b5ae3167d 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 564a4e3889..77aeb4195b 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 1275e2f686..d0173e04b0 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 805b6f5369..ef06a31fa9 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 3d72885747..3ca0ed0169 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 ddd733e910..b9d05e6875 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 b2f0419c1a..30af5d3888 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 bbd1e52b49..df6a109fad 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 458a709a10..71aa8ff656 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 2b9888406c..a0f95a3ace 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 3ee84537e6..0467597bad 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 db18f093ba..1e7509156a 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 252862ed19..0a1b09781c 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 443eb9d5ba..0cb7f7ac67 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 b69f9ffac0..259a530911 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 67668647b5..bc09f142f0 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 036324c4e7..bc8ef05969 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 65ad071648..b7e8ba2f8b 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 39bd1148b2..52d84e8c76 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 d429fca867..0947aaabda 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 8c175ef8f7..ca81e1c140 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 85028cfa31..c1fa215a62 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 1d317542f3..956ff16662 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 20eacf8254..9659165e43 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 15d56f0a64..f125355ec9 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 70e449f53d..85e216c2e7 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 a49c41de46..4d3ff033cb 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 3f427faa54..ad088e8223 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 49389dc8f6..75ac0d4896 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 51e8f498b2..9c95a6894a 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 dd3b6e5d99..a25cad27f8 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 3333dfb1d5..09b8925ede 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 a650d76087..f3b391362a 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 ff82069ebd..a299e9e591 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 a742f3d690..8fc3f230f0 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 c7582d99fe..2c0206878a 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 f867c0cd05..3ac3b2b0eb 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 9e8d6e5fe2..89e42a1e00 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 f51e164af6..615b9a0e97 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 4c7d284d88..03d4eceee6 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 d708497c94..2c0b92f539 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 7c0a29841c..c042ce11c2 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 ed7d784c84..f82112f323 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 73e12f9530..c3c235734c 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 fc51c8e4c7..81a191cfa3 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 2642d59e85..4cfa1dc9b4 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 ffd1206d3e..7770768f91 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 29a2f7adeb..000987cea6 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 656e27f62e..55e32582ff 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 af2b0a87cf..da2b6fd946 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 0cc38ed46c..d9fa0c5ef6 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 c99b2d7429..184afa5dca 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 daa7dde585..f7598f33df 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 375d18a665..9f5db2222f 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 4698051528..0132480bc9 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 f261fccc75..1308bccf64 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 0770a1e0c2..4d9c457c64 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 558ce38d25..774d17bc8c 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 366d02ba44..027fbe253f 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 d62bcb8025..02b3620b55 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 6893168cb6..11e8eda2d2 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 fe6dba816e..43d195794d 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 cc15d8f7ab..489f5e7b32 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 678b40d42b..98f70a3197 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 29fc602740..f5df0b46aa 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 ded492da12..b189500f45 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 f6a6298e73..3d91375991 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 9fa07b0670..bee6a4fc5f 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 c39a363889..b877881f8b 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 058f4c8961..914aac6652 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 e6bc3edbab..756a96fca9 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 b8c666037d..8b7d3f1c89 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 941d00bdd6..160e84248d 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 76753621d3..fcbc9fc681 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 a9520b8f5c..8bd78464a4 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 b8904091d0..f9b9d5de9a 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 589589dbfd..551683b222 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 b9cd02b872..ca41916462 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 5f60db40c3..f5f61eaa20 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 33b87f9ff2..a1e0c789bb 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 fed6dc9046..69da342a1d 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 5d39191052..d0b38ac2b9 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 688e805c63..840bae8623 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 abeb99ebf2..2720062ba8 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 fe886c798f..7726f1aee4 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 d7f81ff354..bd0b54c581 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 333e516228..c4664a6651 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 520ed19da1..0be5fce1fa 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 53045ac971..8f7d48535f 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 6a513e5b49..2b634ca098 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 3ef442ab9e..897856150f 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 8316b85260..e689bc8f2c 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 122963c22a..5c7c53ed20 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 a5b26a36a6..7a2d6ace2e 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 153768095b..2a5dd79351 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 d47739a364..3c1b3e7ea9 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 67f752d5b2..d6de166cdd 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 dc1aefedf7..b2dc8e1694 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 bf9d95eb39..c1604a0dfe 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 20a03cd824..2a1c9621c4 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 e5bde961e5..bfd961b1c2 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 d01a26e475..778003b8fd 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 7e0e55a722..3ec22422e3 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 8606759d66..eb35e4ea1e 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 1404f4882a..645c0613c0 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 39d9d50556..6a9424777b 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 b1cf1ab4f5..eac0e51ff2 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 ade7852ef7..765b96ecd7 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 873d67a79a..83a32654aa 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 0f6b304c05..1a6a952c56 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 6aa4792064..fc968b9c2e 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 114a2d0466..a6eda63a9d 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 3d17946f02..2cb84094d3 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 0a64e357c1..acc1bd580f 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 85854ba16b..f6c916c98e 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 ec95dda8d8..327ddc88b9 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 5585414cf9..e5d5f339f0 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 511e4b19d0..dfd1abfc6b 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 5c915b2bc7..96dbab5c54 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 2a6b34cac4..fdeeb49922 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 e7c458c5f5..cc1e99c250 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 1180240fe7..9f6e981927 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 bb25431297..5136641e3b 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 8e27e37cb4..3e67362001 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 bc24165d31..44613cda92 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 b78d3bef82..190ae25b6c 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 62f916f5b7..57833a9cdf 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 1d85aee81c..040d007fcc 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 accd6f9a34..1f2d8af173 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 4355ff3468..4c1d62e702 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 6f444383f3..c9d4fdd821 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 c29cca5381..bc50f684da 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 e72f076413..a2b83de3a0 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 0083bc9cf9..73a71d7e76 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 b91a3cd04b..8c67e565a0 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 4b8146e3f1..ed0943aa5b 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 11a0e34b70..e9c441f83e 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 b88de102d0..5e21b5e95c 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 609f24b261..2d6b8146b2 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 dbf11dedb2..7f52c4a53a 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 e6326c2f87..c53e951e1c 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 e2e9d06c39..de9251b49e 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 62f916286b..959147cf7f 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 f94d4beb05..67924b55cc 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 5da9d8c418..118c5b9bee 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 4d0f878589..50f5a02e6f 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 e5bec4c873..bc30fa4a6e 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 0884eb7905..4e467ecbb2 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 4224521319..6e5a1734da 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 6c1db0369a..aacfd47beb 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 d668497461..39642e6fd6 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 f0778dd1ee..5b1a38c83c 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 c296cb0d7f..8e8357e599 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 548376dde0..c0f7856609 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 bbca8fe202..dc3619b82e 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 eb31790ebf..3e5be3db96 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 cbf31f60b9..f8715d2062 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 732527b54d..1aa5fd59ca 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 c0e3c740b9..a6983c6af4 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 9df6f0bc33..459848703b 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 309cffe00d..24d9b6a108 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 e99880acc5..493747c8c4 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 c711114da0..9fe3464c86 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 b5043a135c..a04f15928e 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 acd0d3d7a7..208d269204 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 6ec94a569b..a26342afb2 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 de3d28d1a2..20516b56ec 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 a020d89aa9..a49792ac8e 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 ab8bbea41b..0634db7b67 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 90beae0b95..e96da5cde6 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 d006a725be..68ea12a3f0 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 31043f6a69..ac21c9ce79 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 da9160ce16..411e07a1b0 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 3d6c79335e..17b0ffa0e6 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 750eed9134..323ceaf468 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 b350399d29..2af031f45a 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 0675aaee2f..519beae333 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 d2041c2f83..9036570af6 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 992df754dc..9e1033a452 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 cbdd080321..c074ce3645 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 da710a455e..7904da5245 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 be30a38654..fdbba1b90c 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 604ba943af..6b73d4dc6d 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 098398086e..97697f0a62 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 115fd4c1e7..d8392cc1ea 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 aef27eab69..ed8fedd4a2 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 ad97386398..b251a15bec 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 97626fa0f7..aded979851 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 2250986846..27cda0e2cf 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 ff5e63d001..334b04a735 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 34d992d24c..98333fec87 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 0fb42a1f0b..e6e71bcc28 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 7efa147d2f..73701de885 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 28080a70ba..65e1ad5c25 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 65ab9d63d4..6d96633f37 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 783f27195d..d41da69d8f 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 07ee2e9472..db488b136f 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 f6b1c62dd3..585a481b45 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 0ffb902c35..a2107da9d9 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 b2cdc67ffe..cda95f20fa 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 eccfc76c94..8c8e49d78f 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 2410f41fb8..a4145e0620 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 09af0988ef..d6beef2cd7 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 2c95ffd9f0..6c3a3923c9 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 ce90bb0d82..32c225e405 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 d7b32b78a6..71cf992bda 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 e56413ae0a..99c090c0a2 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 59c39829e2..e193408b71 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 000242ccdb..a33168d45a 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 def8d6bd90..2b99789923 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 cb1c471214..0197f65cdc 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 3049402ea5..95d99c2bef 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 acc726dfa6..e08d00ff04 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 f263908fef..7b900e4044 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 b8e87378f4..49b3bebe77 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 0c60a6eb75..94aa738666 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 3d3e1808a9..5c84178e7b 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 d6205a11d1..d0fd04e7c0 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 e427bd26fb..3b0fb1c147 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 464a8584f5..d044d1146a 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 5f81c2cf00..977a00bea7 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 82aba90ac3..dd819ba664 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 353bcad960..0c6b84a8ce 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 9d73e1e879..d279d644e1 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 77916e00fd..075206d692 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 f9227d42bc..06941d9035 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 07daaa7368..6b99be29fe 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 a47603f86f..17a0bd2f92 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 5439099b60..da9214d221 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 4a0cd690bf..76245be96a 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 a94e06a652..97a06e145c 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 3642e11ba8..56002dbce1 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 138e98bb41..238353ca07 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 4356c6598b..cf3b805515 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 be1caea309..fc6486c24f 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 c22f1e2387..931475d1ca 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 486f5021bd..9ef7b0065b 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 017b6f8813..f8c2bd30e3 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 a69e654ad2..49e595bfec 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 bc5f0e9b24..cd8611c404 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 dee7eb1f21..b055103a07 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 09bb4b2416..df8905af0a 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 50752ca048..b70a1eabef 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 17ae8ffe42..8ac350b9c6 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 c3100a2e53..7fa4f02bf0 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 d49ccc9cd9..729f5ca30d 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 f5de070e47..c1bbd1b5e4 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 dc53ce711c..dbfb3976e2 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 95fd0be3d6..4563e86e50 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 c51fdc9d7e..49e942e875 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 2268810901..57ddee0ba4 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 495bc32c9b..5395aed2cd 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 eab146007d..70356166e8 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 3945fc97f8..5502b297dc 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 cad493a3c7..ec683c1e80 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 acc122b8d8..b099fa48f7 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 907ab5c3cf..0486629283 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 60f456e922..8edb6db138 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 13e7f6c0f7..d330e42fac 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 1aba1d1b6a..73a2b9b0b0 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 a1c90737b4..31907156ec 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 0a09843534..1fec489254 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 6ab5b41cc3..c618402ff7 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 a0159b5ebc..f2dc9fa714 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 d8f1eac519..4ca87d8774 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 ccc6645631..f03c2f16d3 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 68511dfdbe..fd680da9e6 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 8d86fcb330..bdd5962a34 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 0e22418d61..2ca4c314b8 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 8c6304632d..41f03e46b4 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 ef0e696d10..78fa36d714 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 505c9b0418..77b28a1dbe 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 a2c746a828..84ba834139 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 c3bee31f18..244ba72482 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 3b6fa4a128..d4abc4dcd0 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 1824edfb4b..7fb1b4d4e5 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 7f75a9dae3..3a61d21ed0 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 228e250389..5f6c0145b4 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 52026bf133..9e7f2eedba 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 efad130378..2b4687f234 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 c2b95a9aee..8373687ac8 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 6837bd2659..2a4584fe17 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 b094ccb078..26c491a728 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 0a7cea692e..a7971b967a 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 a2f0107bba..a1989135d6 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 a5debaa657..e30a284049 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 e85f08effa..2e27094620 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 b4095b83bf..8381d7d022 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 77c67ee273..b4ee5997c9 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 eeaebf4c9e..a71dae53ea 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 0d19ca5b68..a114150001 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 b3052fea75..d192d077af 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 5df962260c..b97e6c7c55 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 7f993a7e5b..0e619143e3 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 c9268f7f0a..8cc7653286 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 77fef1be19..632b46de05 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 02a6ca4d88..ce816c53d1 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 6653d6b4f7..bb5d77df17 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 6cee5cf2eb..1f3281a528 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 e7b1ad62e3..bc082255a3 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 f9954b3a81..516eb9fe6d 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 850084e7f0..9455b06a4f 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 558614615f..4662e0471c 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 32f1728242..8ffdd35945 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 a7bf37ed2b..c3a9094d6f 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 9e08e3460c..7be3aab41f 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 1cb1030ac5..b717d0e82f 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 760101b098..f0687f1c59 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 e6ad7ee197..424d40682f 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 f61af4f391..ccb7d9ca0a 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 baba3acd3f..c0be140710 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 7819f2721a..fcb749a2c7 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 642ea1e1ae..99fd677817 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 46c72a2af8..388f1e5df2 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 f7ef6f9219..d75cb632f1 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 767f5a1d36..5a99372c40 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 08a99e3842..247787d988 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 75be147b12..65a8ba51f5 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 4433b7d51f..871ca35427 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 f6f395a03d..c159724c34 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 3457c4e08d..5bae9d4f4a 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 6c5d6fcd62..9d73dbfb83 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 25db8a43e2..85b2e5203d 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 560b255dc3..2e621cf073 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 29a0da0c62..ea6f221f61 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 73cf693d68..1428157395 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 9586145c64..5fd9382304 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 fe8d31a5bf..f8fb83ba2d 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 0ce7dc4df5..57ec216802 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 157783dddd..bf9cc0e8d4 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 fc83b012c1..b1e8f08f3e 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 729d3f8ca5..fb73a78cf2 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 e8a8c705e0..ef28021a7c 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 dc2dd9d523..96a8b7d414 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 9a2767fcd7..0436d65dad 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 f9c950d7b5..69d03fe6e2 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 58811263c7..b9e0c3133c 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 64417e7b85..5543a56015 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 9564b20651..f6df703442 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 265d27828d..a781b64587 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 3f968d231b..d114991249 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 237ce337cf..4351025bec 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 76d1ff9671..18fb51f5d1 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 a924959844..8a9ea1f895 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 18e5254dc8..148e23a919 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 6f056f585c..0dd7f23545 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 e5a7ea3692..66efbc3867 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 87359a2afa..7bf3ada503 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 2ca8879017..8316aafd86 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 b978145e96..00c228ef64 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 940b8a272d..349c672b83 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 6fb845ceb1..e9414cb783 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 88220f4488..79f894c3cd 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 e5e7022e98..088ba07ef6 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 59856f6342..c5b353fd31 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 45f2760a74..12af2b3c40 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 2b49bc6691..730aadb7b0 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 80a5747771..6be5be07f7 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 2ab41a7d23..7eec741ed8 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 a32df20964..c009a7ffa1 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 17d7043175..682f4187db 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 f538f9aa3a..7983228060 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 015b8390a7..d6abdc7b3e 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 7e292f8b5a..4d551d39b5 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 77d5d62c04..8f3b4d8898 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 17bf8d0308..435506661f 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 3fe18e7272..9c1e316acb 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 cab8032916..dd1567f386 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 386ecab64e..43cbd27e34 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 3342d30bb9..2a487ba70f 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 034439838b..c242e6cb1f 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 a749fd4a10..fa655509c7 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 695a996973..9501fe9e99 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 e54ee44e81..40107e9824 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 5fe809fdc0..72a32835b7 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 16e80fd223..7741229f72 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 699f945b29..1f0bf714f0 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 d1117d080f..9d72908401 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 a5cd8d6e63..6e06171f2f 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 194c73e76e..c28465943f 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 dc519f0ea9..0c42fed73e 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 ed7ca438e5..c6dfcb7b53 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 47981b496f..97d5cc8770 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 a10b96db02..842798f524 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 361682a6f7..1ad9a259bb 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 733372ad78..9719a0e402 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 0bd0ed2d31..e5edcd82c9 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 a85ce48f0e..e7008ea645 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 1f03bfa9ea..b64bf9da7d 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 7c73a2177b..f8b0844632 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 0d175ce6fa..ac5c5466ed 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 8bdf2371e6..c7c0904355 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 e792e68652..e75372d498 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 c9a95591b8..db946e6ca6 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 33860b52c8..c5d9fda762 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 234d9fa85c..54b0ef6ff0 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 76a6f7ef0e..941c53ff04 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 6c973b8999..59fcf9a50a 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 1ac3f1029b..96b5df2d1a 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 89b63d0e34..fe3f1652cb 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 08e169f8f1..faa0a11480 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 7ee79b6095..03717e6934 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 8add4beb3e..07935f9810 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 f16e6b48ee..a4192ac9fd 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 621ebde1ee..2696e2a1ab 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 e77761484b..96cdc87698 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 b322859fe8..eef6b14829 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 116d2322ba..6af1f1cea2 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 58b95a84d8..05de148e82 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 5fd1353916..bd376a5609 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 0ff4161ca8..0100ca27d5 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 80b01dba57..3fde78c1bb 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 26bf9b38cc..d230762395 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 0a914317ba..3ca0fa0f7f 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 f26ddfd571..07322ed5ba 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 079f81b1aa..52bd5ce82e 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 194f870b9b..c4a544e29e 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 7c924ef88a..4b777356ec 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 9af1649742..c757923468 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 10be2be366..e26e80e7bf 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 b9f344975f..ce7d2b2bd6 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 aab5d15f51..f6a0d6f330 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 e8ddd3ad75..c1a48cc49c 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 814fed6f65..45ebe56fe1 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 dd29bdac69..93ddf08a4c 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 a37dcfcbc2..7c65629ef2 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 37ca28008e..8088ef0820 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 d3c9e947a4..50f583fb61 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 7bf7def981..57938812b6 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 dc74563960..37eede8e9e 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 b8dc30c080..8dc1a05793 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 bd289c18b7..bc032d05a2 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 5794c97b57..fa4234ad1a 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 b2b427040c..1c9577817e 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 95786fe73d..5dcf432b1f 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 5e057b6a9a..28bed69cd3 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 8bde85d132..0746230ae4 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 d70eb55b02..cd6e0515df 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 3428230879..fa8e4db71f 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 9167fd0877..fdc7b9d4ee 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 7561008759..dba5f19b73 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 902f5e84ff..5640ad796e 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 674e411b6b..c7e4959a1b 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 6a6dd240c0..400049aec8 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 865a4669a7..6fa3ca1ddd 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 8da81e66cf..fe20778e80 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 fb691c3394..a210b710b1 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 79c73ebe3a..91b1c74c7d 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 1472ea4510..cf937ffa2b 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 4ae5970500..ead63dad35 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 83104896aa..f08e112d32 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 5b770e9a9a..73d92562d0 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 e125128ee6..7d8dc1be88 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 66ddd220a0..f5ed2eed9c 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 ed40e2b6ad..2ede4dedf7 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 6ac85ac820..ccadd74bcd 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 7eabad7c08..510cdd8f54 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 d7538fb12b..0d89e7cb61 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 3fc36a2e8a..cf89ef95f9 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 4ac39cf572..ba71192b70 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 8556ffc553..d135a1965a 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 8d2bddbd4f..b88fc1a889 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 bfa1b61acd..aefc8f8ec0 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 7355190865..c4fb005198 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 75fb7e2163..f86630d580 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 5843e19c21..456b666389 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 e9ddca479d..828447a438 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 a91d85e651..ebcf428a6a 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 bad02518fb..de61c02e30 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 3339604d6e..240a72e6ca 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 ed8e9ddd97..9082044516 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 19d5ff606a..5ae7ee2497 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 e1457b7dfa..c12d7fd03c 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 2374f4a7a4..7ace2fe1fc 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 ccb7d8ae72..d83e236f56 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 713f051be6..21e13b05be 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 164f9d8fb6..51e70aaca6 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 338c5ec57f..7bc3265c4e 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 0e9ec43638..f8fc6eb653 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 9f989cbaeb..c4e4836c98 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 10d92b574e..bb3fa6d111 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 36b0c9776a..116ea1b04a 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 3f5b3a1c71..b67fad5d70 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 ab4f4a5b77..995ef5cf8e 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 ce43182c89..4e87fe0f23 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 f25187afbc..9be188e94f 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 938ba21390..f37600f092 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 e2ac20ac70..c897e9be75 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 a79e951abf..592f077da8 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 0605403376..deb7e55081 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 41a6bba506..065b389b8a 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 95562bf149..522ad2e9dc 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 2cec64c283..b5ecd1703f 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 9834bedce9..9a5f9a25dc 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 1cb555ac5c..c573b4091b 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 5bb137e965..8de710adf2 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 4924582e0b..d35cf1957d 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 3e32006069..e099673c9a 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 3314434a2e..d5de6ed42b 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 f6069669a1..72165a1690 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 5c99b0aade..6997eed7e8 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 73ac21ae5e..4b46793240 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 66cc644744..f45772c835 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 f9b7ef9533..51e67c8346 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 8f9afb30f5..478ac425f9 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 364abec1c9..9fbc7bc571 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 876f595e3b..91cd740931 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 34fd321e41..64011b742b 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 7a717906a9..17f946f34a 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 6daad09f21..edb8d1386e 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 c0b374cc74..6b7b8ee79e 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 bedee2eaa2..90b6947adb 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 4725d4ca17..73140dfb90 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 7d81cb6069..b861c7f344 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 22c3c0490b..b068f147c1 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 4934f65a15..1bf1f339a3 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 a4a2fdd679..ef89df465f 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 9a43a68070..0ada953d5b 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 653971cde5..c38779e8d9 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 0c8969ed94..4ef16b4cc8 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 e5cc05135f..49f1996514 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 6e4b6e8ec0..d17a216db2 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 e61dea7513..f1e9b0056e 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 50b784cfc5..4287e17b81 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 fb633e58c8..aa0dcea312 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 a8196d0fb8..80331e77b2 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 1eb8025c7f..23cac0abf7 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 911079b4bf..65e2577017 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 c6d3ebb42e..6e51881791 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 1b2e3bbc80..057c09ec9f 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 38bea2a76d..d4e1b30eb0 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 9cb7bb4d4c..53d73b32fe 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 0437983151..dda5bad136 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 f3baeee76f..6a5f7c9e0c 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 a2b25399dd..e5229c7d3e 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 b0425ebc16..c58591407b 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 e7d430ccea..30ca5ffaf6 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 7d6bd6c992..6d1033ddab 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 dc9dcfd12c..66c1b65816 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 73790bac2a..53f2720e9c 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 ef04f00564..1f96e40b19 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 c9ef8a6ef0..e073c56827 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 c7ee776a03..c7c7045cf1 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 c4705804c0..7d2852dd04 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 6758632594..b78ec0a8a9 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 46e89c3a3e..5525c5cb75 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 f158f08345..7504730dc7 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 0b7a3c25ef..a25c71bb82 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 618f82baba..30672a1d79 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 94c41be19e..d3173546fa 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 e0fa8d2c2f..4caa6d087e 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 4703816c6e..0314f9251f 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 463541fbdd..b6ee9a770c 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 86f406c622..aea1485120 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 d8d148416c..9e86414ea4 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 ca54320d9c..aed44b7ad4 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 46e115efcc..475a037671 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 15f42eb472..b2d3b03649 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 05596f1f06..0de0114de4 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 626b906ab3..a64ef635ee 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 ea7f269b40..6ad31e9c9f 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 67d25120ea..7c10574c60 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 ce698260f1..160c0132b3 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 9780f397e8..da1a8ee522 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 dd9db82e18..e889ce4b22 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 8d75931212..af1519a351 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 47eb9929b0..49af1281a7 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 2243780d32..f2f4313b57 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 24e4ac1dfe..5d5966a0ea 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 a81ad6469f..7452ccb246 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 72a1374cb2..cb42b301a0 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 5c5eb7aa4a..263a644cba 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 55e9cde464..d8dc522de4 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 f803648a4c..b9ba3977c5 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 15ef815a84..7182125242 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 32347a5994..024cf3f041 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 92c24ccf43..79da52df05 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 47d6c093b8..7b796f7678 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 cf29285e24..084882f80a 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 93606e4800..2ed6cb11ad 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 7b53793e89..6ee7ecdab8 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 a1fee215a3..a0d3c7c530 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 40d7241911..ccce971de7 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 7caf2b57b9..73e0691c8f 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 3ecaf9f49f..8a87504c54 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 ae9d0d35cc..62af41b76d 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 a792db69f4..2cfbb9df69 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 3284e466dc..163ac7cc91 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 a6e5332613..4e8625b2c9 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 6cb388d596..fd54182675 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 1e97c841ec..dad95f5ac9 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 9c257f31b5..8cb8e2ef9b 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 258c29700f..c800e31d83 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 e7f4fef2a5..e5634f9d2c 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 d60578d2c1..afd957c157 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 0bbb25ff41..757e0b9444 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 d116fd7d24..ae38828a88 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 2f79010dc9..905c978160 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 70f2aca5a8..fb14a33b9f 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 65f832f0c8..97db804ca1 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 51b630e183..650ea2f5b5 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 68fd719074..f647df976c 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 dab6f8eb5b..ad9716e8fe 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 e68a20b3b8..3fdc579635 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 d384f7e415..96611beae3 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 b538a16d53..43c898fa9e 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 7837956ba3..9432d514b7 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 5064ae471c..f15c43b423 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 015608e563..aae625b240 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 dc9538a90f..033ff07a93 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 f2ad1d8e3b..3cb075d4f6 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 2aed7336de..666d9895a1 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 c1b68c8b78..7b95b88062 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 3abe80234a..f01ee31260 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 4bca9bd46e..df120c520d 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 b4428e703e..5dc7de829b 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 30dbe68a83..3e36b238ca 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 9330c799d2..de1b77ca11 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 cd82c5f00b..96038cec21 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 cd18e0e0b9..833573849c 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 db230c2772..e2ff41ee38 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 abc01cbf60..d9540e9abe 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 e902b35d00..b243ab5f3d 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 c4380420d6..cd6279842d 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 f8557df44b..f7183fd646 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 aaa45877a9..d8ff17ab1c 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 8a69676e29..cb72febeec 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 43bb6b3d99..c7adacb0a3 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 640b1354ed..73fc78253f 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 d90dc723ad..5a96a9fa47 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 3a68dc69a5..de0ac980e1 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 b7e7e3e0c1..28c4d2c8b7 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 887cb00b0a..59fcebc057 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 9488ecca9e..47d6ac7e69 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 abf58bac2e..84dc291c39 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 f67cefc4c6..f43f5cf717 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 c862ecdbb8..f68af4bb90 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 697da77a08..60c1255926 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 20de6eef76..8615513566 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 de312be013..53965f2347 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 9ac2207474..fa0ffb0804 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 77b66d0bc8..70ca0737c8 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 ce9f0b7af6..6f3b88b781 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 9b962ad6b3..9bd18502ce 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 d439be5498..062eef27e1 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 0de2cf4d16..63eee63f63 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 78fe35bd30..3f5f5efe8d 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 ffc641bee0..1eeee8990a 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 ba90e5ebf8..86addccd3e 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 c29cbcbeae..6667d8bab7 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 d7ed1d2ddf..21bd6201a2 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 639813397b..641541d260 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 91a2aa7db2..5b9b8f49c3 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 59b6cc4d36..9f3bd5e6d4 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 dcdaa3e919..10a30c7f24 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 a7d68c9f47..8f27ff1a92 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 55dd4d783c..f96398b51d 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 1a439aa03b..68d0398c51 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 13df482542..a407cad60e 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 767bc42fdd..6c6bae8305 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 0c78a1cca8..bbf1dc83cf 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 e744d73455..f6bb29fda3 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 75976c7856..bd17805f2b 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 6ea6e65705..27a7783aea 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 b8a5d76eed..39b07bc237 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 4f6ca262c4..d3b8e7b8c5 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 57b8de2196..2d650fd8d7 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 02ab539bd6..7f0329ac49 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 f26d83c2ee..8234e8ce78 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 530b61117d..87e336bad8 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 9354c2f7fe..d736ca3947 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 54ed50e608..6631c69343 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 b823353956..17547e6cc9 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 8912eb98a5..1c1fb8fd15 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 444f9c0d76..d563406317 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 2a7d84beca..e75c63469b 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 55abfd143b..51f505428e 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 6459652284..11474f31a5 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 970789ed43..6e1694a07f 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 8ad55e6940..2f0e26ad9f 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 94a31a3e5d..73db20fef8 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 59995dcd6d..625a08861f 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 1bd9f8383c..acd3e20f09 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 cab30ed857..c366e1ce9e 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 d0ed428afb..3f121d138c 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 dcce3d7c31..d57e845d8d 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 f4ecc2418d..674b4861e1 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 bbc1d41dc1..9bcdaad449 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 d18958e99c..8ba0285e69 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 8c286116e9..a4d944e18f 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 22696f4477..f05dfdcb83 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 69359281d3..a1d9211f9f 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 a1a11da490..b11b1b8c34 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 1155727afa..60f1452946 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 9fdea4a2b3..7075b8b870 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 692939763c..63ab4ead8a 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 b9f552dffc..b0ac627fa4 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 7cc19f0142..3ac24ca7cc 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 9bdbcc6460..bd2ec07db0 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 2d6f8c159f..49ee8d1dd9 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 9490c54169..01958af70b 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 cec34cacfa..669cf70bf6 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 5c0a2b8faa..95633c4ee0 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 a57a0447c3..1743f8daf4 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 7196dd8ce3..7c7f16403d 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 874f9922c7..47adcef535 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 aee980f308..40ec37e050 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 e9ec1b44ba..2bfd97dca7 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 37dc78a597..1b504ac402 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 03c894fd66..74dbad55bf 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 e70de4228c..969d4b57e0 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 3790cd540f..63a89c4566 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 a16f024f8c..1ef3ed0c2a 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 d86815a7a4..0fb50efe7b 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 4e34541fd2..d556dd9fd1 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 fb38df9763..4ca5be9cde 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 80dce934bf..e7c9a6ba10 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 5768674a99..6d563f3ee2 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 442356d2c1..1a93030ba4 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 4aca468f32..d15ce34781 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 dd9ec4b1e9..20b6ed1a96 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 d0dca9fbbe..f01e188d8a 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 0f1681bc79..b858e518ce 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 fc9be9e198..f0e4ee67da 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 5dc1605dab..8d2adb3114 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 9657e247f3..8a84dcb975 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 ae116a5f57..00d8cd3eac 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 a2c18166d2..483f35641d 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 08116ab8e5..d3257557b7 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 97987f61bd..6cd04732e6 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 e59305752d..76f3fef7fb 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 7c68d0f5c7..82b8cd15b1 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 4eb65919c7..c5db18c6ae 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 2e13345015..35074d30fd 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 8d12dbcf83..84c224ed74 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 d5f1867d65..c2196fc78f 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 9c7a5c0d56..ce95910100 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 221687db70..d7f1e30e73 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 638b0873f6..68ff661c56 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 6b9734374c..6ff7894e7d 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 40d4ee7439..63b5e879bc 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 f6fa91c72a..3c677bfb94 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 c15d896306..0a2d8cca86 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 ee9c1bf71d..f35663ceda 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 48c4a79ce1..ffb6ee2fe5 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 5abc4de08a..797cafa071 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 c4f73c1e9c..35e0158d56 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 e09e80073a..830b71bbc9 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 23ab1c83aa..b43e25e499 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 a62f0e69bd..ba0de95458 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 f2afb009d5..d5e2ac1a51 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 b71b8e978d..093d8350e9 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 9d3787b61a..d587d15beb 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 134b141d99..47ba071a6b 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 a74aa059fa..90aef4ec1e 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 08137c8326..45a9a3f34d 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 4049125ac4..94d537e690 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 501bc07d05..6d36ee08f4 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 bbd57fff27..ddeeddbb57 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 1384e8a361..76ebcc8496 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 f86ec5cbe5..af1f2610be 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 c1436edf84..ef6ab6c816 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 0fcf1dfab5..5cb6f7dabf 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 99eea7f50c..4668cf2938 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 e7cc88a074..b2c3acd5bd 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 2e279a09e1..5fcf139b64 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 0ea28bac63..14168e6f46 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 febf8fe45b..330913b042 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 88c91348c0..59429f80b9 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 8c12469015..163dfd0ded 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 7614df769a..7900024e12 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 7787f0ffa3..d749e561cd 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 9050d3ae74..2b27630355 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 c118c7cc29..2fa7203cc1 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 f6fb3d8c7d..a90adf324a 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 363281ec0b..4efff5ee56 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 4e96853a08..0f15bf0ff3 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 cf109871cd..3fad351fff 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 fa30cf4e67..6c98758924 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 089e8fe17b..1d9b0815b0 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 14473fc1ef..557023675b 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 03c9180935..25c90c4969 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 918b60a500..343e09f8b5 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 20f91d6788..135ebb0449 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 de45ee6cdb..ac54c6a506 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 33450a5e7a..39f338d411 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 1e3943ec21..009b67f201 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 be22704f44..4e13e6528b 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 334c07b38a..0dfc6ce0e6 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 fdff9b1c2a..22dc13f14f 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 db0c24b94e..494bfb8cc4 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 c5c96e6d44..b82151a179 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 063cd9187c..355237a435 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 7d1b1442b0..f5d03b384e 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 dee1051cad..4e1d25bfa5 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 ad1536dce0..a1c4021787 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 1e84e74d36..b6899d04aa 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 7ca0a33c08..1f303d0f74 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 5aa7eed447..1d983f8c32 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 f4d4e63415..08e4f89a07 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 9190ff6225..08d1e19a23 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 8b7970ed24..8bfdb62208 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 edc0e6db7e..1526803e0d 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 df78ef77fc..0e03811cb2 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 a718b54746..504c51d0a6 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 655f4e7033..2ebddf909a 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 1a2423ae70..a0a6e4bb03 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 29a3555f18..a426ca5216 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 16bb1e80db..7298a06cca 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 8bfeacacf7..17c778bb21 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 76dbf3fdf5..605cf5a77c 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 b346b3e1ac..5d94876895 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 a59bae27e9..82db372067 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 9e4e8a2f55..88f285e2dc 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 4b47ee4f16..b820247e4c 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 d93726a3a8..a8843f6e6c 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 f7392bce1a..ae603efb51 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 be7d803456..f66cd0fb3b 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 f2ebbe8b5f..215ac06c45 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 e9d53855fd..94c00881d4 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 8f456dae90..57fb659f0c 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 efeb41b332..ffaa85a5db 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 09d8e501c2..db24d4dcd5 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 330f584417..74ae82e491 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 a8a80e0f06..187949ee82 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 0870524185..1a98aade73 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 03da83870b..6822b59f46 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 aa1790f065..db32123a94 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 1feb8b4bdc..94471f3906 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 346a9d8f20..633cbea65e 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 e8ef7d41ab..263788146e 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 efb1e96bb9..31a68c636c 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 c16e1b2a20..37830ff42d 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 f7b252f395..943346cc46 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 c8959cf3d0..29df48a524 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 33774f6b42..0543883fe1 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 2ef336bb3d..ce6c9146f3 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 e3aeb072e3..65a6027c4d 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 d3dd096983..092fece3a3 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 626cb9573f..2f35f625ac 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 d57c70b27d..40f2f14912 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 cde64bed6f..2992444062 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 caf9fb30a8..9f3c6f48e8 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 24fac09716..475b85fe27 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 4e827d02f1..dbde62f290 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 71296b2020..b5560cb651 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 07de09ecc4..36fcc526b9 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 955fbac057..5f6a30592c 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 8f81fa9e81..1f012da05e 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 c20f9a178e..f4dfc6dd8e 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 bf1d347b6c..bdb9814ea0 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 e620845db7..20f57bfc99 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 303e384d44..35dd44c831 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 4b884abccf..d7dc961434 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 4411bf0436..b309facc08 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 e913d3604f..1f8d2fe79b 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 bdee3216f9..6abb3580e8 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 a0ccedf102..fd36f6d6e9 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 dfa148634f..08b36bf6a8 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 1159864c7e..b57665a6ac 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 f564b0918e..04b943bba4 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 e78d58dddf..060b6072a6 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 80c662e10b..954b666831 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 7685321fe8..b7c692599f 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 53dd8af7f1..d15f19305e 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 050bca6d10..09479b1e74 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 5488d6d87c..6f89238be2 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 ffa004a629..99348457ff 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 d00fb5966c..44ecd746a9 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 20e760a7ca..0416a882e0 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 0f22e0f7e6..4552ad1bd0 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 d50543595c..9bff1a8a15 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 8dfd9bcf31..8e118868cf 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 3212e0d692..9224c2ab89 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 3be2a7801d..a116bd02ee 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 03cdc0df7d..b3fd715dac 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 e5e5ace1ea..606dcc3cab 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 db57c88c25..980cfe74f7 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 1998b0c6d6..96413b15f8 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 616cbbbf71..ab507c52ee 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 116a3b52ef..ef971b534f 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 ce487eeadb..14d8107ab1 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 331e42e720..914c6608d3 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 cd246fa448..b19ab39dad 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 04fa6b8ff4..93fe0dcfdb 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 527cf7cc25..71be6086d4 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 4d3114e501..74ecbe2a58 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 a49123a32b..95c0a9c7a4 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 6bc730b543..c7d546054d 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 6e382e3b3c..0b254ee73c 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 7d323eba38..672593d8e4 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 8532ae9717..9f2680e06f 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 29960096af..f394734d06 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 1f43b85dd3..52dcba9848 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 b015af1e13..8349f909ad 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 8b84613163..34572e2da5 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 f15117f9fc..51d632e275 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 3766329482..a7d610b989 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 ab75475c3d..aef934e7fa 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 c16977d5c7..238bffa09b 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 4a60d96b86..aad48a4ccf 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 3b3d9ffdc7..4645fe76aa 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 07e42abfa5..857c767bb2 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 000b073f55..dd20fba0ea 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 706d992981..66d187c1ab 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 0280a6ee0c..088e2d730e 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 1e06f6d9aa..45c30b6c6d 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 b64e45f58a..8ce9d48a69 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 9764c84bd0..117ece4836 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 cb0225bf5d..17f425fbc8 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 9b040c3b50..0fb7f093a5 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 e3565a80cb..4532a39fd0 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 4e4b683d32..d2246b38de 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 fd44c88bb8..a5bd2f0f14 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 d6641be7cb..ea18650ebc 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 898b7914c6..6b87d4ebfd 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 b347fd9d1f..4bb31c9704 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 4cc74ef432..2ef86cd5ce 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 f5c3073464..120a4d80ce 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 36a97fe448..50d0a1e8f0 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 70518e8192..00a143e9cd 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 c61915a606..aa662f7fca 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 8a53052569..0623207e85 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 bc15afc499..f9df73f11c 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 a5269d8807..29ee945c1d 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 33f769af19..c68a9e0d14 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 43792c7fba..171fb271f3 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 cf1563bef6..e52ee0966f 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 b44f3b5648..f46bfaa5fd 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 c3de435dcb..37cd4b590a 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 9d438b72a2..1588b1796a 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 4bfa795ac8..84cb8f1cf2 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 7a55a5c034..1e1ffaa129 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 5a48f9e56f..e893b75fc8 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 edc50a7987..7ff12e70db 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 0f8a0c01b9..db166f8165 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 6afc920894..9430c6fb60 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 f354302a01..0b7dd45cf0 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 e72f15fd56..7fab4c93a0 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 ba497f4ff7..daf03f9ff6 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 7c2c1da2a5..d6d77a7d29 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 01294d59c6..6658257a27 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 b5905c5c8d..4aaee50e1e 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 fcb84b1301..ac43b1bc9b 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 25e92d7027..0464411277 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 23cc9a837b..83cc3bbbe5 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 f86bd8013f..ea55184f08 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 9d210b2395..18108a4bb2 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 fa858f34c6..8a7686d4f3 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 cb48958ff4..949e0236dc 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 6c3255c1fa..395055d42c 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 9ae552130a..3cff431c83 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 146bb5266b..91c36515c5 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 74e1c6308a..9bd425d709 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 228196fa20..15341c4056 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 9c7de6ce96..51b0e4ac6f 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 fd0cd32a1e..2e6816b7d4 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 8fb3ffde3b..c5496c2b57 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 a4635a7e8f..64bf752d6f 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 8c8fd974f4..f4924bb648 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 6892dde872..41c64c0f9f 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 3d013263df..e6b5d16a43 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 61a47bdbca..00cc2467b9 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 3ce50e9062..6b59be6f98 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 87b625c7d0..d038fc3957 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 b7854eeb33..c5a7fa91dc 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 065c6576e5..b595455461 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 209a0c12ef..ed75c7017c 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 d4534a3099..48e845b99b 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 26afc138a1..80d1e0cee1 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 38f5824729..617940127f 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 11fd0d1ce7..82c96c6803 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 ae37ce6a63..9adc248503 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 1ceb32c51f..2caefabbdf 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 2d5b2602dc..88afab9fd9 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 dbebc602cd..82107ef636 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 0fd3851443..c3e35685c2 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 5b773fa049..690f6a3e25 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 f123551d9f..c737632a41 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 8381353fc8..2edeb5daf7 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 c6a3cca9a9..b2b09f08f2 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 363e1d0691..1c0d4394aa 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 253fcbd284..1cbf1cc3f5 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 132f902098..9f0ebe39c9 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 cb3d6f92d8..d97a2b6233 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 0000000000..9d74ea2b2c
--- /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 96c4305d2f..30551dd604 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 423d54ef7e..a2d20a1b53 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 7a09342313..0f3cd40844 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 609a2e4465..0f667a7c91 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 670f030321..87f1284b63 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 2e5fe56eba..e224cac48a 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 0ac37b31c7..f7a7b1b8e6 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 fcd9708f3f..7fe34e90de 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 cd7e235ec3..0000000000
--- 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 0000000000..820372cd75
--- /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 0000000000..4042e8e434
--- /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 0000000000..afee41fbb1
--- /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 b3f873e3f4..581f0486d4 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 10e428ddfd..592e012126 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 c867fccfe5..08057025e5 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 281c2fb60f..0abb97f3a7 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 16f57e934d..0bc631b35f 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 4295ceefdc..6491a3f8cc 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 c853fced28..080524203a 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 6cdbbd5448..8cf0bb8f4e 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 a6592a4d43..26956bad8c 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 ef3fe54f6f..e347d41d07 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 739d8e3f30..4266e1c76f 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 392ee3a861..0aa38656cc 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 06a397cb86..99b373c601 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 983331442f..b2c843326e 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 3f9d704023..903b2fa5e5 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 45288ebb42..eff8513172 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 ba914fceab..9cfeb4533b 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 b4cd646791..eac04f8f52 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 c5f8985aab..84ec2f8162 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 98a45379b8..37b4b77991 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 81041a95fa..b82fe998be 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 42b355f3d0..089ab66205 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 1bca02869e..c6cd890074 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 4c6cf0e386..00a92888fc 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 0f2ed74255..e696aa19c3 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 6bc0f2af5e..b2272fa1eb 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 a0c958495e..f11327cb59 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 bb6c7c80fe..e7455bd498 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 b163aa5ce8..e80b1af4b3 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 3d619ef038..66c6b74cff 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 6a1bb482be..07279d530d 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 32c50dc301..6164694c3e 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 d556fe7917..6f3f45f792 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 71b93ece6b..24fd07062a 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 b14a991f87..1e5a881cde 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 d9cd06a880..f5ca0c7be7 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 31b92afa3d..db4e7194b9 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 e5a269043b..8d922967f0 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 ad5d1e635c..91e88437eb 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 ef4070a37a..f2b9eb9715 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 128b14159f..1340865a5b 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 2bae2a87e8..94bb65b2bb 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 391d1b0eda..0364965f99 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 01d2746733..51589d87a8 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 916084ec82..9dd18299fc 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 15c4bcadac..5d965dd342 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 fcac8fb320..1e1cce0931 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 453dbae1cb..2d8efdbd15 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 f4db692f54..e914eaa9ce 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 82977dfc6e..5f7d7512dd 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 2ff2231c54..34847cc9e2 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 3673eceaf6..5854421836 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 9c2d4f8bec..3c0d447bc1 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 6c759d7925..4403bc6e31 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 c51e3b2884..36d3a46bfa 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 271fdac5e2..ba31ce7696 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 5cc66ce55c..f87c8eac11 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 365ebc03df..74590bbbf6 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 c6b99274fb..3f36511e47 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 e439e2f725..204b3a722e 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 fcdefd2023..f83a8fbbb2 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 1ac57a19e6..ed9e9eb236 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 0c505c16a0..757ee8819a 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 aeee7a0566..07288d507b 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 833c19effe..e80161de25 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 3fc76004aa..427f3f910d 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 420579af07..72535b4aba 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 60d5415517..721af05183 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 5635600d2e..d5400a0923 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 e49600dac2..f9e115686c 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 b9a84c95e0..bde84f2173 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 11525c2ca5..264c7dca1d 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 5cb9330e86..0b7f171a33 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 fc9eaf6287..bebd05169c 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 fb8953ea9f..9a07d106fd 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 94832e2d5c..36e7a20518 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 e8e20764ad..b3447a995a 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 04f9ba641e..94f19c079f 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 8a9cf99e74..e4124fc92b 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 7dfe594b35..f987d34e6c 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 b0771a46f0..28ecf6aafe 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 4b5bf0acf5..386384c795 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 a16a1740ba..856233316b 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 6401f4af88..de68ad4bfa 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 6aebb568e6..125dd3654a 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 585a8ef14a..77d96b91bb 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 5192ce7585..0f6a613feb 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 4cdbef3368..8e61de453f 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 a2e8f3e74a..57fce5820d 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 731b545d38..a8f6e3f144 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 c77237acde..907223edfc 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 9bcbed6e1d..601d4a55ca 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 df5382746f..fafb1f1253 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 bf556b7e59..de4021bb1f 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 7070ecb907..f3baf09271 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 d1afbe876d..831947358e 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 d22e19c461..060967d8b9 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 2f50c8c6f0..3a90ee05d1 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 f05e2d6d8a..23adc513d4 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 15e4b510ea..a4a09bff7b 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 2a934e3cb7..348ee852d3 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 47cfb1c033..882b1e7d1b 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 bb715f37dd..2225befa96 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 ca0f9a9b9f..e2d72f5303 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 ab0a2963da..f89b6b69a1 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 7dd4952051..4a677da3f6 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 df8eec7568..8e206a1fca 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 75f3f99701..858b9eee2b 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 ecc8ebbfe3..9be10ddef1 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 5def803e23..2b8ec1a31a 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 c28a634cb0..bfaa43d456 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 5b55f736b3..617eb10d17 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 1db0a2e401..f2df6c8476 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 62ba50b957..ac81bc8d9a 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 b52a4253c1..0211239e54 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 c2cbd5fbfc..44a6498858 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 3380fde9fb..3cd8085a2d 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 0c97ae48ba..dc48b87edd 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 e00add68af..56c4d51dba 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 5c9ba7cd11..2c8cbd9cc4 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 fb07912109..fa76fa5efe 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 48fe4f47c6..62ef87790c 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 6f8ec00b02..82f8e0ed6f 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 803c923069..dda751045a 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 cd06f99ced..eaad2fa7a9 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 99a77ae5a4..71155a699f 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 11a86467ec..01d2cdb778 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 96b9581890..c04432ffc5 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 e35dec04e0..002f61bdff 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 53ec98edfc..dd0d131c2f 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 fb10018e80..d2de2f039b 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 62c8be3006..dcb04ddc4c 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 37ca470daf..997b8f5207 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 8e541d82a5..fba8167f33 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 3a9e5352d2..03a39a50aa 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 4e08841fb0..8753c3327b 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 b671052c0d..907b185d17 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 bc263cbf6b..c76b4653ee 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 27e14889f6..eccafd4b20 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 fbee414d84..63b0e60f4e 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 05951a0cd7..4cb6d4a84a 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 22d406babe..755134b76a 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 7a2b8bd630..06a2e27140 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 0e3c98af37..719e716c26 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 6ad8d1a3ff..1446e242f8 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 e5fd68b1ff..862683ecbd 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 04a57bff87..3c4e0da523 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 64a0b3c7e0..5d293c54da 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 d3da629242..be1d571d24 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 b09b329d85..e80335223b 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 fa22234dd9..5149e408d3 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 2d51e3aab5..cf2e70b1a8 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 30636948db..3ebe89de55 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 7086ad63cf..7e568aae32 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 34314fd746..4b141dbdf9 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 15efa0dcc8..6c993b80b3 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 cb6c0a270c..2873ddbbf8 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 1e73800069..9cecdf72e5 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 333b313d2a..1f029c7080 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 1949673f63..b1420fb583 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 36d6dce987..fd7684899b 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 bcb9a0cb54..c64da002d8 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 745f10bd19..892619cfef 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 f9c0c33b0e..848e471c15 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 284c8ea29f..f1888e0091 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 3d7f5d2524..478f1f7e35 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 71e3d6b904..516d1ebe03 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 a5de6fed67..fae23c434c 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 4573d62650..7b47fac280 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 f427db9d19..f1a09e7b1a 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 a59798c162..2d5118fd56 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 447def0fa8..ad097b264b 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 f56ac97634..e3fcd7adb8 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 041ebe62cb..8147afca98 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 03390cbaed..796319fb0b 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 104e2a44f0..40cd3a57ba 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 67ceb628f4..c7e1127322 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 a8be7756a7..450537f41d 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 94761e319d..8bb2bcf652 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 acea08f6bc..57a16366c6 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 767c723390..46880df32b 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 8cd6c17ea8..1302de78c5 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 e3b4a16c6a..2ae4b98b3f 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 6950000ac2..8e09974322 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 823ea8548d..1addd5fb46 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 36b72ea981..c2b692462e 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 d75d0ed23d..68b79245a3 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 9f44db9755..8755945ee1 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 f188760a61..b6c66ccef0 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 36f570df60..681f20e527 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 e901bd3752..b42b461d02 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 45b39dea0f..576b877190 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 be02bcc211..debbdbb817 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 77a656ac33..3f6d121f1a 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 5ca5acfcbe..c03d3436d0 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 b503938b47..9c097038db 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 45372c1ae4..750e5c75b6 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 2156404511..cbfc612a8b 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 116202c701..0d27319d97 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 c121abc7da..3072f8869a 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 36b011e325..f608e13420 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 6623ccc265..df0bec551f 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 5e4149898a..bf9d748f28 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 f31750ba8a..6750688893 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 451e302d58..0d641ad864 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 46f7a55466..8506143621 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 86efc7bd96..55f8e2a73e 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 0c7a2cd94c..144e62ad1a 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 aafe6023e6..00063c06b3 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 820e8087b3..6a47bd3c43 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 2beca20a92..43f2ce2afd 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 cf32d77f91..a5838cecae 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 87120b8bd6..337eace060 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 8c45ece601..e5371f8fea 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 3c822a8c58..b88b0bd0ab 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 127874ccab..00c58903bc 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 01c1e43cd1..504d59c113 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 7a1d9b3711..82524f3087 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 20e360df54..cca8ee1a07 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 aee04e6c6d..009449e3ba 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 7dae97a0e3..0a7ac37b38 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 c4a6ea95b4..5337fcc86d 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 5ddd6c30a5..11f0e53f3e 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 cb5eb85ddf..a3098bea85 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 0a06e0fa6c..4c622f1297 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 6926aa8bfb..c7302892aa 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 33703c5e5b..5a04e6477a 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 2ca0960dff..fc7bca50b4 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 9aecca6eaf..40ef66f823 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 23f19807cc..3acd230bf5 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 3b4f37336e..cc597b3445 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 b6d0bb1cac..f35f843794 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 900d1a1f9a..ee080ded2f 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 124dc9eb11..a89f717db6 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 0000000000..e4ecc55070
--- /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 11d9d4bf0d..6ad5242a5f 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 0e248fe03c..8ab6953534 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 573463ba4e..f322a8e4a1 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 60e3797a93..a93b5290d3 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 9e6449e82a..a18c50968f 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 53f055e82b..1604643795 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 20ed57e99a..fd26e64f13 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 0816c5b9bc..6362a1a459 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 e78bf04812..d0b79b4715 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 e9e9306691..7a7e699dc8 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 ce2a9e911f..e7cbd1c143 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 f5935bf032..bb1ab79762 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 6f16ba0871..63245132a7 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 bd419d8711..ed4b293af5 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 3287b8794f..76c0205379 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 112a175e9f..49ac5542d4 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 32c3fe1a33..b0e868490c 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 542ced9213..d184c3150b 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 e05491edce..997c28c0d6 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 9d14e1030c..174eae6b79 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 3efa8f28d4..93d6ed03a8 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 a1a3f8de84..becbf4f6df 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 0a8a3516a1..0b73fe6e7e 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 228427a738..f9754794bc 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 d3b07f3c25..e6dc768c95 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 9a7a6ef67a..f1a08270bb 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 8114f5cfb4..a744ded53e 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 3c3daf33e1..f2312debb2 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 2ce632d83d..567ae6a2b2 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 88d257bc9c..9d5c7dd927 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 cf926cc8e7..4f0c657a91 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 0b6fc837cc..420e40f72f 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 cd5dd6ad7b..90b1683222 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 3f13154fb0..6cc68ed5f2 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 724cfb2f5a..b3ac4b99aa 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 436b22e879..5011383c68 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 8c4c755418..a00627fd3c 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 fb040d2c65..1ce843095c 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 d08d6e37f0..e8495abb78 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 d338a24290..da41b99d89 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 e20cced41f..24822c8520 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 e833334670..0c436d6267 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 4bbaef684f..6b4a316e8c 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 ab6c8bbf1a..8f91fbcf42 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 7a231e78d6..6690eab437 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 ea74bbf593..5c2ef79d6e 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 1b96697a30..34734c400c 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 d129caf4b8..2f51ca951d 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 9c2799650f..3378396935 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 b6e08fd86c..18df6addb1 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 0016b5a966..7b11e6cd3d 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 1e86e1383b..0ce79c1369 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 39a8aa88c2..b5d7c5a37d 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 596c10655f..f74e0466e4 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 53857df7cd..b4294fa1ca 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 066e6e9a9b..4591db3400 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 c1f391387e..c773c92014 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 b13da15086..4fda0fa296 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 6ecb5da9c6..93a274c0d2 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 c436a853c2..d17752649a 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 a60e19bad0..0b16b3cde4 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 7a0e431751..2951c8d65c 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 5bf8c20a68..e77ade4096 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 bab339b835..8211283fb7 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 b7aa1d34c8..cca618cae3 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 cb8c618e55..2272e29b49 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 69c250a7cd..e121c41146 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 d8abd0a8b3..ea8790c014 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 ec9538601d..65f449e10b 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 0677d2ffa0..df4b6a8f59 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 c445c4ed76..4d22aede6d 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 2044cf98b3..7fbcac0fdb 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 734fadba57..aea7785966 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 9c1decf3b2..5f1eef8a2b 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 eb5fe593d1..f8b663eece 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 f561c0f858..41646c5ef3 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 540c666203..50942ff2fe 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 7c67264e72..bd48c23496 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 e281a7d8ff..553bfe1c2e 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 2816791aaf..0f9861f06d 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 d615582152..75ea630708 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 8ecdf16d95..81c2a2d9c1 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 a0b69a3473..71e2a6b4e4 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 310d601fee..98e74e5cf2 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 93d779e878..2bdfe06563 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 b12e53636d..9948ae9e6b 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 5432bc045f..7c961b5ed9 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 7f432deb93..8f6705f2d0 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 2dd7550449..3c30fd2a23 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 fc273a836a..19cc4b8fb9 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 58ea2e1750..ca8c433816 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 c18b86d911..6d6066fa4d 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 cadb3497cf..d78af15178 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 7d0b582e96..dfe495bafd 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 0865344318..5737dbdf21 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 0c0ac0c995..238642bfe6 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 60ffd49470..ea012721da 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 91ea24b45f..73a1965b88 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 3c2709960e..4797643951 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 9022af0b5d..2e35b04695 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 bca69b17e4..589745dc25 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 c3ded9a10a..269599001c 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 ec5aa40c50..85c282354e 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 e6f528b7e9..7b7b473cb8 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 38c1eec4bf..9be3aef13b 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 591079d3cd..bc0e608f23 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 1b1338ce00..20e01b7afd 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 db42ce1dbe..1c6ee09ea9 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 374371ecce..c6e642620f 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 16099d40a9..bda1acfd1c 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 5b2c39a63b..91e606cf64 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 cc16e4c21b..852e08ce3a 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 0000000000..8c09ba5a1a
--- /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 417788353b..6ea9ea29f9 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 287fbf9e2c..e3d2ea4078 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 77ada71751..c4f4772e82 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 a9b5109988..c91cec28db 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 a205b161fb..0efc087dac 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 9a47e7916e..df66912bda 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 7333d0e59a..c8fce022cd 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 44c116527e..9c8312073e 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 2961a04813..75b1581a58 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 76cc771d77..d19176ca1d 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 e38584c89f..691da48ee9 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 933a9ad42f..a465b253e0 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 819aa401d7..f2a8962b7a 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 c26ba2cd00..4a1a3b85a0 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 6cc84b3f61..0f805195e1 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 142d7d94cd..f5c43bc610 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 fa0561c499..e504c6c285 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 d19c7b2dda..41d7dbdb15 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 b701b35230..2491afe82b 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 a267541c78..2da79d584c 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 fad0a8d794..48f5c517ae 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 f9c1d4689f..300f06f9db 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 96a5886158..7a0a5a07eb 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 8b71665041..1f38187ae4 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 b74dad99af..e00963195f 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 d844e88e51..5ee6beb189 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 9eaf66dbc8..bfba24241c 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 21a6f314d8..e12103b43b 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 eed5ed0fc3..d884d08c8c 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 902218a035..6ee8b70d80 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 eea7805635..5a90d3e911 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 21dc63d64d..5790aa592c 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 8c73d8eb18..3043d68525 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 80d3dc6faa..4cd6940043 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 c9c122bacf..04959cba60 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 5875cdaf90..ca674ac6eb 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 11f9141469..3ff740bde8 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 e8b6dbe32e..cfcbbd8513 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 816b507a57..eac293ef8a 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 e7c0945a3d..6a10997fa6 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 7289080ac4..9098058370 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 f5a71a739d..d57c964a5b 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 6294f89ed6..32a68a6cef 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 a78e20d621..9b7c93cff4 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 ea7dfcd9b1..8c4d30ce15 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 a0cefd052e..eff2d965df 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 2975e9590e..523709e780 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 e85c7ad614..6e69c4d8d4 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 681b977432..9d791e60b4 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 b758f5a729..fecd5873f6 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 9b7a13ada8..b67407fbc1 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 07c9bae6bb..5e3e47f4f9 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 fcc11e968d..43ec4275f2 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 7865ddc48f..94a1b2a5af 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 cd18d4ebb1..8282e545d5 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 d26cc18a4c..1679834d50 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 805e94166d..c3a0ac0db7 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 1480afe853..3c575816e3 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 329be7992c..566c9d3cfa 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 939c265318..d56a1cab7a 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 a8af2f2009..d88e7d951a 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 13af32e267..47ac7972fd 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 b3ff141a24..c71111ef81 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 2da3ff5621..614ef3a1f5 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 a7b4ed2774..e389d177c5 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 4d9de96e75..18fa9fcdee 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 84ea3e12d9..c0598e934a 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 6cc3b32be3..1b0be911e9 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 8652253d7e..e7d9130bee 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 29b7dbf8c1..e5c743cd65 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 a55c3748d4..267b272251 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 576266e313..5bdb976990 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 34c48a0b37..c370eabac6 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 cc6bbb250f..3ba2c66118 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 b6d77db43d..a1eb0695e9 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 45ea2f1e5c..d39d9ad66b 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 b2818d87f0..617aea8c55 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 c66f5b7526..f8eb3ed8c6 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 04de18f62c..1d33aa45ad 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 40ffd2f307..a5f60ea67d 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 cf06414e87..38cf9e472b 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 1831c99977..0911c0c2aa 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 4fd720e8f8..eef8c774d4 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 8cc89f58fa..df35d75032 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 6f19fbc9f5..623c025254 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 2da099ab11..acc538cd62 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 2ea927ed22..99a229e90d 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 491ca38e96..9baa42d3f2 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 8e36068e84..b352e8734d 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 491ca38e96..9baa42d3f2 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 3d2777dc9c..ff199d4a42 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 1ac6cb910c..81a4fd73aa 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 491ca38e96..9baa42d3f2 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 491ca38e96..9baa42d3f2 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 491ca38e96..9baa42d3f2 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 491ca38e96..9baa42d3f2 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 a5dbd44a27..6abb7fee9d 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 4de2bc249b..63b86f289e 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 6e375712ba..7614164820 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 9eb9d2bd8d..fc2da06dd7 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 aa212527a8..a8334b7f04 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 53854c913c..f0fad766cd 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 5fc76319dc..9728d92f6a 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 7eef5127ca..16c9b80e0b 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 35b9595ad5..7c627a9dba 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 721d7ef13e..c2023e73ee 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 fab4552f0c..d9ce5cb364 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 081d68b55f..84c857330a 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 7089c61f24..7af27b9b7d 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 8c9ae9c0b0..d7c3c017f8 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 f353b8792a..02e3f318ae 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 8088ed1d0c..498744d213 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 b039442919..d232d739a8 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 463b758c29..6eaea576ca 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 000faab744..3a704662ad 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 cd36044efc..18ab527465 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 aedfd8224f..084abec656 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 cccc0eb97e..dde6d79e93 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 68439d61a2..a7d03ab4f8 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 59dfaf64d9..3808ba7b92 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 e16e34fe46..79d5ef98ab 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 d10cac3cab..b854946893 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 86c67c7cd8..d70e31e25b 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 d1f451b2fb..636db1595c 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 9e9acf2e8f..904b23ecf9 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 e7cd0181fd..237c8f9757 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 5759af62c4..bc70190a87 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 a6d9e0b3cc..d3f24e5ffe 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 b92082c3bd..e414deaa45 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 242eb8956a..8caafcab46 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 e6b4f5079d..7d12b10b63 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 067d503f64..e0d734d68c 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 5cb3ce91da..e8660c04e9 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 c802208a85..fbfcd84894 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 a02830cf57..8b5c233eb1 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 3f74f1df93..7194feb97d 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 3b92bd4b78..2baf4ae13d 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 1cbbd6e0ad..0bbbfe9868 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 19dcfee283..122d772961 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 7688948d6a..d6811607d0 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 fab9d1b876..474b347851 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 cabc8ba2a3..e1b86a7ac5 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 57dc2097b5..9ef47591c0 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 440a975df0..72ff7f9074 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 38de6bd8ff..f33ba6ed42 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 236467022e..b5c2f2febf 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 d1e7af21c8..8a5936b631 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 91c531dfad..b0baf4ae6a 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 fe18f2e252..f48c74644b 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 a3d030274e..315529ba47 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 3176c492ec..33e808c406 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 f70c19badc..e3e6765966 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 a58d634864..5b58ded34b 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 a5f89154a9..9ffaca8e5e 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 4d034ecb4c..9a152f16d7 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 dc4a1a9a98..67961c2982 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 498208502d..e533bf45ce 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 af36c4a4ab..edc1ec3e45 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 ef528e81ff..f374591760 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 e156a2b42c..f7b3201edb 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 788a05800f..baa621d03e 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 90ef4226f3..ff53e167f1 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 d426c1d781..ff7d8630b0 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 ee625a297c..be98e28a74 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 1f97a2b21b..f2104f0d6c 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 7241500a49..e88a752a3b 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 bf7f4faa48..00786e9e26 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 cec066bf29..a068f0506f 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 2a5b642193..65245007c0 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 cb7e906b52..90f96cbd59 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 75f7af708b..283ca7a851 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 fd3d3ba97a..01c7a46aff 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 9bb253c0a4..dcf5fa7b7e 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 2d7f37429e..51b3f5ac36 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 3de450d55a..bcaa89f4d1 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 b005cd380a..c312089e82 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 bef5624078..b80b673bef 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 c8745a4087..1126a041ab 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 415a8c1594..68776dbebb 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 7d06418585..b7221646cb 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 8041650204..43f669ec19 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 3150296f84..b809d343e6 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 3799799538..e1811f96d5 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 d2a792a869..51096b1f97 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 9c3b2c7891..03e8dac96f 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 93c6b82b96..91f740f4e6 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 ff43a3d931..33556057c3 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 ae6b84317a..c87eb5e54e 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 ab42135866..c6644de2d1 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 b222f39e0c..58bfd9a146 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 bafe38402a..3606762588 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 e8d9201443..c6ae05f474 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 95424e10f4..16b033512b 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 20e69d9267..123dbebca9 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 6661217d8f..0910c52194 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 a538e12efa..13c5b65818 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 316755747b..8b9ff81f98 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 305815b639..85718614dc 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 466bee7e8d..7b86bba85f 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 0f3fb85d8a..3715d0af39 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 db652698de..42605df4d0 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 af10925dca..2eef400166 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 67cf67ef19..13898068bb 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 d05ed19df0..cd518c558c 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 3e9879c8f0..c892af8d55 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 7590a03286..0a39bfb6f2 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 a610e9ea9a..c6d33fa339 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 c30c34f143..c23f052a0e 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 e07aebd8a2..928cf460ac 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 4eee696216..7ccb54d4dd 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 09427e9d99..24065ba629 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 69bd93d9f4..84ea45a75f 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 d2675f99b3..724b9eebba 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 14796de461..132ecbdb92 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 2a24cf7639..938e2d817f 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 0d4194dd27..d7236069ce 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 d9fbedebf7..c9cdf6a484 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 8f1339ce66..b577aa9c70 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 b2b7ce348e..129c1e72e4 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 21704601c8..f15819318a 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 9bb2efe566..c3691b6a5f 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 57304bf926..17feaab333 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 b0ffe221d2..26b8ba42c0 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 b3f9c6f9a8..deb84add83 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 1744c25ac1..bc2313e603 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 9050c4dc16..ca1da45317 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 01181d11d7..2e0091fea6 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 b465a5ef9d..7316fd32db 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 c8703ed020..44e38cb305 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 cb492e4c43..13febccab5 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 c5e75b66f7..93bdb45c21 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 2969b3b8a0..81e3bb3b0f 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 76ef91896a..a03e4a1ed7 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 813405f0cb..d1914dba0f 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 264d499166..ffabcaa118 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 493087853f..7fb3a2ae09 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 eeee9e8e17..f6d58cc9e0 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 6e16d6457e..b653d11c18 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 e00108d734..95cdbd487a 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 e42331b529..3653468a6c 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 4681a7fb50..9fd5b1f1f1 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 465feefdbc..3e7a67db95 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 53a5d66c9e..6d78c5716d 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 584e7336ae..54f9695d2e 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 6b59ec94f8..a72929461a 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 fe03951dba..b6300f6d72 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 90570703f8..2b5aed7ff5 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 97e87f6cf8..8eabbb746a 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 1487060b4f..f3aa1fcef0 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 614820741a..70875e7e25 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 f349211b2f..44280729f0 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 feaa7c0988..02459a20b3 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 c880bd91c6..2a5aab3182 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 dcc3a6c477..c93b940355 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 d5e563b9b9..8dec96926c 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 137f74ac1d..28d9d05e2e 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 052d4cc86b..5a20303f14 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 d635797bab..c531468967 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 871edb93b8..295f2d72f3 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 36c44a361f..9253d05a66 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 2c98345031..b826f3c0e1 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 a6d8c8b4d9..1db9d2cad9 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 e9c4e3c3a9..bee3ef1585 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 8b5606a8ab..98ca2b8b1a 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 afcb2731c2..dd0afbacbe 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 c0a9021f2a..c810f2a3cb 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 20adf26f83..1b40a005f1 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 996133e122..a334dafbf4 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 75e64e8e03..25cfef12ff 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 60e80f9387..0787c61ffd 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 d5f286a4e3..1ebc92e2a6 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 c42419fac9..90fbc43703 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 91b4923fab..04b710bde3 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 134528e776..f6da78e9c1 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 7866184299..3037ca0f0e 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 f4cae01a1f..e810a3d6fb 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 95e2eb37d9..900c14a987 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 75042ca6ec..2f00a60984 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 ff8b07cd60..2b02f6be95 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 e91e157f7e..e518866865 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 d2f8ebe784..d2230b920a 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 02d657b2fe..0b62b0d975 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 2e6605f9f0..0466307214 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 ccbfd1d54a..2d534df3de 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 22a6b2424c..13a9d96bdb 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 972e280ad6..590feb23d0 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 16cec53a76..8eebfebe24 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 a3060909ca..8057d46ddd 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 8a39a0c98b..1898e57360 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 ce3a6ebd3b..1b77235960 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 84f107ad20..49240cd674 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 947bac84c9..ca28db0857 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 77a3244014..d921c211a7 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 b183ab6b85..153b8b0534 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 a9a3f61a47..5b5d515dfe 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 47e8915dd7..3cb71262a0 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 d7580546b2..9969d59df8 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 ea9c893261..1b6b650b1d 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 0e48d148c6..78379a6ffa 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 3a7d844650..e2cd37c195 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 171ccf3966..7ec210b2b9 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 0c86a8ef1c..640bf68a43 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 931405104f..e732921a69 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 212655dd57..ba59ec4468 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 42d294d6ad..f056589569 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 c6b1f4fc35..022ed3e427 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 fe16f5163a..ac00fd81f7 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 a3014e3e6a..9ef15b6475 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 6d72f6ba12..8ce783b6df 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 44c8367eee..c5e544d6e0 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 21f68c2696..297b8eb7d2 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 8c4c533324..ee82613c47 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 a47c940c2b..2e01271c56 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 fbab9251ee..edbafd5428 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 a9bd1cc549..bcf977c848 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 77e905180c..949ee10457 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 c1c045a85f..e338b7a4f9 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 939cc87446..bf0a2ebe12 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 ca4cee3d36..4010ca2f73 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 57c42b6da6..5760ea7d6d 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 c3e4e9bc7d..8ccc157347 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 f7a479e9be..2360372cac 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 cf0f376ca5..453ac588f2 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 692c245c16..80033c0624 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 8e16a4a2d2..5e706b46cb 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 c75a172977..2bd021faaf 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 e50d86464e..48e56aa85a 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 777f54525d..ff4b855fe2 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 e90648834a..7129105fca 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 d74f44b43d..af34e82c01 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 170096b790..0efcdcc2f2 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 9973398771..b10a859113 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 a11a6c9507..408eb2e97c 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 ad75b414f9..7f562f3930 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 a11a6c9507..408eb2e97c 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 9b903698f9..f312e84bf7 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 9dbf3a06b1..f1e9230e82 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 b9dd0fb7c8..6f31990201 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 c21611add9..f19c4119cb 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 1a0c95e7b5..764e4d1431 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 37a5ddecfa..472f6cfbe7 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 107d23f7dc..337c71256b 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 6a8c4f10d4..e5c8b0c9c9 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 dc9b5b74e9..434ad7e7eb 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 da42f18dd1..b23c21c9c8 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 baa5284990..15e81a19cf 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 e92df216f5..8efac251e9 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 bbb001f165..3715d01efd 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 6de47fef8f..2edd8ef0b3 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 b306ffb692..81b9e06aa4 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 45b59cfd4d..f5e8e9ccd9 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 8ccf0e5543..7542fbdb61 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 caec382238..34d3dbeea2 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 4c1e0b961b..fe5e40afd3 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 a93b7712b0..1315fdea8a 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 8d1f9d60b7..80013fd261 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 e31c5da224..eecf5fa18b 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 cddbdd3cb0..2b3fdbd475 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 f8d6867638..d9481cf807 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 13b28ce4b7..b0961fab2c 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 7dc476b172..236a37b4f8 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 7bddfed1ab..91fc6e8c03 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 8ddbd87a3f..02e98d58bd 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 e1dd8981d1..b8d51a3b6c 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 99cc1c57d7..61f76c0433 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 670b08ace0..d1b3119c62 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 6d9ecc8b7b..418202cc5c 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 451c23ae03..9cb28f07d1 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 e46f313a30..546d79ac38 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 bc9566fdba..9f11ba212f 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 336041f9c9..555cbf9746 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 41311a389d..a2ab5af018 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 da703a12ad..0a49eb1a90 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 63951daa61..503dd3c8b5 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 7ccc2ae3a2..0f5f452431 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 0837c6be66..7ec48a5c72 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 f6b405c1c7..8f3a4fd85e 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 9cab7b26ee..1233328487 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 811c9a7243..d37fd84625 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 6256458ad8..d611c204fe 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 9d9d6f5b3f..9d8d27eb55 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 aea2cd1f7a..189a1ef215 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 7e3a10d6a1..465acb4436 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 e362ce913e..cdc0c3af66 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 26e6a817a6..467edc6d09 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 ad53b5eb68..0e874e0872 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 fdd790a107..89667f50c8 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 195a6d8414..10439c08e0 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 85585db1b2..2ad5268d93 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 02f31adab1..e6cdbfc18e 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 ddb734b353..57f3ee05bd 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 d3b80bdc21..348302e6a1 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 0953b70c96..9567d74c7b 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 20bd837209..2c471cb05d 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 2a59796c5d..947146fc47 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 0310a7c6bf..df35244b7e 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 cc81dcc873..dc3451e45f 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 622ba32c51..774b211e5a 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 f75810e15e..1f93e9490b 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 42b4c3add5..3fff378990 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 3fc2f1c847..ba51fae17e 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 26f28865e2..b1d9eb76b3 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 22a9dd43c5..8ee47a4b8c 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 7bc43b4fd8..55f6795602 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 7fb9fb0c21..247976f45c 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 e9552edf91..bce5a20d85 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 a674411f9c..0dde17cde2 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 fbe116c23e..b1a0a334f3 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 b568da406e..8875c3f269 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 52e23f3672..87363ba606 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 b59356d63b..fa315a6360 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 6bd2fc793e..b25efcc50f 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 0b041e49da..e1ca9b8b8b 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 c1487ec4ca..355c1e4e7e 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 b5f953c8e3..b8a7a22381 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 dd4a7f7eb9..8d522b160d 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 ddff9679dd..216a1bc98a 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 c10a9f832c..bb786396f8 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 11ebb6f812..30db0fee69 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 daf305c586..00484e0b1a 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 c59077b375..cfad0ff138 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 99e241fda9..3b6b197609 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 394ebeae08..cb1e683a1a 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 d3b103ef8f..369eb292fa 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 848661c874..d8c608f4e4 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 ba95ee588a..a3c80bafb4 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 7cb5d1f390..7ca1ce69fe 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 a4b8306c04..2fbbe70dbd 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 754c786f61..4bc6dc0be0 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 9b08f22d1c..49a26db601 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 9b12de3e0b..2f7d27fc15 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 f367fd30ca..6d01a480a9 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 9fed548865..92c95693a5 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 3e65035b7b..9612842736 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 641d8132e9..9a4a24d857 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 0cfc9a5bc3..4757a3131e 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 e482bf0ab2..1bd9dda81b 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 76988f10e2..380f76578d 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 da1b338521..8520b458b5 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 d35e509310..c89590ce92 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 5df4783565..c00ad8de84 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 d05b937d9f..a97f0f6b8b 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 ffdf1f82b9..6754704681 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 07bff15b30..39252d8708 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 d25dc7e62c..04144ec464 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 eb00cfb265..025ba57785 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 2732ec772d..e3349913bf 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 6892b00ea9..7d3f7c4505 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 36dafc03c4..6a136adb41 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 eb85deaa44..b869e14eb9 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 d9b4ab8fab..b0dcbc7319 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 82e897b44d..1e9a6e4e55 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 35ba31b686..59acbff17b 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 b1a25f34b8..b7198de433 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 25a831a5cf..2c2748bfca 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 c7b1819b12..d32391961f 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 d3b4b42f18..f6c2799e05 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 062cfd8c6c..e9a2f0d54b 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 12ba501a7c..6218872c0f 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 0bf01f12a5..2c0f8b946c 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 38541162b7..8f79bec0a1 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 ed9a751285..af33076cb4 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 4c4930e86f..52446c70c8 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 0b9cf79c39..88edf82bc9 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 e56c7409d9..8a4cf53774 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 effab15708..6c91e3a48a 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 7cc4c89bb4..ce8693a20d 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 0c3bf95545..e7b9c83bdd 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 01295160d5..4412dac0a4 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 831c8c5fb7..6e696f3f7c 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 12dfc8e790..2723c5596f 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 bdc4f25ea6..02d9df98d5 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 cc88a89e9b..5709eed02f 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 a5db4a6a1f..e7a6564bff 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 71851c3d91..d65d612320 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 d32045069b..4917a93437 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 cbd820a813..5b5fd6d2ad 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 9b7a13ada8..b67407fbc1 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 243d06e4eb..63c422d3bb 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 9ef3b0cc8c..e3cf9127a3 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 897d88a284..dbbc6c76c2 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 aafc8bb6a0..6186b5a30d 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 d3ea86506c..67a067193b 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 6a78ba526f..3bcfe17f45 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 c33fde8f94..c1c473506b 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 87c0cca0e2..f0659032df 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 3e15ecf1df..1e6a81fae0 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 88b4a40f8a..ca7ce7d2b2 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 e5961bad12..1d4ea231ff 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 c4963e8089..92e3d5cb5d 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 ec80b0e014..aacd5e1e06 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 4fa94d704f..e2ff62c70d 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 4648d6a8d8..ca378fe62a 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 f69fc1f9ec..a7b12ca87f 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 eb39d80748..869f42b6cf 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 b349636cc7..77b173af43 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 02506aef6e..75404e3705 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 6821532484..3d4368acb9 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 714195c1cd..cf142340c8 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 888d06c025..aacbdae765 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 0e101fb2ed..063f39038b 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 d034589210..27be84d416 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 0062ea8308..6debd847b2 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 9c5a68f81c..e85be285f3 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 039eacaa9d..0a4ffacecb 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 6a519d0228..7cb4577645 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 ac2ddb78ef..9abb647652 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 19bfa2cef2..93fc5135bb 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 630a0fb4c7..13e4a2c9ad 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 cd38ffa634..6d910f9399 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 9012101ebf..d4c7323cd3 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 b7ac7496a3..367897c60f 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 57a0bf8fda..1e7c56782e 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 318de176cf..354b2b03b4 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 c519c7778e..988b6bc0c0 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 b576a317d9..75acabe5c3 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 7f0a1bc82f..bd1e79066f 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 df0afc92cf..0a00eb2c73 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 60b6419f16..ed25fe4b03 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 e25bd79a14..dfe6c4d7a4 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 d697566ad8..0824767dbf 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 741c04f62d..48b4af33fc 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 ecb0636860..e54f701ce7 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 e1c021788e..30ebae3457 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 0108e8b123..bd541ece20 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 3553ec9909..8c80c6b6b4 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 ccbf5dc3ce..a9dcbfbb18 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 da35656560..a2a90253cd 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 c92b1967ba..ab464693eb 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 c0de8e0b75..b1205e81f2 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 7f1e3bde97..9ccbf7d878 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 0ef7da5dd7..1a458d9838 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 f37ff90c6c..38b6536487 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 1fdbb440c8..86c2aa2344 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 a66b17c7ac..e23bf552d9 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 0000000000..84e41a4a3c
--- /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 9b345a10a4..c97f169d4c 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 0cb6f112ea..89234e8ecc 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 040c3d786b..ae9d1b4808 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 9381bd39bf..d59a8b1e69 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 40ba0c022b..ebc1c48456 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 dabc57c1c0..e433559c8c 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 2f869d7114..23d8514a9a 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 076cc61753..1f17c0dddc 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 7d5d962013..15881fa0f0 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 345b4019b5..cc6c1fb4b2 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 98eb6f8de4..78dc4ddc6e 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 2c4a750b5f..a3718a32fd 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 ba9c298cd5..b6abdafed2 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 6b1b6c02e0..d7b40c3c15 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 76b0a81ceb..bbb0c3bcb2 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 021c3ae5d2..68298fcfe8 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 2bb4e2fdda..d0a7ec8675 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 fd54d36ce3..60ee2c581f 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 b5710cd13b..443b5bd008 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 2322e6a3d8..ccd3d460ee 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 458d17488a..a7b47d753f 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 ba881f178f..933c42fbe2 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 6eeab135bc..477e931684 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 2795b321d8..7aab8aba9b 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 9892b72214..70fc558ea5 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 5636bc47b0..620606a9bf 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 3a8a6ccccf..93887cb5d9 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 581009d461..0483a57c2b 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 791a8b1167..09cf695365 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 82cd829aaf..9864ccb4b0 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 1f97ec54fc..e26cf05694 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 aa3ee18c39..c848ae7bb8 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 b3dcbce4f7..dbca7feb87 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 628c6f92a7..9e45c8fae5 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 edd0d44847..5b9b08c743 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 3d4471891f..20e52fd53f 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 3b43da41a6..6a31f709f6 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 d011a91297..971441dd51 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 a29fba4f98..63baa84349 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 eef62491ec..07de7971f3 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 8cb1428c54..0244b6e7b8 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 4fcada8daf..52a98def95 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 be11d59795..72bb004685 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 df82d7e575..e9a4773318 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 8f58cdbd8d..62e7cc4c4a 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 d675f8a1f7..8241fe3f51 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 15a4df44a7..2638e19a54 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 cf426ce7a1..470c476af3 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 24d684b1bd..e43cbdb10e 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 a5f659f060..af3cb19557 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 5ab1d084dc..5d68215286 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 b58d7a836f..b6a000720d 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 db08ceaee8..bdb1e7530f 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 d020050c77..7e7939e69b 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 26ef592a86..d2214c6803 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 b7b103a9e4..58ee86483f 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 3c89dbee76..289c3803cd 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 0481a84b55..ad737e95b4 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 d1937b59c7..cd46b2bab1 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 bdc8970337..d909bd87ff 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 02361f80a7..f739a527d1 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 b319bbd3bd..b29f9b5059 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 f70eec3fae..ca72bc20f2 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 33949de20a..e00f99013a 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 dba6b54405..d46f37d02c 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 9b7a13ada8..b67407fbc1 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 536d3e01ab..09f50cba1f 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 0a97e667e1..7beb65b9bd 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 36011596a3..948f1b2d17 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 2264fd06cf..0f1bcb2627 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 ede308a548..6bf7013039 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 9c7830d793..a06c78ee58 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 d05ef2468f..2565119159 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 ce1d6fb332..7b120152da 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 206e5b062c..7d2243cb2b 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 7b75ae8002..7861bbcb7e 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 2056e8171e..010c90f1dd 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 4c5857170a..3068ece6e6 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 f9a6ff245b..2eee02b10d 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 875de68cc2..c8e13e3829 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 4f8af44d5e..c0d81c6e3b 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 edd1cbee82..ade3298dc9 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 0e7d677b21..23d1b9e314 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 ae44eaa9a4..3234cc7c55 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 ea344c2b48..d837becd83 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 cd65971797..6e96831f12 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 23f0036d84..ddf2a6304d 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 d4d6ad0459..abf67f31c8 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 23f0b19091..71636d276c 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 df3edc32b0..859b325d47 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 a120d51e1c..d0a0fb6b63 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 fe602ccbba..6500e860f2 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 2a65eddd88..a4f76df01c 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 c84d30be76..07c5c005fc 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 768cc884e1..461190e0ba 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 148eac9c87..9fd7ceea4c 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 3e62c44530..eb1187ca75 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 0d811cd84d..d7196cabc8 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 ba5f2963fd..81b6844a98 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 b07e5ee568..6375a9179e 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 4905cfa49e..0350571891 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 cf15ba115c..c815ec8fbc 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 eda15edb1b..80cd255e16 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 0c7ca06dff..f750ac1e92 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 0c538c83b8..6281ef9c9e 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 7761bbc36f..21b9f9a4d5 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 52588128a8..90648ace7d 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 da001b961c..89df71d300 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 971ac2e649..be10a12e85 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 4fbc45c99e..0887ae8c1b 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 126b2b2595..d4f85222d7 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 0126d2299b..598006be8c 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 d15b3f05c0..ac348563de 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 be80f92cfc..bcdecd9625 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 4e793fd392..52c218c624 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 dd83829589..937271c7fc 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 ab7d258cf3..ff22a93292 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 2afde37e22..c4e1a38f00 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 097a6fad20..db8a36a12d 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 977a04cd3e..f0a99903d1 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 a155471069..b3ee34bec1 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 13ec4d6737..4920f2d988 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 2aa73d83e3..a899e19129 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 1397896d58..ec5709b985 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 7df3a37257..fea9e161aa 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 f031f19663..a2045675e6 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 9165352a3e..9b36c55ecf 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 63310eb07f..f11c7b05f5 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 80c69246ca..6129921975 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 e9fef1fbaf..6f8fce372c 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 f4a2b78550..137baa2242 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 909ca0b773..d0f5387a22 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 710be206ac..f85f11d303 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 f5320ad5f3..06f807e5a6 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 84f12e5ade..7cc96c54ed 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 e29721ef6f..a1d2292b00 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 aeba8ee708..4ea0fd88d7 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 9a68a5c69a..71b1b51a83 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 ca837169fc..9e8c4eea8a 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 29146a5a7c..0789fca2b7 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 6fef82a654..c49a938585 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 d867c80e5c..18ca8ef0f0 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 00041fb9ef..71ea5732c8 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 655c13f136..46ee414fca 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 5034d45474..6fe311cd28 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 5a52d3494e..9d48d67a5b 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 1df7d291a0..7a954aa6aa 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 96bdf81af8..13c7ef0934 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 3ded328341..a886174592 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 21b6461e95..0c9270cc74 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 6bea966313..42f351b93f 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 387435bbd0..0ac7407f6f 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 fec5c6115e..5f871d149a 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 0a44f110b3..ef6cb10184 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 12b8fe6a84..640c2d012c 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 003aafab6b..198de5444c 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 97ab609f19..4856fc886a 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 4ad45a76b1..d6e4e993f3 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 b25b50cb11..014b911fb4 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 6d0861a3e3..cb57a01912 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 dc9c90505b..2831ff1f18 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 2804e4bf7b..732a9878a2 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 7a0882878d..39749e8cf8 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 c0189d4b85..c9435a1012 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 4ca3be00d1..0d81f27084 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 fab4ce7501..d836ce0235 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 9f72fdeb34..f04f18acf4 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 6847719cf3..c87226acba 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 2a92d6100a..953ab080c8 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 8a9eed15f5..654de112d1 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 2aa1fa73ef..7b6c1281ed 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 be9055dc41..953afd48da 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 de3903d789..987e7fbffc 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 7993bb00f7..3c809ce1b6 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 4a3d13c47d..97ac6a1c62 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 5cf4294d6b..578a8709ed 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 d0489f6b96..6a77be6292 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 a70e0e91d1..d2733abf7b 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 3a31c03792..0767df8c74 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 45181ecd2f..9cec105548 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 3473440ef4..afade29c26 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 b6fd9eb7bf..fb7b3b016f 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 b09a75b69c..16b3f09012 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 7476022cc1..80672e9620 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 7f7a4c5bd3..8f1af938e7 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 3b7ec032a2..1a25676f22 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 c9e69e4b07..bd2b43dfa9 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 bff7a6a797..d6bdbe176e 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 e33b6c8757..3c6bc9a3d0 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 2503a60f60..a5d4ddaa40 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 ccbfaa0d91..c70c36fc68 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 5446a99069..d6732a5529 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 02497f821f..e017ef90ad 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 90e3a1e82b..bce037849c 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 68fdb60ff7..11f39d0686 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 53d0de976f..7e58201823 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 dcccebb6aa..bfec81e075 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 6814f18431..18e4dccb51 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 c000a94dc5..28d356e352 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 9b7a13ada8..b67407fbc1 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 18f3004ad2..695b7a3ff9 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 8355ff207f..6d97ff3178 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 faf45d8705..50bfdbd01a 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 b1cf554e52..a14fc627e8 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 12a8d7ce50..a1dec7f51c 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 7198fa3e79..d66a2c9677 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 b5e3536c03..c52885db57 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 83921e5a9b..00a64b83a1 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 75e441fd7f..812a6aef51 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 7485b15b59..9e357cc78b 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 a5b18ea717..559587edef 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 93f81e85f0..2de2451538 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 58a6116394..093efdb772 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 bdfc5c2e43..574f99472b 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 f18985f4ef..94cb372885 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 245643ca09..d45566ce8a 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 4302d77dd5..9b5e93809a 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 f746790870..0323190bd9 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 a1a28ef3c6..41de55ad5c 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 79494a86c8..22d26b8092 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 8bd17e3382..e6a246e7e8 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 9f1d7fd4e1..b473c8236f 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 5f89729bf5..592d224ec5 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 a51275cf0c..8521820e27 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 3d51ffca46..d12e63c0c0 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 258d6f91ca..103156e4ab 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 38541162b7..8f79bec0a1 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 64989485c4..b097dc5304 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 099689f09a..eac51f5bea 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 75f0eaa5fa..ea626ebe01 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 21bbf92621..73d14462fe 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 00196a83a4..509f598b1f 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 91ae960b9d..ecb9510529 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 75e408669e..73308f0b30 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 c770a61d7c..d07f9e8f3f 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 f9c7b4e781..3f64f64d7b 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 aa8c74ff80..cb6ee9145d 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 2bc1436803..24b3e6c7e0 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 1596dde636..f002a22bee 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 18c5e04a71..96e401f0bf 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 d861f01d6e..08c7cc1892 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 b6c03b1f09..17332c459b 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 b61fefe3ce..5dadc72254 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 fbc9453e40..62aed95bd9 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 2b38e19538..357ac68f5f 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 58b48aff86..9e692f611e 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 76706a15cb..16820c2983 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 ce1d6fb332..7b120152da 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 83316c7cc5..48f285fd41 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 b6edafa3d3..aca1023c58 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 c5ea318737..97596f617b 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 e2188a5765..4cda134cd8 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 52d847f9f4..b792a83ca3 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 3c945cd6ce..f0cab011a0 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 6e3f807c95..7c0533f4cb 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 77f684b45d..a6aed13492 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 7ec9b46838..84fb1019a5 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 8ee57cec2f..2428a03a97 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 a6bec8ecae..c490fdf399 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 f590adc502..9a7ca3775f 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 b5802d62ac..25e34ebe96 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 b2addfb641..7f310bd559 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 5042c3998c..9e3fb82e83 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 e6876900ee..45c61e347b 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 427533e89d..2a8ee7ebce 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 2551404905..9c25fa6bb5 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 8f9166a33c..fdbfddf01a 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 23d6ff24ec..8fe2f888ad 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 4f52d233fa..ec63a4d88d 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 9a8d1b8ae0..a0d13e45e7 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 e17300052f..05b4fac682 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 d773d925d5..ffb5047aeb 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 f4fda46f7b..9f160b1ff0 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 e89758156a..d23a64f476 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 64352f647a..f17aec45f6 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 1d89dbdd61..435251a096 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 8eb2c90de3..0e184bc43a 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 03206d0b89..3091780ba8 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 ab5718ff07..1c3e72a0e0 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 e48b0c7802..1b24754fd9 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 5900c3923c..633424271c 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 92120287b9..e646474479 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 468ee2beba..aa68e0f094 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 779726ce43..c0e2cd0f88 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 21b6461e95..0c9270cc74 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 de408e8070..e34abdbc79 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 de2530b428..cdb505be36 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 21b6461e95..0c9270cc74 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 063fa31e41..63dd786cce 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 21b6461e95..0c9270cc74 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 5d870a48da..f14a30642a 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 de408e8070..e34abdbc79 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 de2530b428..cdb505be36 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 5ad91b1ff3..d02ef2dc75 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 62b52d20a0..2ddf7b241b 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 e38b674358..65bc147a85 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 c8a15b53dd..d968a78b43 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 262ab5f6ea..4d69f463f8 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 262ab5f6ea..4d69f463f8 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 063fa31e41..63dd786cce 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 21b6461e95..0c9270cc74 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 8528d6ff97..09b5835ed3 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 21b6461e95..0c9270cc74 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 d6d5bf0c58..1f8692e9db 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 ec59ff507a..d1b0286c8a 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 19ab0189b4..6dda693c7b 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 52a2ae5cf7..1c6d15fdcd 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 21b6461e95..0c9270cc74 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 59d503416a..87a3f69944 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 5dc7ee43d5..86359c15cd 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 e0819a79a0..01b50cc104 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 4177f06764..c349e2ef17 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 9d7c6aa1de..dfffd671fd 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 02dcae650a..d08ab2e66d 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 fef2834d43..1877e4e2e9 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 0c76f5acff..de1115d607 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 21d57913c8..4a170cb729 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 21b6461e95..0c9270cc74 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 19e6919f9f..3fd843d4fb 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 b7035f21da..6a704ab268 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 93c4e857d2..523d166c8d 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 cbbf5eee1d..7ed2d9b757 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 0635001612..49e31a12a4 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 899cccbc29..6d057473f8 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 0a8aacbe32..b5ee1f0c86 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 c96bad1edf..1eb30371b5 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 a6311fa92c..0a923fd46a 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 d31aa8ac90..000e4af09c 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 9c7d256fb6..2948330e2d 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 d5e21bbfe4..f2b369d89d 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 ebc709d783..001426b020 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 63946037cb..c77fa9dbb7 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 64f59eec70..c9b3e28f09 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 59dbe96d59..16a6c9a694 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 9905b2326f..142477f697 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 9188400c52..34c1f65ac2 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 c91b603916..4d682c1a2a 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 53466462f5..299dbb50d7 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 c2049c444a..c1f72b76fa 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 36078989c2..5af929ddc6 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 7c7b1af18c..19ef8881c2 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 d513f4744d..00fa581009 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 24fb560d00..c3ccbd4106 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 9186f52164..77b5ea655f 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 f8ec3ed12b..d4e65ddd36 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 52fc5c6e61..c4ecf6541c 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 387db9c772..333205cb23 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 06200209e1..7b4a599ed7 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 ec567e0e64..3e49cbff5d 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 9242953f0d..88029fb977 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 feb19cd60a..e47906d4cb 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 acda27307c..84dee956b6 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 1e7d86283c..65d0c43d36 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 3220b2edf4..2ed4a73d5d 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 ffcde05a31..e09de153b5 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 db6d61cf0e..508e2fa3d3 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 8e3a1faba5..25bd4c92e5 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 d078faa0e3..ecb2906e0f 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 b4476dd8a3..342eb5f728 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 8da8ecdf1c..d7f8580fb2 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 bb575170a4..ae4d6e269f 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 c8f5d9560c..5791d381be 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 81be93229d..bde7b87b91 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 b1d91532c1..60e41a450e 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 0af73fe709..1a7679c5d6 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 53836eb101..36f841ed17 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 0e4daabd86..94b0b6c8cf 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 d078faa0e3..ecb2906e0f 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 ba75cd3ddc..2a424882e5 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 d078faa0e3..ecb2906e0f 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 ed9f284247..7794f20bd3 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 7a801cbcfb..4b59d55730 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 d9ddb0d2de..74d5c60a0f 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 54291e541c..91ed13bfe7 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 6856e8f3e1..b742c33975 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 c3ab07ad9e..7689cd7018 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 92e3bd1e60..b74b42693d 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 60ed995491..14128ac33e 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 41fb3d9151..6ef2eb28db 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 f885333f93..83fc9f7a56 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 9663e33f61..cacc15e1b9 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 11f082cd0b..eb6998632b 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 5189101478..87a628d7f1 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 ba634bd8c5..98783c49a1 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 5661bcbb8f..900d2ac907 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 63a63b19bc..a56f75f701 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 d725ccc261..5ae7652e4f 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 53765c02af..57cc8c3ae6 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 8d63a94ad0..75cbf321ab 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 c406a9ec0e..8eb65657bb 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 43b771e62e..b55d6c0ea6 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 30eba6ca2c..d74596c9d3 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 09bbde4943..f21dbbf2cb 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 df878e3ce3..97129438ce 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 62dd871d81..fbd3948e70 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 f3581801cc..9145a36ee2 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 43ea47210b..6b25712a11 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 697d022af7..fa2d73ad1b 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 d078faa0e3..ecb2906e0f 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 c47599fe50..f7dbe5f8a2 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 aa80596bb9..c63582df97 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 78e7d0eda5..72a6b9c47e 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 fe03cbb2ad..4c090a4303 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 9e0f3c0905..867a764351 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 cf9d3f384e..f1ddfc413a 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 98d8c55dcb..4c7d78c219 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 5d341014f2..30f9a31720 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 9ee1d39568..66e8e6cd83 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 5a1779cfb8..060d9c79f2 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 09d0c033f9..bddd8aef03 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 fd913a1050..d101300576 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 a62d100245..d8a4f6606f 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 d899208911..897c8213b0 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 50bdcdb81b..dad2caec7f 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 f9b95d4673..6a56b960c6 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 c851acc3f7..deb61a7f29 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 32d6313ec2..33fa586a0e 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 b772a2ab2a..9b01d5d402 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 92bd020ab0..a12f402e56 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 a84abbe89e..6c3aafa7a2 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 a976567174..cf3068d5ff 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 8d8e2caa03..cce0dbd360 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;
--
GitLab