From 8d18419a8dfa5a8b63b0b7c9e402824ebdce1100 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@tadpole.cc>
Date: Thu, 21 Apr 2016 13:53:02 -0400
Subject: [PATCH] CiviCRM 4.7.6 update
---
civicrm/CRM/ACL/API.php | 4 +-
civicrm/CRM/ACL/BAO/ACL.php | 4 +-
civicrm/CRM/ACL/BAO/Cache.php | 4 +-
civicrm/CRM/ACL/BAO/EntityRole.php | 4 +-
civicrm/CRM/ACL/DAO/ACL.php | 4 +-
civicrm/CRM/ACL/DAO/Cache.php | 4 +-
civicrm/CRM/ACL/DAO/EntityRole.php | 4 +-
civicrm/CRM/ACL/Form/ACL.php | 4 +-
civicrm/CRM/ACL/Form/ACLBasic.php | 4 +-
civicrm/CRM/ACL/Form/EntityRole.php | 4 +-
.../CRM/ACL/Form/WordPress/Permissions.php | 4 +-
civicrm/CRM/ACL/Page/ACL.php | 4 +-
civicrm/CRM/ACL/Page/ACLBasic.php | 4 +-
civicrm/CRM/ACL/Page/EntityRole.php | 4 +-
civicrm/CRM/Activity/ActionMapping.php | 4 +-
civicrm/CRM/Activity/BAO/Activity.php | 4 +-
.../CRM/Activity/BAO/ActivityAssignment.php | 4 +-
civicrm/CRM/Activity/BAO/ActivityContact.php | 4 +-
civicrm/CRM/Activity/BAO/ActivityTarget.php | 4 +-
civicrm/CRM/Activity/BAO/ICalendar.php | 4 +-
civicrm/CRM/Activity/BAO/Query.php | 4 +-
civicrm/CRM/Activity/Controller/Search.php | 4 +-
civicrm/CRM/Activity/DAO/Activity.php | 4 +-
civicrm/CRM/Activity/DAO/ActivityContact.php | 4 +-
civicrm/CRM/Activity/Form/Activity.php | 4 +-
civicrm/CRM/Activity/Form/ActivityFilter.php | 4 +-
civicrm/CRM/Activity/Form/ActivityLinks.php | 4 +-
civicrm/CRM/Activity/Form/ActivityView.php | 4 +-
civicrm/CRM/Activity/Form/Search.php | 4 +-
civicrm/CRM/Activity/Form/Task.php | 4 +-
civicrm/CRM/Activity/Form/Task/AddToTag.php | 4 +-
civicrm/CRM/Activity/Form/Task/Batch.php | 4 +-
civicrm/CRM/Activity/Form/Task/Delete.php | 4 +-
civicrm/CRM/Activity/Form/Task/Email.php | 4 +-
civicrm/CRM/Activity/Form/Task/FileOnCase.php | 4 +-
civicrm/CRM/Activity/Form/Task/PickOption.php | 4 +-
.../CRM/Activity/Form/Task/PickProfile.php | 4 +-
civicrm/CRM/Activity/Form/Task/Print.php | 4 +-
.../CRM/Activity/Form/Task/RemoveFromTag.php | 4 +-
civicrm/CRM/Activity/Form/Task/SMS.php | 4 +-
.../Form/Task/SearchTaskHookSample.php | 4 +-
civicrm/CRM/Activity/Import/Controller.php | 4 +-
civicrm/CRM/Activity/Import/Field.php | 4 +-
.../CRM/Activity/Import/Form/DataSource.php | 4 +-
civicrm/CRM/Activity/Import/Form/MapField.php | 4 +-
civicrm/CRM/Activity/Import/Form/Preview.php | 4 +-
civicrm/CRM/Activity/Import/Form/Summary.php | 4 +-
civicrm/CRM/Activity/Import/Parser.php | 4 +-
.../CRM/Activity/Import/Parser/Activity.php | 4 +-
civicrm/CRM/Activity/Page/AJAX.php | 4 +-
civicrm/CRM/Activity/Page/Tab.php | 4 +-
civicrm/CRM/Activity/Page/UserDashboard.php | 4 +-
civicrm/CRM/Activity/Selector/Activity.php | 4 +-
civicrm/CRM/Activity/Selector/Search.php | 4 +-
civicrm/CRM/Activity/StateMachine/Search.php | 4 +-
civicrm/CRM/Activity/Task.php | 4 +-
civicrm/CRM/Activity/Tokens.php | 4 +-
civicrm/CRM/Admin/Form.php | 4 +-
civicrm/CRM/Admin/Form/CMSUser.php | 4 +-
civicrm/CRM/Admin/Form/ContactType.php | 4 +-
civicrm/CRM/Admin/Form/Extensions.php | 4 +-
civicrm/CRM/Admin/Form/Job.php | 4 +-
civicrm/CRM/Admin/Form/LabelFormats.php | 2 +-
civicrm/CRM/Admin/Form/LocationType.php | 4 +-
civicrm/CRM/Admin/Form/MailSettings.php | 4 +-
civicrm/CRM/Admin/Form/Mapping.php | 4 +-
civicrm/CRM/Admin/Form/MessageTemplates.php | 5 +-
civicrm/CRM/Admin/Form/Navigation.php | 4 +-
civicrm/CRM/Admin/Form/OptionGroup.php | 4 +-
civicrm/CRM/Admin/Form/Options.php | 4 +-
.../CRM/Admin/Form/ParticipantStatusType.php | 4 +-
civicrm/CRM/Admin/Form/PaymentProcessor.php | 4 +-
.../CRM/Admin/Form/PaymentProcessorType.php | 4 +-
civicrm/CRM/Admin/Form/PdfFormats.php | 2 +-
civicrm/CRM/Admin/Form/Persistent.php | 4 +-
civicrm/CRM/Admin/Form/Preferences.php | 4 +-
.../CRM/Admin/Form/Preferences/Address.php | 4 +-
.../CRM/Admin/Form/Preferences/Campaign.php | 4 +-
.../CRM/Admin/Form/Preferences/Contribute.php | 4 +-
.../CRM/Admin/Form/Preferences/Display.php | 4 +-
civicrm/CRM/Admin/Form/Preferences/Event.php | 4 +-
.../CRM/Admin/Form/Preferences/Mailing.php | 4 +-
civicrm/CRM/Admin/Form/Preferences/Member.php | 4 +-
.../CRM/Admin/Form/Preferences/Multisite.php | 4 +-
civicrm/CRM/Admin/Form/PreferencesDate.php | 4 +-
civicrm/CRM/Admin/Form/RelationshipType.php | 4 +-
civicrm/CRM/Admin/Form/ScheduleReminders.php | 12 +-
civicrm/CRM/Admin/Form/Setting.php | 4 +-
civicrm/CRM/Admin/Form/Setting/Component.php | 4 +-
civicrm/CRM/Admin/Form/Setting/Date.php | 4 +-
civicrm/CRM/Admin/Form/Setting/Debugging.php | 4 +-
.../CRM/Admin/Form/Setting/Localization.php | 4 +-
civicrm/CRM/Admin/Form/Setting/Mail.php | 4 +-
civicrm/CRM/Admin/Form/Setting/Mapping.php | 4 +-
.../CRM/Admin/Form/Setting/Miscellaneous.php | 4 +-
civicrm/CRM/Admin/Form/Setting/Path.php | 4 +-
civicrm/CRM/Admin/Form/Setting/Search.php | 4 +-
civicrm/CRM/Admin/Form/Setting/Smtp.php | 4 +-
civicrm/CRM/Admin/Form/Setting/UF.php | 4 +-
.../Form/Setting/UpdateConfigBackend.php | 4 +-
civicrm/CRM/Admin/Form/Setting/Url.php | 4 +-
civicrm/CRM/Admin/Form/Tag.php | 4 +-
civicrm/CRM/Admin/Form/WordReplacements.php | 4 +-
civicrm/CRM/Admin/Page/AJAX.php | 4 +-
civicrm/CRM/Admin/Page/APIExplorer.php | 4 +-
civicrm/CRM/Admin/Page/Access.php | 8 +-
civicrm/CRM/Admin/Page/Admin.php | 4 +-
civicrm/CRM/Admin/Page/CKEditorConfig.php | 4 +-
civicrm/CRM/Admin/Page/ConfigTaskList.php | 4 +-
civicrm/CRM/Admin/Page/ContactType.php | 4 +-
civicrm/CRM/Admin/Page/EventTemplate.php | 4 +-
civicrm/CRM/Admin/Page/Extensions.php | 4 +-
civicrm/CRM/Admin/Page/Job.php | 4 +-
civicrm/CRM/Admin/Page/JobLog.php | 4 +-
civicrm/CRM/Admin/Page/LabelFormats.php | 2 +-
civicrm/CRM/Admin/Page/LocationType.php | 4 +-
civicrm/CRM/Admin/Page/MailSettings.php | 4 +-
civicrm/CRM/Admin/Page/Mapping.php | 4 +-
civicrm/CRM/Admin/Page/MessageTemplates.php | 4 +-
civicrm/CRM/Admin/Page/Navigation.php | 4 +-
civicrm/CRM/Admin/Page/Options.php | 4 +-
.../CRM/Admin/Page/ParticipantStatusType.php | 4 +-
civicrm/CRM/Admin/Page/PaymentProcessor.php | 4 +-
.../CRM/Admin/Page/PaymentProcessorType.php | 4 +-
civicrm/CRM/Admin/Page/PdfFormats.php | 2 +-
civicrm/CRM/Admin/Page/Persistent.php | 4 +-
civicrm/CRM/Admin/Page/PreferencesDate.php | 4 +-
civicrm/CRM/Admin/Page/RelationshipType.php | 4 +-
civicrm/CRM/Admin/Page/ScheduleReminders.php | 4 +-
civicrm/CRM/Admin/Page/Setting.php | 4 +-
civicrm/CRM/Admin/Page/Tag.php | 4 +-
civicrm/CRM/Badge/BAO/Badge.php | 2 +-
civicrm/CRM/Badge/BAO/Layout.php | 4 +-
civicrm/CRM/Badge/Form/Layout.php | 4 +-
civicrm/CRM/Badge/Page/AJAX.php | 4 +-
civicrm/CRM/Badge/Page/Layout.php | 4 +-
civicrm/CRM/Batch/BAO/Batch.php | 4 +-
civicrm/CRM/Batch/BAO/EntityBatch.php | 6 +-
civicrm/CRM/Batch/DAO/Batch.php | 4 +-
civicrm/CRM/Batch/DAO/EntityBatch.php | 4 +-
civicrm/CRM/Batch/Form/Batch.php | 2 +-
civicrm/CRM/Batch/Form/Entry.php | 4 +-
civicrm/CRM/Batch/Form/Search.php | 4 +-
civicrm/CRM/Batch/Page/AJAX.php | 4 +-
civicrm/CRM/Batch/Page/Batch.php | 4 +-
civicrm/CRM/Bridge/OG/CiviCRM.php | 4 +-
civicrm/CRM/Bridge/OG/Drupal.php | 4 +-
civicrm/CRM/Bridge/OG/Utils.php | 4 +-
civicrm/CRM/Campaign/BAO/Campaign.php | 4 +-
civicrm/CRM/Campaign/BAO/Petition.php | 4 +-
civicrm/CRM/Campaign/BAO/Query.php | 4 +-
civicrm/CRM/Campaign/BAO/Survey.php | 4 +-
civicrm/CRM/Campaign/Controller/Search.php | 4 +-
civicrm/CRM/Campaign/DAO/Campaign.php | 4 +-
civicrm/CRM/Campaign/DAO/CampaignGroup.php | 4 +-
civicrm/CRM/Campaign/DAO/Survey.php | 4 +-
civicrm/CRM/Campaign/Form/Campaign.php | 4 +-
civicrm/CRM/Campaign/Form/Gotv.php | 4 +-
civicrm/CRM/Campaign/Form/Petition.php | 4 +-
.../CRM/Campaign/Form/Petition/Signature.php | 4 +-
civicrm/CRM/Campaign/Form/Search.php | 4 +-
civicrm/CRM/Campaign/Form/Search/Campaign.php | 4 +-
civicrm/CRM/Campaign/Form/Search/Petition.php | 4 +-
civicrm/CRM/Campaign/Form/Search/Survey.php | 4 +-
civicrm/CRM/Campaign/Form/Survey.php | 4 +-
civicrm/CRM/Campaign/Form/Survey/Delete.php | 4 +-
civicrm/CRM/Campaign/Form/Survey/Main.php | 4 +-
.../CRM/Campaign/Form/Survey/Questions.php | 4 +-
civicrm/CRM/Campaign/Form/Survey/Results.php | 4 +-
.../CRM/Campaign/Form/Survey/TabHeader.php | 4 +-
civicrm/CRM/Campaign/Form/SurveyType.php | 4 +-
civicrm/CRM/Campaign/Form/Task.php | 4 +-
civicrm/CRM/Campaign/Form/Task/Interview.php | 4 +-
civicrm/CRM/Campaign/Form/Task/Print.php | 4 +-
civicrm/CRM/Campaign/Form/Task/Release.php | 4 +-
civicrm/CRM/Campaign/Form/Task/Reserve.php | 4 +-
civicrm/CRM/Campaign/Form/Task/Result.php | 4 +-
civicrm/CRM/Campaign/Info.php | 4 +-
civicrm/CRM/Campaign/Page/AJAX.php | 4 +-
civicrm/CRM/Campaign/Page/DashBoard.php | 4 +-
civicrm/CRM/Campaign/Page/Petition.php | 4 +-
.../CRM/Campaign/Page/Petition/Confirm.php | 4 +-
.../CRM/Campaign/Page/Petition/ThankYou.php | 4 +-
civicrm/CRM/Campaign/Page/SurveyType.php | 4 +-
civicrm/CRM/Campaign/Page/Vote.php | 4 +-
civicrm/CRM/Campaign/PseudoConstant.php | 4 +-
civicrm/CRM/Campaign/Selector/Search.php | 4 +-
civicrm/CRM/Campaign/StateMachine/Search.php | 4 +-
civicrm/CRM/Campaign/Task.php | 4 +-
civicrm/CRM/Case/BAO/Case.php | 4 +-
civicrm/CRM/Case/BAO/CaseContact.php | 4 +-
civicrm/CRM/Case/BAO/CaseType.php | 4 +-
civicrm/CRM/Case/BAO/Query.php | 4 +-
civicrm/CRM/Case/Controller/Search.php | 4 +-
civicrm/CRM/Case/DAO/Case.php | 4 +-
civicrm/CRM/Case/DAO/CaseActivity.php | 4 +-
civicrm/CRM/Case/DAO/CaseContact.php | 4 +-
civicrm/CRM/Case/DAO/CaseType.php | 4 +-
civicrm/CRM/Case/Form/Activity.php | 6 +-
.../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 | 4 +-
civicrm/CRM/Case/Form/Activity/OpenCase.php | 4 +-
civicrm/CRM/Case/Form/ActivityToCase.php | 4 +-
civicrm/CRM/Case/Form/ActivityView.php | 4 +-
civicrm/CRM/Case/Form/Case.php | 4 +-
civicrm/CRM/Case/Form/CaseView.php | 4 +-
civicrm/CRM/Case/Form/CustomData.php | 4 +-
civicrm/CRM/Case/Form/EditClient.php | 4 +-
civicrm/CRM/Case/Form/Report.php | 4 +-
civicrm/CRM/Case/Form/Search.php | 4 +-
civicrm/CRM/Case/Form/Task.php | 4 +-
civicrm/CRM/Case/Form/Task/Delete.php | 4 +-
civicrm/CRM/Case/Form/Task/Print.php | 4 +-
civicrm/CRM/Case/Form/Task/Restore.php | 4 +-
civicrm/CRM/Case/Form/Task/Result.php | 4 +-
.../Case/Form/Task/SearchTaskHookSample.php | 4 +-
civicrm/CRM/Case/Info.php | 4 +-
civicrm/CRM/Case/Page/AJAX.php | 4 +-
civicrm/CRM/Case/Page/CaseDetails.php | 4 +-
civicrm/CRM/Case/Page/DashBoard.php | 4 +-
civicrm/CRM/Case/Page/Tab.php | 4 +-
civicrm/CRM/Case/PseudoConstant.php | 4 +-
civicrm/CRM/Case/Selector/Search.php | 4 +-
civicrm/CRM/Case/StateMachine/Search.php | 4 +-
civicrm/CRM/Case/Task.php | 4 +-
civicrm/CRM/Case/XMLProcessor.php | 4 +-
civicrm/CRM/Case/XMLProcessor/Process.php | 4 +-
civicrm/CRM/Case/XMLProcessor/Report.php | 4 +-
civicrm/CRM/Case/XMLProcessor/Settings.php | 4 +-
civicrm/CRM/Case/XMLRepository.php | 4 +-
civicrm/CRM/Contact/ActionMapping.php | 2 +-
civicrm/CRM/Contact/BAO/Contact.php | 4 +-
civicrm/CRM/Contact/BAO/Contact/Location.php | 4 +-
civicrm/CRM/Contact/BAO/Contact/Optimizer.php | 4 +-
.../CRM/Contact/BAO/Contact/Permission.php | 4 +-
civicrm/CRM/Contact/BAO/Contact/Utils.php | 4 +-
civicrm/CRM/Contact/BAO/ContactType.php | 4 +-
civicrm/CRM/Contact/BAO/DashboardContact.php | 4 +-
civicrm/CRM/Contact/BAO/Group.php | 7 +-
civicrm/CRM/Contact/BAO/GroupContact.php | 4 +-
civicrm/CRM/Contact/BAO/GroupContactCache.php | 4 +-
civicrm/CRM/Contact/BAO/GroupNestingCache.php | 4 +-
civicrm/CRM/Contact/BAO/GroupOrganization.php | 4 +-
civicrm/CRM/Contact/BAO/Household.php | 4 +-
civicrm/CRM/Contact/BAO/Individual.php | 4 +-
civicrm/CRM/Contact/BAO/ProximityQuery.php | 4 +-
civicrm/CRM/Contact/BAO/Query.php | 31 +-
civicrm/CRM/Contact/BAO/Query/Hook.php | 4 +-
civicrm/CRM/Contact/BAO/Query/Interface.php | 4 +-
civicrm/CRM/Contact/BAO/Relationship.php | 2 +-
civicrm/CRM/Contact/BAO/RelationshipType.php | 4 +-
civicrm/CRM/Contact/BAO/SavedSearch.php | 4 +-
civicrm/CRM/Contact/BAO/SearchCustom.php | 4 +-
.../CRM/Contact/BAO/SubscriptionHistory.php | 4 +-
civicrm/CRM/Contact/Controller/Search.php | 4 +-
civicrm/CRM/Contact/DAO/ACLContactCache.php | 4 +-
civicrm/CRM/Contact/DAO/Contact.php | 4 +-
civicrm/CRM/Contact/DAO/ContactType.php | 4 +-
civicrm/CRM/Contact/DAO/DashboardContact.php | 4 +-
civicrm/CRM/Contact/DAO/Group.php | 4 +-
civicrm/CRM/Contact/DAO/GroupContact.php | 4 +-
civicrm/CRM/Contact/DAO/GroupContactCache.php | 4 +-
civicrm/CRM/Contact/DAO/GroupNesting.php | 4 +-
civicrm/CRM/Contact/DAO/GroupOrganization.php | 4 +-
civicrm/CRM/Contact/DAO/Relationship.php | 4 +-
civicrm/CRM/Contact/DAO/RelationshipType.php | 4 +-
civicrm/CRM/Contact/DAO/SavedSearch.php | 4 +-
.../CRM/Contact/DAO/SubscriptionHistory.php | 4 +-
civicrm/CRM/Contact/Form/Contact.php | 4 +-
civicrm/CRM/Contact/Form/CustomData.php | 13 +-
civicrm/CRM/Contact/Form/DedupeFind.php | 4 +-
civicrm/CRM/Contact/Form/DedupeRules.php | 4 +-
civicrm/CRM/Contact/Form/Domain.php | 4 +-
civicrm/CRM/Contact/Form/Edit/Address.php | 4 +-
.../Form/Edit/CommunicationPreferences.php | 4 +-
civicrm/CRM/Contact/Form/Edit/CustomData.php | 4 +-
.../CRM/Contact/Form/Edit/Demographics.php | 4 +-
civicrm/CRM/Contact/Form/Edit/Email.php | 4 +-
civicrm/CRM/Contact/Form/Edit/Household.php | 4 +-
civicrm/CRM/Contact/Form/Edit/IM.php | 4 +-
civicrm/CRM/Contact/Form/Edit/Individual.php | 4 +-
civicrm/CRM/Contact/Form/Edit/Lock.php | 4 +-
civicrm/CRM/Contact/Form/Edit/Notes.php | 4 +-
civicrm/CRM/Contact/Form/Edit/OpenID.php | 4 +-
.../CRM/Contact/Form/Edit/Organization.php | 4 +-
civicrm/CRM/Contact/Form/Edit/Phone.php | 4 +-
.../CRM/Contact/Form/Edit/TagsAndGroups.php | 4 +-
civicrm/CRM/Contact/Form/Edit/Website.php | 4 +-
civicrm/CRM/Contact/Form/GroupContact.php | 4 +-
civicrm/CRM/Contact/Form/Inline.php | 4 +-
civicrm/CRM/Contact/Form/Inline/Address.php | 4 +-
.../Form/Inline/CommunicationPreferences.php | 4 +-
.../CRM/Contact/Form/Inline/ContactInfo.php | 4 +-
.../CRM/Contact/Form/Inline/ContactName.php | 4 +-
.../CRM/Contact/Form/Inline/CustomData.php | 4 +-
.../CRM/Contact/Form/Inline/Demographics.php | 4 +-
civicrm/CRM/Contact/Form/Inline/Email.php | 4 +-
civicrm/CRM/Contact/Form/Inline/IM.php | 4 +-
civicrm/CRM/Contact/Form/Inline/Lock.php | 4 +-
civicrm/CRM/Contact/Form/Inline/OpenID.php | 4 +-
civicrm/CRM/Contact/Form/Inline/Phone.php | 4 +-
civicrm/CRM/Contact/Form/Inline/Website.php | 4 +-
civicrm/CRM/Contact/Form/Location.php | 4 +-
civicrm/CRM/Contact/Form/Merge.php | 4 +-
civicrm/CRM/Contact/Form/RelatedContact.php | 4 +-
civicrm/CRM/Contact/Form/Relationship.php | 2 +-
civicrm/CRM/Contact/Form/Search.php | 4 +-
civicrm/CRM/Contact/Form/Search/Advanced.php | 4 +-
civicrm/CRM/Contact/Form/Search/Basic.php | 4 +-
civicrm/CRM/Contact/Form/Search/Builder.php | 4 +-
civicrm/CRM/Contact/Form/Search/Criteria.php | 4 +-
civicrm/CRM/Contact/Form/Search/Custom.php | 4 +-
.../Form/Search/Custom/ActivitySearch.php | 4 +-
.../CRM/Contact/Form/Search/Custom/Base.php | 4 +-
.../CRM/Contact/Form/Search/Custom/Basic.php | 5 +-
.../Form/Search/Custom/ContribSYBNT.php | 4 +-
.../Search/Custom/ContributionAggregate.php | 4 +-
.../Contact/Form/Search/Custom/DateAdded.php | 4 +-
.../Form/Search/Custom/EventAggregate.php | 4 +-
.../Contact/Form/Search/Custom/FullText.php | 4 +-
.../Custom/FullText/AbstractPartialQuery.php | 4 +-
.../Form/Search/Custom/FullText/Activity.php | 4 +-
.../Form/Search/Custom/FullText/Case.php | 4 +-
.../Form/Search/Custom/FullText/Contact.php | 4 +-
.../Search/Custom/FullText/Contribution.php | 4 +-
.../Search/Custom/FullText/Membership.php | 4 +-
.../Search/Custom/FullText/Participant.php | 4 +-
.../CRM/Contact/Form/Search/Custom/Group.php | 4 +-
.../Form/Search/Custom/MultipleValues.php | 4 +-
.../Form/Search/Custom/PostalMailing.php | 4 +-
.../Contact/Form/Search/Custom/PriceSet.php | 4 +-
.../Contact/Form/Search/Custom/Proximity.php | 4 +-
.../Form/Search/Custom/RandomSegment.php | 4 +-
.../CRM/Contact/Form/Search/Custom/Sample.php | 4 +-
.../Form/Search/Custom/TagContributions.php | 4 +-
.../Form/Search/Custom/ZipCodeRange.php | 4 +-
civicrm/CRM/Contact/Form/Search/Interface.php | 4 +-
civicrm/CRM/Contact/Form/Task.php | 4 +-
civicrm/CRM/Contact/Form/Task/AddToGroup.php | 4 +-
.../CRM/Contact/Form/Task/AddToHousehold.php | 2 +-
.../Contact/Form/Task/AddToOrganization.php | 4 +-
.../Contact/Form/Task/AddToParentClass.php | 2 +-
civicrm/CRM/Contact/Form/Task/AddToTag.php | 4 +-
.../Contact/Form/Task/AlterPreferences.php | 4 +-
civicrm/CRM/Contact/Form/Task/Batch.php | 4 +-
civicrm/CRM/Contact/Form/Task/Delete.php | 4 +-
civicrm/CRM/Contact/Form/Task/Email.php | 4 +-
civicrm/CRM/Contact/Form/Task/EmailCommon.php | 4 +-
civicrm/CRM/Contact/Form/Task/HookSample.php | 4 +-
civicrm/CRM/Contact/Form/Task/Label.php | 4 +-
civicrm/CRM/Contact/Form/Task/LabelCommon.php | 4 +-
civicrm/CRM/Contact/Form/Task/Map.php | 4 +-
civicrm/CRM/Contact/Form/Task/Map/Event.php | 4 +-
civicrm/CRM/Contact/Form/Task/Merge.php | 4 +-
civicrm/CRM/Contact/Form/Task/PDF.php | 4 +-
.../CRM/Contact/Form/Task/PDFLetterCommon.php | 4 +-
civicrm/CRM/Contact/Form/Task/PickProfile.php | 4 +-
civicrm/CRM/Contact/Form/Task/Print.php | 4 +-
.../CRM/Contact/Form/Task/ProximityCommon.php | 4 +-
.../CRM/Contact/Form/Task/RemoveFromGroup.php | 4 +-
.../CRM/Contact/Form/Task/RemoveFromTag.php | 4 +-
civicrm/CRM/Contact/Form/Task/Result.php | 4 +-
civicrm/CRM/Contact/Form/Task/SMS.php | 4 +-
civicrm/CRM/Contact/Form/Task/SMSCommon.php | 4 +-
civicrm/CRM/Contact/Form/Task/SaveSearch.php | 4 +-
.../Contact/Form/Task/SaveSearch/Update.php | 4 +-
civicrm/CRM/Contact/Form/Task/Useradd.php | 2 +-
civicrm/CRM/Contact/Import/Controller.php | 4 +-
civicrm/CRM/Contact/Import/Field.php | 2 +-
.../CRM/Contact/Import/Form/DataSource.php | 4 +-
civicrm/CRM/Contact/Import/Form/MapField.php | 4 +-
civicrm/CRM/Contact/Import/Form/Preview.php | 4 +-
civicrm/CRM/Contact/Import/Form/Summary.php | 4 +-
civicrm/CRM/Contact/Import/ImportJob.php | 4 +-
civicrm/CRM/Contact/Import/Importer.php | 4 +-
civicrm/CRM/Contact/Import/Page/AJAX.php | 4 +-
civicrm/CRM/Contact/Import/Parser.php | 4 +-
civicrm/CRM/Contact/Import/Parser/Contact.php | 4 +-
civicrm/CRM/Contact/Page/AJAX.php | 4 +-
civicrm/CRM/Contact/Page/CustomSearch.php | 4 +-
civicrm/CRM/Contact/Page/DashBoard.php | 4 +-
civicrm/CRM/Contact/Page/Dashlet.php | 4 +-
civicrm/CRM/Contact/Page/DedupeException.php | 4 +-
civicrm/CRM/Contact/Page/DedupeFind.php | 4 +-
civicrm/CRM/Contact/Page/DedupeMerge.php | 4 +-
civicrm/CRM/Contact/Page/DedupeRules.php | 4 +-
civicrm/CRM/Contact/Page/ImageFile.php | 4 +-
civicrm/CRM/Contact/Page/Inline/Actions.php | 4 +-
civicrm/CRM/Contact/Page/Inline/Address.php | 4 +-
.../Page/Inline/CommunicationPreferences.php | 4 +-
.../CRM/Contact/Page/Inline/ContactInfo.php | 4 +-
.../CRM/Contact/Page/Inline/ContactName.php | 4 +-
.../CRM/Contact/Page/Inline/CustomData.php | 4 +-
.../CRM/Contact/Page/Inline/Demographics.php | 4 +-
civicrm/CRM/Contact/Page/Inline/Email.php | 4 +-
civicrm/CRM/Contact/Page/Inline/IM.php | 4 +-
civicrm/CRM/Contact/Page/Inline/OpenID.php | 4 +-
civicrm/CRM/Contact/Page/Inline/Phone.php | 4 +-
civicrm/CRM/Contact/Page/Inline/Website.php | 4 +-
civicrm/CRM/Contact/Page/SavedSearch.php | 4 +-
civicrm/CRM/Contact/Page/Task.php | 4 +-
civicrm/CRM/Contact/Page/View.php | 4 +-
.../Contact/Page/View/ContactSmartGroup.php | 4 +-
civicrm/CRM/Contact/Page/View/CustomData.php | 6 +-
.../CRM/Contact/Page/View/GroupContact.php | 4 +-
civicrm/CRM/Contact/Page/View/Log.php | 4 +-
civicrm/CRM/Contact/Page/View/Note.php | 4 +-
civicrm/CRM/Contact/Page/View/Print.php | 4 +-
.../CRM/Contact/Page/View/Relationship.php | 4 +-
civicrm/CRM/Contact/Page/View/Summary.php | 4 +-
civicrm/CRM/Contact/Page/View/Tag.php | 4 +-
.../CRM/Contact/Page/View/UserDashBoard.php | 4 +-
.../Page/View/UserDashBoard/GroupContact.php | 4 +-
civicrm/CRM/Contact/Page/View/Useradd.php | 2 +-
civicrm/CRM/Contact/Page/View/Vcard.php | 4 +-
civicrm/CRM/Contact/Selector.php | 4 +-
civicrm/CRM/Contact/Selector/Controller.php | 4 +-
civicrm/CRM/Contact/Selector/Custom.php | 4 +-
civicrm/CRM/Contact/StateMachine/Search.php | 4 +-
civicrm/CRM/Contact/Task.php | 4 +-
.../CRM/Contribute/ActionMapping/ByPage.php | 2 +-
.../CRM/Contribute/ActionMapping/ByType.php | 2 +-
civicrm/CRM/Contribute/BAO/Contribution.php | 11 +-
.../CRM/Contribute/BAO/Contribution/Utils.php | 4 +-
.../CRM/Contribute/BAO/ContributionPage.php | 4 +-
.../CRM/Contribute/BAO/ContributionRecur.php | 5 +-
.../CRM/Contribute/BAO/ContributionSoft.php | 4 +-
civicrm/CRM/Contribute/BAO/ManagePremiums.php | 4 +-
civicrm/CRM/Contribute/BAO/Premium.php | 4 +-
civicrm/CRM/Contribute/BAO/Query.php | 4 +-
civicrm/CRM/Contribute/BAO/Widget.php | 4 +-
.../Contribute/Controller/Contribution.php | 4 +-
.../Controller/ContributionPage.php | 4 +-
civicrm/CRM/Contribute/Controller/Search.php | 4 +-
civicrm/CRM/Contribute/DAO/Contribution.php | 4 +-
.../CRM/Contribute/DAO/ContributionPage.php | 4 +-
.../Contribute/DAO/ContributionProduct.php | 4 +-
.../CRM/Contribute/DAO/ContributionRecur.php | 4 +-
.../CRM/Contribute/DAO/ContributionSoft.php | 4 +-
civicrm/CRM/Contribute/DAO/Premium.php | 4 +-
.../CRM/Contribute/DAO/PremiumsProduct.php | 4 +-
civicrm/CRM/Contribute/DAO/Product.php | 4 +-
civicrm/CRM/Contribute/DAO/Widget.php | 4 +-
civicrm/CRM/Contribute/Form.php | 4 +-
.../Contribute/Form/AbstractEditPayment.php | 4 +-
.../CRM/Contribute/Form/AdditionalInfo.php | 4 +-
.../CRM/Contribute/Form/AdditionalPayment.php | 4 +-
.../Contribute/Form/CancelSubscription.php | 4 +-
civicrm/CRM/Contribute/Form/Contribution.php | 2 +-
.../Contribute/Form/Contribution/Confirm.php | 62 +-
.../CRM/Contribute/Form/Contribution/Main.php | 9 +-
.../Contribute/Form/Contribution/ThankYou.php | 11 +-
.../CRM/Contribute/Form/ContributionBase.php | 8 +-
.../Contribute/Form/ContributionCharts.php | 4 +-
.../CRM/Contribute/Form/ContributionPage.php | 4 +-
.../Form/ContributionPage/AddProduct.php | 4 +-
.../Form/ContributionPage/Amount.php | 4 +-
.../Form/ContributionPage/Custom.php | 4 +-
.../Form/ContributionPage/Delete.php | 4 +-
.../Form/ContributionPage/Premium.php | 4 +-
.../Form/ContributionPage/Settings.php | 4 +-
.../Form/ContributionPage/TabHeader.php | 4 +-
.../Form/ContributionPage/ThankYou.php | 4 +-
.../Form/ContributionPage/Widget.php | 4 +-
.../CRM/Contribute/Form/ContributionView.php | 4 +-
.../CRM/Contribute/Form/ManagePremiums.php | 4 +-
civicrm/CRM/Contribute/Form/Search.php | 4 +-
.../Contribute/Form/SearchContribution.php | 4 +-
civicrm/CRM/Contribute/Form/SoftCredit.php | 4 +-
civicrm/CRM/Contribute/Form/Task.php | 4 +-
civicrm/CRM/Contribute/Form/Task/Batch.php | 4 +-
civicrm/CRM/Contribute/Form/Task/Delete.php | 4 +-
civicrm/CRM/Contribute/Form/Task/Email.php | 4 +-
civicrm/CRM/Contribute/Form/Task/Invoice.php | 4 +-
civicrm/CRM/Contribute/Form/Task/PDF.php | 6 +-
.../CRM/Contribute/Form/Task/PDFLetter.php | 4 +-
.../CRM/Contribute/Form/Task/PickProfile.php | 4 +-
civicrm/CRM/Contribute/Form/Task/Print.php | 4 +-
civicrm/CRM/Contribute/Form/Task/Result.php | 4 +-
.../Form/Task/SearchTaskHookSample.php | 4 +-
civicrm/CRM/Contribute/Form/Task/Status.php | 4 +-
civicrm/CRM/Contribute/Form/UpdateBilling.php | 4 +-
.../Contribute/Form/UpdateSubscription.php | 4 +-
civicrm/CRM/Contribute/Import/Controller.php | 4 +-
civicrm/CRM/Contribute/Import/Field.php | 4 +-
.../CRM/Contribute/Import/Form/DataSource.php | 4 +-
.../CRM/Contribute/Import/Form/MapField.php | 4 +-
.../CRM/Contribute/Import/Form/Preview.php | 4 +-
.../CRM/Contribute/Import/Form/Summary.php | 4 +-
civicrm/CRM/Contribute/Import/Parser.php | 4 +-
.../Contribute/Import/Parser/Contribution.php | 4 +-
civicrm/CRM/Contribute/Info.php | 4 +-
.../CRM/Contribute/Page/ContributionPage.php | 4 +-
.../CRM/Contribute/Page/ContributionRecur.php | 4 +-
civicrm/CRM/Contribute/Page/DashBoard.php | 4 +-
.../CRM/Contribute/Page/ManagePremiums.php | 4 +-
civicrm/CRM/Contribute/Page/PaymentInfo.php | 12 +-
civicrm/CRM/Contribute/Page/Premium.php | 4 +-
.../Contribute/Page/SubscriptionStatus.php | 4 +-
civicrm/CRM/Contribute/Page/Tab.php | 4 +-
civicrm/CRM/Contribute/Page/UserDashboard.php | 4 +-
civicrm/CRM/Contribute/PseudoConstant.php | 4 +-
civicrm/CRM/Contribute/Selector/Search.php | 4 +-
.../Contribute/StateMachine/Contribution.php | 4 +-
.../StateMachine/ContributionPage.php | 4 +-
.../CRM/Contribute/StateMachine/Search.php | 4 +-
civicrm/CRM/Contribute/Task.php | 4 +-
civicrm/CRM/Contribute/Tokens.php | 2 +-
civicrm/CRM/Core/Action.php | 4 +-
civicrm/CRM/Core/BAO/ActionLog.php | 4 +-
civicrm/CRM/Core/BAO/ActionSchedule.php | 4 +-
civicrm/CRM/Core/BAO/Address.php | 4 +-
civicrm/CRM/Core/BAO/Block.php | 4 +-
civicrm/CRM/Core/BAO/CMSUser.php | 4 +-
civicrm/CRM/Core/BAO/Cache.php | 2 +-
civicrm/CRM/Core/BAO/ConfigSetting.php | 4 +-
civicrm/CRM/Core/BAO/Country.php | 4 +-
civicrm/CRM/Core/BAO/CustomField.php | 8 +-
civicrm/CRM/Core/BAO/CustomGroup.php | 4 +-
civicrm/CRM/Core/BAO/CustomOption.php | 4 +-
civicrm/CRM/Core/BAO/CustomQuery.php | 4 +-
civicrm/CRM/Core/BAO/CustomValue.php | 4 +-
civicrm/CRM/Core/BAO/CustomValueTable.php | 4 +-
civicrm/CRM/Core/BAO/Dashboard.php | 4 +-
civicrm/CRM/Core/BAO/Discount.php | 4 +-
civicrm/CRM/Core/BAO/Domain.php | 4 +-
civicrm/CRM/Core/BAO/Email.php | 4 +-
civicrm/CRM/Core/BAO/EntityTag.php | 4 +-
civicrm/CRM/Core/BAO/Extension.php | 4 +-
civicrm/CRM/Core/BAO/File.php | 4 +-
civicrm/CRM/Core/BAO/FinancialTrxn.php | 4 +-
civicrm/CRM/Core/BAO/IM.php | 4 +-
civicrm/CRM/Core/BAO/Job.php | 4 +-
civicrm/CRM/Core/BAO/LabelFormat.php | 2 +-
civicrm/CRM/Core/BAO/Location.php | 4 +-
civicrm/CRM/Core/BAO/LocationType.php | 4 +-
civicrm/CRM/Core/BAO/Log.php | 4 +-
civicrm/CRM/Core/BAO/MailSettings.php | 4 +-
civicrm/CRM/Core/BAO/Mapping.php | 6 +-
civicrm/CRM/Core/BAO/MessageTemplate.php | 4 +-
civicrm/CRM/Core/BAO/Navigation.php | 4 +-
civicrm/CRM/Core/BAO/Note.php | 4 +-
civicrm/CRM/Core/BAO/OpenID.php | 4 +-
civicrm/CRM/Core/BAO/OptionGroup.php | 4 +-
civicrm/CRM/Core/BAO/OptionValue.php | 4 +-
civicrm/CRM/Core/BAO/PaperSize.php | 2 +-
civicrm/CRM/Core/BAO/PdfFormat.php | 2 +-
civicrm/CRM/Core/BAO/Persistent.php | 4 +-
civicrm/CRM/Core/BAO/Phone.php | 4 +-
civicrm/CRM/Core/BAO/PreferencesDate.php | 4 +-
civicrm/CRM/Core/BAO/PrevNextCache.php | 4 +-
civicrm/CRM/Core/BAO/RecurringEntity.php | 4 +-
civicrm/CRM/Core/BAO/SchemaHandler.php | 4 +-
civicrm/CRM/Core/BAO/Setting.php | 4 +-
civicrm/CRM/Core/BAO/StatusPreference.php | 4 +-
civicrm/CRM/Core/BAO/Tag.php | 4 +-
civicrm/CRM/Core/BAO/UFField.php | 4 +-
civicrm/CRM/Core/BAO/UFGroup.php | 15 +-
civicrm/CRM/Core/BAO/UFJoin.php | 4 +-
civicrm/CRM/Core/BAO/UFMatch.php | 4 +-
civicrm/CRM/Core/BAO/Website.php | 4 +-
civicrm/CRM/Core/BAO/WordReplacement.php | 4 +-
civicrm/CRM/Core/Base.php | 4 +-
civicrm/CRM/Core/Block.php | 4 +-
civicrm/CRM/Core/ClassLoader.php | 4 +-
civicrm/CRM/Core/CodeGen/Config.php | 1 -
civicrm/CRM/Core/CommunityMessages.php | 2 +-
civicrm/CRM/Core/Component.php | 4 +-
civicrm/CRM/Core/Component/Info.php | 4 +-
civicrm/CRM/Core/Config.php | 4 +-
civicrm/CRM/Core/Config/MagicMerge.php | 2 +-
civicrm/CRM/Core/Config/Runtime.php | 2 +-
civicrm/CRM/Core/Controller.php | 4 +-
civicrm/CRM/Core/Controller/Simple.php | 4 +-
civicrm/CRM/Core/DAO.php | 24 +-
civicrm/CRM/Core/DAO/ActionLog.php | 4 +-
civicrm/CRM/Core/DAO/ActionMapping.php | 4 +-
civicrm/CRM/Core/DAO/ActionSchedule.php | 4 +-
civicrm/CRM/Core/DAO/Address.php | 4 +-
civicrm/CRM/Core/DAO/AddressFormat.php | 4 +-
civicrm/CRM/Core/DAO/AllCoreTables.php | 4 +-
civicrm/CRM/Core/DAO/Cache.php | 4 +-
civicrm/CRM/Core/DAO/Component.php | 4 +-
civicrm/CRM/Core/DAO/Country.php | 4 +-
civicrm/CRM/Core/DAO/County.php | 4 +-
civicrm/CRM/Core/DAO/CustomField.php | 4 +-
civicrm/CRM/Core/DAO/CustomGroup.php | 4 +-
civicrm/CRM/Core/DAO/Dashboard.php | 4 +-
civicrm/CRM/Core/DAO/Discount.php | 4 +-
civicrm/CRM/Core/DAO/Domain.php | 4 +-
civicrm/CRM/Core/DAO/Email.php | 4 +-
civicrm/CRM/Core/DAO/EntityFile.php | 4 +-
civicrm/CRM/Core/DAO/EntityTag.php | 4 +-
civicrm/CRM/Core/DAO/Extension.php | 4 +-
civicrm/CRM/Core/DAO/File.php | 4 +-
civicrm/CRM/Core/DAO/IM.php | 4 +-
civicrm/CRM/Core/DAO/Job.php | 4 +-
civicrm/CRM/Core/DAO/JobLog.php | 4 +-
civicrm/CRM/Core/DAO/LocBlock.php | 4 +-
civicrm/CRM/Core/DAO/LocationType.php | 4 +-
civicrm/CRM/Core/DAO/Log.php | 4 +-
civicrm/CRM/Core/DAO/MailSettings.php | 4 +-
civicrm/CRM/Core/DAO/Managed.php | 4 +-
civicrm/CRM/Core/DAO/Mapping.php | 4 +-
civicrm/CRM/Core/DAO/MappingField.php | 4 +-
civicrm/CRM/Core/DAO/Menu.php | 4 +-
civicrm/CRM/Core/DAO/MessageTemplate.php | 4 +-
civicrm/CRM/Core/DAO/Navigation.php | 4 +-
civicrm/CRM/Core/DAO/Note.php | 4 +-
civicrm/CRM/Core/DAO/OpenID.php | 4 +-
civicrm/CRM/Core/DAO/OptionGroup.php | 4 +-
civicrm/CRM/Core/DAO/OptionValue.php | 6 +-
civicrm/CRM/Core/DAO/Persistent.php | 4 +-
civicrm/CRM/Core/DAO/Phone.php | 4 +-
civicrm/CRM/Core/DAO/PreferencesDate.php | 4 +-
civicrm/CRM/Core/DAO/PrevNextCache.php | 4 +-
civicrm/CRM/Core/DAO/PrintLabel.php | 4 +-
civicrm/CRM/Core/DAO/RecurringEntity.php | 4 +-
civicrm/CRM/Core/DAO/Setting.php | 4 +-
civicrm/CRM/Core/DAO/StateProvince.php | 4 +-
civicrm/CRM/Core/DAO/StatusPreference.php | 4 +-
civicrm/CRM/Core/DAO/SystemLog.php | 4 +-
civicrm/CRM/Core/DAO/Tag.php | 4 +-
civicrm/CRM/Core/DAO/Timezone.php | 4 +-
civicrm/CRM/Core/DAO/UFField.php | 4 +-
civicrm/CRM/Core/DAO/UFGroup.php | 4 +-
civicrm/CRM/Core/DAO/UFJoin.php | 4 +-
civicrm/CRM/Core/DAO/UFMatch.php | 4 +-
civicrm/CRM/Core/DAO/Website.php | 4 +-
civicrm/CRM/Core/DAO/WordReplacement.php | 4 +-
civicrm/CRM/Core/DAO/Worldregion.php | 4 +-
civicrm/CRM/Core/DAO/permissions.php | 2 +-
civicrm/CRM/Core/Error.php | 44 +-
civicrm/CRM/Core/Error/Log.php | 2 +-
civicrm/CRM/Core/Exception.php | 2 +-
civicrm/CRM/Core/Form.php | 4 +-
civicrm/CRM/Core/Form/Date.php | 4 +-
civicrm/CRM/Core/Form/RecurringEntity.php | 4 +-
civicrm/CRM/Core/Form/Renderer.php | 13 +-
civicrm/CRM/Core/Form/Search.php | 2 +-
civicrm/CRM/Core/Form/ShortCode.php | 4 +-
civicrm/CRM/Core/Form/Tag.php | 4 +-
civicrm/CRM/Core/HTMLInputCoder.php | 2 +-
civicrm/CRM/Core/I18n.php | 4 +-
civicrm/CRM/Core/I18n/Form.php | 4 +-
civicrm/CRM/Core/I18n/NativeGettext.php | 4 +-
civicrm/CRM/Core/I18n/PseudoConstant.php | 4 +-
civicrm/CRM/Core/I18n/Schema.php | 4 +-
civicrm/CRM/Core/I18n/SchemaStructure.php | 6 +-
.../CRM/Core/I18n/SchemaStructure_2_2_0.php | 4 +-
.../Core/I18n/SchemaStructure_3_0_alpha1.php | 4 +-
.../Core/I18n/SchemaStructure_3_0_beta1.php | 4 +-
.../Core/I18n/SchemaStructure_3_0_beta4.php | 4 +-
.../Core/I18n/SchemaStructure_3_1_alpha1.php | 4 +-
.../Core/I18n/SchemaStructure_3_1_beta2.php | 4 +-
.../Core/I18n/SchemaStructure_3_2_beta4.php | 4 +-
.../Core/I18n/SchemaStructure_3_3_beta1.php | 4 +-
.../CRM/Core/I18n/SchemaStructure_3_4_0.php | 4 +-
.../Core/I18n/SchemaStructure_3_4_beta2.php | 4 +-
.../Core/I18n/SchemaStructure_3_4_beta3.php | 4 +-
.../CRM/Core/I18n/SchemaStructure_4_1_0.php | 4 +-
.../Core/I18n/SchemaStructure_4_1_alpha1.php | 4 +-
.../Core/I18n/SchemaStructure_4_2_alpha1.php | 4 +-
.../CRM/Core/I18n/SchemaStructure_4_3_1.php | 4 +-
.../Core/I18n/SchemaStructure_4_5_alpha1.php | 4 +-
.../Core/I18n/SchemaStructure_4_5_beta2.php | 4 +-
.../Core/I18n/SchemaStructure_4_7_alpha1.php | 4 +-
civicrm/CRM/Core/IDS.php | 7 +-
civicrm/CRM/Core/InnoDBIndexer.php | 2 +-
civicrm/CRM/Core/Invoke.php | 4 +-
civicrm/CRM/Core/JobManager.php | 4 +-
civicrm/CRM/Core/Joomla.php | 4 +-
civicrm/CRM/Core/Key.php | 4 +-
civicrm/CRM/Core/Lock.php | 4 +-
civicrm/CRM/Core/Menu.php | 4 +-
civicrm/CRM/Core/Module.php | 4 +-
civicrm/CRM/Core/OptionGroup.php | 4 +-
civicrm/CRM/Core/OptionValue.php | 4 +-
civicrm/CRM/Core/Page.php | 4 +-
civicrm/CRM/Core/Page/AJAX.php | 4 +-
civicrm/CRM/Core/Page/AJAX/Attachment.php | 2 +-
civicrm/CRM/Core/Page/AJAX/Location.php | 4 +-
civicrm/CRM/Core/Page/Basic.php | 4 +-
civicrm/CRM/Core/Page/File.php | 4 +-
civicrm/CRM/Core/Page/Inline/Help.php | 4 +-
.../CRM/Core/Page/RecurringEntityPreview.php | 4 +-
civicrm/CRM/Core/Payment.php | 2 +-
civicrm/CRM/Core/Payment/AuthorizeNetIPN.php | 4 +-
civicrm/CRM/Core/Payment/BaseIPN.php | 2 +-
civicrm/CRM/Core/Payment/Form.php | 4 +-
civicrm/CRM/Core/Payment/Manual.php | 4 +-
civicrm/CRM/Core/Payment/PayPalIPN.php | 16 +-
civicrm/CRM/Core/Payment/PayPalImpl.php | 4 +-
civicrm/CRM/Core/Payment/PayPalProIPN.php | 4 +-
civicrm/CRM/Core/Payment/ProcessorForm.php | 4 +-
civicrm/CRM/Core/Permission.php | 4 +-
civicrm/CRM/Core/Permission/Backdrop.php | 4 +-
civicrm/CRM/Core/Permission/Base.php | 4 +-
civicrm/CRM/Core/Permission/Drupal.php | 4 +-
civicrm/CRM/Core/Permission/Drupal6.php | 4 +-
civicrm/CRM/Core/Permission/Drupal8.php | 4 +-
civicrm/CRM/Core/Permission/DrupalBase.php | 4 +-
civicrm/CRM/Core/Permission/Joomla.php | 4 +-
civicrm/CRM/Core/Permission/Soap.php | 4 +-
civicrm/CRM/Core/Permission/Temp.php | 4 +-
civicrm/CRM/Core/Permission/UnitTests.php | 4 +-
civicrm/CRM/Core/Permission/WordPress.php | 4 +-
civicrm/CRM/Core/PseudoConstant.php | 9 +-
civicrm/CRM/Core/QuickForm/Action.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Back.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Cancel.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Display.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Done.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Jump.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Next.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Process.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Refresh.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Reload.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Submit.php | 4 +-
civicrm/CRM/Core/QuickForm/Action/Upload.php | 4 +-
civicrm/CRM/Core/Report/Excel.php | 2 +-
civicrm/CRM/Core/Resources.php | 4 +-
civicrm/CRM/Core/Resources/Strings.php | 7 +-
civicrm/CRM/Core/ScheduledJob.php | 4 +-
civicrm/CRM/Core/SelectValues.php | 4 +-
civicrm/CRM/Core/Selector/API.php | 4 +-
civicrm/CRM/Core/Selector/Base.php | 4 +-
civicrm/CRM/Core/Selector/Controller.php | 4 +-
civicrm/CRM/Core/Session.php | 2 +-
civicrm/CRM/Core/ShowHideBlocks.php | 4 +-
civicrm/CRM/Core/Smarty.php | 4 +-
.../Core/Smarty/plugins/block.crmButton.php | 4 +-
.../CRM/Core/Smarty/plugins/block.edit.php | 4 +-
.../CRM/Core/Smarty/plugins/block.htxt.php | 4 +-
.../Core/Smarty/plugins/block.localize.php | 4 +-
.../Core/Smarty/plugins/block.serialize.php | 4 +-
civicrm/CRM/Core/Smarty/plugins/block.ts.php | 4 +-
.../Core/Smarty/plugins/function.crmAPI.php | 2 +-
.../Smarty/plugins/function.crmAttributes.php | 4 +-
.../Smarty/plugins/function.crmCrudLink.php | 2 +-
.../Core/Smarty/plugins/function.crmDBTpl.php | 2 +-
.../plugins/function.crmGetAttribute.php | 2 +-
.../Core/Smarty/plugins/function.crmKey.php | 4 +-
.../plugins/function.crmNavigationMenu.php | 4 +-
.../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 | 4 +-
.../CRM/Core/Smarty/plugins/function.help.php | 4 +-
.../Smarty/plugins/function.isValueChange.php | 4 +-
.../Smarty/plugins/function.sectionTotal.php | 4 +-
.../Smarty/plugins/modifier.crmAddClass.php | 4 +-
.../Smarty/plugins/modifier.crmBtnType.php | 4 +-
.../Core/Smarty/plugins/modifier.crmDate.php | 4 +-
.../Smarty/plugins/modifier.crmDelete.php | 4 +-
.../Smarty/plugins/modifier.crmFirstWord.php | 4 +-
.../Smarty/plugins/modifier.crmICalDate.php | 4 +-
.../Smarty/plugins/modifier.crmICalText.php | 4 +-
.../Smarty/plugins/modifier.crmInsert.php | 4 +-
.../Core/Smarty/plugins/modifier.crmMoney.php | 4 +-
.../plugins/modifier.crmNumberFormat.php | 4 +-
.../Smarty/plugins/modifier.crmReplace.php | 4 +-
.../plugins/modifier.crmStripAlternatives.php | 4 +-
.../Core/Smarty/plugins/modifier.htmlize.php | 4 +-
.../CRM/Core/Smarty/plugins/modifier.json.php | 4 +-
.../Smarty/plugins/modifier.mb_truncate.php | 4 +-
.../Smarty/plugins/modifier.substring.php | 4 +-
civicrm/CRM/Core/Smarty/resources/String.php | 4 +-
civicrm/CRM/Core/State.php | 4 +-
civicrm/CRM/Core/StateMachine.php | 4 +-
civicrm/CRM/Core/TableHierarchy.php | 4 +-
civicrm/CRM/Core/Transaction.php | 4 +-
civicrm/CRM/Custom/Form/ChangeFieldType.php | 4 +-
civicrm/CRM/Custom/Form/CustomData.php | 4 +-
civicrm/CRM/Custom/Form/CustomDataByType.php | 4 +-
civicrm/CRM/Custom/Form/DeleteField.php | 4 +-
civicrm/CRM/Custom/Form/DeleteGroup.php | 4 +-
civicrm/CRM/Custom/Form/Field.php | 4 +-
civicrm/CRM/Custom/Form/Group.php | 4 +-
civicrm/CRM/Custom/Form/MoveField.php | 4 +-
civicrm/CRM/Custom/Form/Option.php | 4 +-
civicrm/CRM/Custom/Form/Preview.php | 4 +-
civicrm/CRM/Custom/Import/Field.php | 2 +-
civicrm/CRM/Custom/Import/Form/DataSource.php | 4 +-
civicrm/CRM/Custom/Import/Parser.php | 4 +-
civicrm/CRM/Custom/Page/AJAX.php | 4 +-
civicrm/CRM/Custom/Page/Field.php | 4 +-
civicrm/CRM/Custom/Page/Group.php | 4 +-
civicrm/CRM/Custom/Page/Option.php | 4 +-
civicrm/CRM/Cxn/ApiRouter.php | 2 +-
civicrm/CRM/Cxn/BAO/Cxn.php | 4 +-
civicrm/CRM/Cxn/DAO/Cxn.php | 4 +-
civicrm/CRM/Dashlet/Page/Activity.php | 4 +-
civicrm/CRM/Dashlet/Page/AllCases.php | 4 +-
civicrm/CRM/Dashlet/Page/Blog.php | 4 +-
civicrm/CRM/Dashlet/Page/CaseDashboard.php | 4 +-
civicrm/CRM/Dashlet/Page/GettingStarted.php | 4 +-
civicrm/CRM/Dashlet/Page/MyCases.php | 4 +-
.../QueryBuilder/IndividualUnsupervised.php | 2 +-
civicrm/CRM/Dedupe/BAO/Rule.php | 4 +-
civicrm/CRM/Dedupe/BAO/RuleGroup.php | 4 +-
civicrm/CRM/Dedupe/DAO/Exception.php | 4 +-
civicrm/CRM/Dedupe/DAO/Rule.php | 4 +-
civicrm/CRM/Dedupe/DAO/RuleGroup.php | 4 +-
civicrm/CRM/Dedupe/Finder.php | 4 +-
civicrm/CRM/Dedupe/Merger.php | 28 +-
civicrm/CRM/Event/ActionMapping.php | 2 +-
civicrm/CRM/Event/BAO/Event.php | 4 +-
civicrm/CRM/Event/BAO/Participant.php | 4 +-
civicrm/CRM/Event/BAO/ParticipantPayment.php | 4 +-
.../CRM/Event/BAO/ParticipantStatusType.php | 4 +-
civicrm/CRM/Event/BAO/Query.php | 4 +-
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/Cart/DAO/Cart.php | 4 +-
civicrm/CRM/Event/Cart/DAO/EventInCart.php | 4 +-
civicrm/CRM/Event/Controller/Registration.php | 4 +-
civicrm/CRM/Event/Controller/Search.php | 4 +-
civicrm/CRM/Event/DAO/Event.php | 4 +-
civicrm/CRM/Event/DAO/Participant.php | 4 +-
civicrm/CRM/Event/DAO/ParticipantPayment.php | 4 +-
.../CRM/Event/DAO/ParticipantStatusType.php | 4 +-
civicrm/CRM/Event/Form/EventFees.php | 4 +-
civicrm/CRM/Event/Form/ManageEvent.php | 4 +-
.../CRM/Event/Form/ManageEvent/Conference.php | 4 +-
civicrm/CRM/Event/Form/ManageEvent/Delete.php | 4 +-
.../CRM/Event/Form/ManageEvent/EventInfo.php | 4 +-
civicrm/CRM/Event/Form/ManageEvent/Fee.php | 4 +-
.../CRM/Event/Form/ManageEvent/Location.php | 4 +-
.../Event/Form/ManageEvent/Registration.php | 4 +-
.../Form/ManageEvent/ScheduleReminders.php | 4 +-
.../CRM/Event/Form/ManageEvent/TabHeader.php | 4 +-
civicrm/CRM/Event/Form/Participant.php | 4 +-
.../Event/Form/ParticipantFeeSelection.php | 4 +-
civicrm/CRM/Event/Form/ParticipantView.php | 4 +-
civicrm/CRM/Event/Form/Registration.php | 4 +-
.../Registration/AdditionalParticipant.php | 4 +-
.../CRM/Event/Form/Registration/Confirm.php | 4 +-
.../Form/Registration/ParticipantConfirm.php | 4 +-
.../CRM/Event/Form/Registration/Register.php | 4 +-
.../CRM/Event/Form/Registration/ThankYou.php | 4 +-
civicrm/CRM/Event/Form/Search.php | 4 +-
civicrm/CRM/Event/Form/SearchEvent.php | 4 +-
civicrm/CRM/Event/Form/SelfSvcTransfer.php | 4 +-
civicrm/CRM/Event/Form/SelfSvcUpdate.php | 4 +-
civicrm/CRM/Event/Form/Task.php | 4 +-
civicrm/CRM/Event/Form/Task/AddToGroup.php | 4 +-
civicrm/CRM/Event/Form/Task/Badge.php | 4 +-
civicrm/CRM/Event/Form/Task/Batch.php | 4 +-
civicrm/CRM/Event/Form/Task/Cancel.php | 4 +-
civicrm/CRM/Event/Form/Task/Delete.php | 4 +-
civicrm/CRM/Event/Form/Task/Email.php | 4 +-
civicrm/CRM/Event/Form/Task/PDF.php | 4 +-
.../CRM/Event/Form/Task/ParticipantStatus.php | 4 +-
civicrm/CRM/Event/Form/Task/PickProfile.php | 4 +-
civicrm/CRM/Event/Form/Task/Print.php | 4 +-
civicrm/CRM/Event/Form/Task/Result.php | 4 +-
civicrm/CRM/Event/Form/Task/SaveSearch.php | 4 +-
.../CRM/Event/Form/Task/SaveSearch/Update.php | 4 +-
.../Event/Form/Task/SearchTaskHookSample.php | 4 +-
civicrm/CRM/Event/Import/Controller.php | 4 +-
civicrm/CRM/Event/Import/Field.php | 2 +-
civicrm/CRM/Event/Import/Form/DataSource.php | 4 +-
civicrm/CRM/Event/Import/Form/MapField.php | 4 +-
civicrm/CRM/Event/Import/Form/Preview.php | 4 +-
civicrm/CRM/Event/Import/Form/Summary.php | 4 +-
civicrm/CRM/Event/Import/Parser.php | 4 +-
.../CRM/Event/Import/Parser/Participant.php | 4 +-
civicrm/CRM/Event/Info.php | 4 +-
civicrm/CRM/Event/Page/AJAX.php | 4 +-
civicrm/CRM/Event/Page/DashBoard.php | 4 +-
civicrm/CRM/Event/Page/EventInfo.php | 4 +-
civicrm/CRM/Event/Page/ICalendar.php | 4 +-
civicrm/CRM/Event/Page/ManageEvent.php | 8 +-
civicrm/CRM/Event/Page/ParticipantListing.php | 4 +-
.../Event/Page/ParticipantListing/Name.php | 4 +-
.../Page/ParticipantListing/NameAndEmail.php | 4 +-
.../ParticipantListing/NameStatusAndDate.php | 4 +-
.../Event/Page/ParticipantListing/Simple.php | 4 +-
civicrm/CRM/Event/Page/Tab.php | 4 +-
civicrm/CRM/Event/Page/UserDashboard.php | 4 +-
civicrm/CRM/Event/PseudoConstant.php | 4 +-
civicrm/CRM/Event/Selector/Search.php | 4 +-
.../CRM/Event/StateMachine/Registration.php | 4 +-
civicrm/CRM/Event/StateMachine/Search.php | 4 +-
civicrm/CRM/Event/Task.php | 4 +-
civicrm/CRM/Event/Tokens.php | 2 +-
civicrm/CRM/Export/BAO/Export.php | 27 +-
civicrm/CRM/Export/Form/Map.php | 4 +-
civicrm/CRM/Export/Form/Select.php | 4 +-
civicrm/CRM/Extension/Browser.php | 4 +-
civicrm/CRM/Extension/ClassLoader.php | 4 +-
civicrm/CRM/Extension/Container/Basic.php | 4 +-
.../CRM/Extension/Container/Collection.php | 4 +-
civicrm/CRM/Extension/Container/Default.php | 4 +-
civicrm/CRM/Extension/Container/Interface.php | 4 +-
civicrm/CRM/Extension/Container/Static.php | 4 +-
civicrm/CRM/Extension/Downloader.php | 4 +-
civicrm/CRM/Extension/Exception.php | 4 +-
.../Exception/DependencyException.php | 4 +-
.../Extension/Exception/MissingException.php | 4 +-
.../Extension/Exception/ParseException.php | 4 +-
civicrm/CRM/Extension/Info.php | 4 +-
civicrm/CRM/Extension/Manager.php | 4 +-
civicrm/CRM/Extension/Manager/Base.php | 4 +-
civicrm/CRM/Extension/Manager/Interface.php | 4 +-
civicrm/CRM/Extension/Manager/Module.php | 4 +-
civicrm/CRM/Extension/Manager/Payment.php | 4 +-
civicrm/CRM/Extension/Manager/Report.php | 4 +-
civicrm/CRM/Extension/Manager/Search.php | 4 +-
civicrm/CRM/Extension/Mapper.php | 4 +-
civicrm/CRM/Extension/System.php | 4 +-
civicrm/CRM/Extension/Upgrades.php | 4 +-
civicrm/CRM/Financial/BAO/ExportFormat.php | 4 +-
.../CRM/Financial/BAO/ExportFormat/CSV.php | 4 +-
.../CRM/Financial/BAO/ExportFormat/IIF.php | 4 +-
.../CRM/Financial/BAO/FinancialAccount.php | 4 +-
civicrm/CRM/Financial/BAO/FinancialItem.php | 4 +-
civicrm/CRM/Financial/BAO/FinancialType.php | 4 +-
.../Financial/BAO/FinancialTypeAccount.php | 4 +-
.../CRM/Financial/BAO/PaymentProcessor.php | 4 +-
.../Financial/BAO/PaymentProcessorType.php | 4 +-
civicrm/CRM/Financial/DAO/Currency.php | 4 +-
.../Financial/DAO/EntityFinancialAccount.php | 4 +-
.../CRM/Financial/DAO/EntityFinancialTrxn.php | 4 +-
.../CRM/Financial/DAO/FinancialAccount.php | 4 +-
civicrm/CRM/Financial/DAO/FinancialItem.php | 4 +-
civicrm/CRM/Financial/DAO/FinancialTrxn.php | 4 +-
civicrm/CRM/Financial/DAO/FinancialType.php | 4 +-
.../CRM/Financial/DAO/PaymentProcessor.php | 4 +-
.../Financial/DAO/PaymentProcessorType.php | 4 +-
civicrm/CRM/Financial/DAO/PaymentToken.php | 4 +-
.../CRM/Financial/Form/BatchTransaction.php | 4 +-
civicrm/CRM/Financial/Form/Export.php | 4 +-
.../CRM/Financial/Form/FinancialAccount.php | 4 +-
civicrm/CRM/Financial/Form/FinancialBatch.php | 4 +-
civicrm/CRM/Financial/Form/FinancialType.php | 4 +-
.../Financial/Form/FinancialTypeAccount.php | 4 +-
civicrm/CRM/Financial/Form/Payment.php | 4 +-
civicrm/CRM/Financial/Form/Search.php | 4 +-
civicrm/CRM/Financial/Page/AJAX.php | 4 +-
civicrm/CRM/Financial/Page/Batch.php | 4 +-
.../CRM/Financial/Page/BatchTransaction.php | 4 +-
.../CRM/Financial/Page/FinancialAccount.php | 4 +-
civicrm/CRM/Financial/Page/FinancialBatch.php | 4 +-
civicrm/CRM/Financial/Page/FinancialType.php | 4 +-
.../Financial/Page/FinancialTypeAccount.php | 4 +-
civicrm/CRM/Friend/BAO/Friend.php | 4 +-
civicrm/CRM/Friend/DAO/Friend.php | 4 +-
civicrm/CRM/Friend/Form.php | 4 +-
civicrm/CRM/Friend/Form/Contribute.php | 4 +-
civicrm/CRM/Friend/Form/Event.php | 4 +-
civicrm/CRM/Grant/BAO/Grant.php | 4 +-
civicrm/CRM/Grant/BAO/Query.php | 4 +-
civicrm/CRM/Grant/Controller/Search.php | 4 +-
civicrm/CRM/Grant/DAO/Grant.php | 4 +-
civicrm/CRM/Grant/Form/Grant.php | 4 +-
civicrm/CRM/Grant/Form/GrantView.php | 4 +-
civicrm/CRM/Grant/Form/Search.php | 4 +-
civicrm/CRM/Grant/Form/Task.php | 4 +-
civicrm/CRM/Grant/Form/Task/Delete.php | 4 +-
civicrm/CRM/Grant/Form/Task/Print.php | 4 +-
civicrm/CRM/Grant/Form/Task/Result.php | 4 +-
.../Grant/Form/Task/SearchTaskHookSample.php | 4 +-
civicrm/CRM/Grant/Form/Task/Update.php | 4 +-
civicrm/CRM/Grant/Info.php | 4 +-
civicrm/CRM/Grant/Page/DashBoard.php | 4 +-
civicrm/CRM/Grant/Page/Tab.php | 4 +-
civicrm/CRM/Grant/Selector/Search.php | 4 +-
civicrm/CRM/Grant/StateMachine/Search.php | 4 +-
civicrm/CRM/Grant/Task.php | 4 +-
civicrm/CRM/Group/Controller.php | 4 +-
civicrm/CRM/Group/Form/Edit.php | 4 +-
civicrm/CRM/Group/Form/Search.php | 4 +-
civicrm/CRM/Group/Page/AJAX.php | 10 +-
civicrm/CRM/Group/Page/Group.php | 4 +-
civicrm/CRM/Group/StateMachine.php | 4 +-
civicrm/CRM/Import/DataSource.php | 4 +-
civicrm/CRM/Import/DataSource/CSV.php | 4 +-
civicrm/CRM/Import/DataSource/SQL.php | 4 +-
civicrm/CRM/Import/Form/DataSource.php | 4 +-
civicrm/CRM/Import/Form/MapField.php | 4 +-
civicrm/CRM/Import/Form/Preview.php | 4 +-
civicrm/CRM/Import/Form/Summary.php | 4 +-
civicrm/CRM/Import/Parser.php | 4 +-
civicrm/CRM/Import/StateMachine.php | 4 +-
civicrm/CRM/Logging/Differ.php | 4 +-
civicrm/CRM/Logging/ReportDetail.php | 4 +-
civicrm/CRM/Logging/ReportSummary.php | 107 ++--
civicrm/CRM/Logging/Reverter.php | 4 +-
civicrm/CRM/Logging/Schema.php | 4 +-
civicrm/CRM/Mailing/BAO/BouncePattern.php | 4 +-
civicrm/CRM/Mailing/BAO/Component.php | 4 +-
civicrm/CRM/Mailing/BAO/Mailing.php | 19 +-
civicrm/CRM/Mailing/BAO/MailingAB.php | 4 +-
civicrm/CRM/Mailing/BAO/MailingJob.php | 4 +-
civicrm/CRM/Mailing/BAO/Query.php | 4 +-
civicrm/CRM/Mailing/BAO/Recipients.php | 4 +-
civicrm/CRM/Mailing/BAO/Spool.php | 4 +-
civicrm/CRM/Mailing/BAO/TrackableURL.php | 33 +-
civicrm/CRM/Mailing/Config.php | 4 +-
civicrm/CRM/Mailing/Controller/Send.php | 4 +-
civicrm/CRM/Mailing/DAO/BouncePattern.php | 4 +-
civicrm/CRM/Mailing/DAO/BounceType.php | 4 +-
civicrm/CRM/Mailing/DAO/Component.php | 4 +-
civicrm/CRM/Mailing/DAO/Mailing.php | 4 +-
civicrm/CRM/Mailing/DAO/MailingAB.php | 4 +-
civicrm/CRM/Mailing/DAO/MailingGroup.php | 4 +-
civicrm/CRM/Mailing/DAO/MailingJob.php | 4 +-
civicrm/CRM/Mailing/DAO/Recipients.php | 4 +-
civicrm/CRM/Mailing/DAO/Spool.php | 4 +-
civicrm/CRM/Mailing/DAO/TrackableURL.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Bounce.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Confirm.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Delivered.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Forward.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Opened.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Queue.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Reply.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Resubscribe.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Subscribe.php | 4 +-
.../Mailing/Event/BAO/TrackableURLOpen.php | 4 +-
civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php | 4 +-
civicrm/CRM/Mailing/Event/DAO/Bounce.php | 4 +-
civicrm/CRM/Mailing/Event/DAO/Confirm.php | 4 +-
civicrm/CRM/Mailing/Event/DAO/Delivered.php | 4 +-
civicrm/CRM/Mailing/Event/DAO/Forward.php | 4 +-
civicrm/CRM/Mailing/Event/DAO/Opened.php | 4 +-
civicrm/CRM/Mailing/Event/DAO/Queue.php | 4 +-
civicrm/CRM/Mailing/Event/DAO/Reply.php | 4 +-
civicrm/CRM/Mailing/Event/DAO/Subscribe.php | 4 +-
.../Mailing/Event/DAO/TrackableURLOpen.php | 4 +-
civicrm/CRM/Mailing/Event/DAO/Unsubscribe.php | 4 +-
civicrm/CRM/Mailing/Form/Approve.php | 4 +-
civicrm/CRM/Mailing/Form/Browse.php | 4 +-
civicrm/CRM/Mailing/Form/Component.php | 4 +-
civicrm/CRM/Mailing/Form/ForwardMailing.php | 4 +-
civicrm/CRM/Mailing/Form/Optout.php | 4 +-
civicrm/CRM/Mailing/Form/Search.php | 4 +-
civicrm/CRM/Mailing/Form/Subscribe.php | 4 +-
civicrm/CRM/Mailing/Form/Task.php | 4 +-
.../CRM/Mailing/Form/Task/AdhocMailing.php | 4 +-
civicrm/CRM/Mailing/Form/Task/Print.php | 4 +-
civicrm/CRM/Mailing/Form/Unsubscribe.php | 4 +-
civicrm/CRM/Mailing/Info.php | 4 +-
civicrm/CRM/Mailing/MailStore.php | 4 +-
civicrm/CRM/Mailing/MailStore/Imap.php | 4 +-
civicrm/CRM/Mailing/MailStore/Localdir.php | 4 +-
civicrm/CRM/Mailing/MailStore/Maildir.php | 4 +-
civicrm/CRM/Mailing/MailStore/Mbox.php | 4 +-
civicrm/CRM/Mailing/MailStore/Pop3.php | 4 +-
civicrm/CRM/Mailing/Page/AJAX.php | 4 +-
civicrm/CRM/Mailing/Page/Browse.php | 4 +-
civicrm/CRM/Mailing/Page/Common.php | 4 +-
civicrm/CRM/Mailing/Page/Component.php | 4 +-
civicrm/CRM/Mailing/Page/Confirm.php | 4 +-
civicrm/CRM/Mailing/Page/Event.php | 4 +-
civicrm/CRM/Mailing/Page/Optout.php | 4 +-
civicrm/CRM/Mailing/Page/Preview.php | 4 +-
civicrm/CRM/Mailing/Page/Report.php | 4 +-
civicrm/CRM/Mailing/Page/Resubscribe.php | 4 +-
civicrm/CRM/Mailing/Page/Tab.php | 4 +-
civicrm/CRM/Mailing/Page/Unsubscribe.php | 4 +-
civicrm/CRM/Mailing/Page/View.php | 4 +-
civicrm/CRM/Mailing/PseudoConstant.php | 4 +-
civicrm/CRM/Mailing/Selector/Browse.php | 4 +-
civicrm/CRM/Mailing/Selector/Event.php | 4 +-
civicrm/CRM/Mailing/Selector/Search.php | 4 +-
civicrm/CRM/Mailing/Task.php | 4 +-
civicrm/CRM/Member/ActionMapping.php | 2 +-
civicrm/CRM/Member/BAO/Membership.php | 4 +-
civicrm/CRM/Member/BAO/MembershipBlock.php | 4 +-
civicrm/CRM/Member/BAO/MembershipLog.php | 4 +-
civicrm/CRM/Member/BAO/MembershipPayment.php | 4 +-
civicrm/CRM/Member/BAO/MembershipStatus.php | 4 +-
civicrm/CRM/Member/BAO/MembershipType.php | 4 +-
civicrm/CRM/Member/BAO/Query.php | 4 +-
civicrm/CRM/Member/Controller/Search.php | 4 +-
civicrm/CRM/Member/DAO/Membership.php | 4 +-
civicrm/CRM/Member/DAO/MembershipBlock.php | 4 +-
civicrm/CRM/Member/DAO/MembershipLog.php | 4 +-
civicrm/CRM/Member/DAO/MembershipPayment.php | 4 +-
civicrm/CRM/Member/DAO/MembershipStatus.php | 4 +-
civicrm/CRM/Member/DAO/MembershipType.php | 4 +-
civicrm/CRM/Member/Form.php | 4 +-
civicrm/CRM/Member/Form/Membership.php | 4 +-
civicrm/CRM/Member/Form/MembershipBlock.php | 4 +-
civicrm/CRM/Member/Form/MembershipConfig.php | 4 +-
civicrm/CRM/Member/Form/MembershipRenewal.php | 4 +-
civicrm/CRM/Member/Form/MembershipStatus.php | 4 +-
civicrm/CRM/Member/Form/MembershipType.php | 4 +-
civicrm/CRM/Member/Form/MembershipView.php | 4 +-
civicrm/CRM/Member/Form/Search.php | 4 +-
civicrm/CRM/Member/Form/Task.php | 4 +-
civicrm/CRM/Member/Form/Task/Batch.php | 4 +-
civicrm/CRM/Member/Form/Task/Delete.php | 4 +-
civicrm/CRM/Member/Form/Task/Email.php | 4 +-
civicrm/CRM/Member/Form/Task/Label.php | 4 +-
civicrm/CRM/Member/Form/Task/PDFLetter.php | 4 +-
civicrm/CRM/Member/Form/Task/PickProfile.php | 4 +-
civicrm/CRM/Member/Form/Task/Print.php | 4 +-
civicrm/CRM/Member/Form/Task/Result.php | 4 +-
.../Member/Form/Task/SearchTaskHookSample.php | 4 +-
civicrm/CRM/Member/Import/Controller.php | 4 +-
civicrm/CRM/Member/Import/Field.php | 4 +-
civicrm/CRM/Member/Import/Form/DataSource.php | 4 +-
civicrm/CRM/Member/Import/Form/MapField.php | 4 +-
civicrm/CRM/Member/Import/Form/Preview.php | 4 +-
civicrm/CRM/Member/Import/Form/Summary.php | 4 +-
civicrm/CRM/Member/Import/Parser.php | 4 +-
.../CRM/Member/Import/Parser/Membership.php | 4 +-
civicrm/CRM/Member/Info.php | 4 +-
civicrm/CRM/Member/Page/AJAX.php | 4 +-
civicrm/CRM/Member/Page/DashBoard.php | 4 +-
civicrm/CRM/Member/Page/MembershipStatus.php | 4 +-
civicrm/CRM/Member/Page/MembershipType.php | 4 +-
civicrm/CRM/Member/Page/Tab.php | 4 +-
civicrm/CRM/Member/Page/UserDashboard.php | 4 +-
civicrm/CRM/Member/PseudoConstant.php | 4 +-
civicrm/CRM/Member/Selector/Search.php | 4 +-
civicrm/CRM/Member/StateMachine/Search.php | 4 +-
civicrm/CRM/Member/Task.php | 4 +-
civicrm/CRM/Member/Tokens.php | 2 +-
civicrm/CRM/Note/Form/Note.php | 4 +-
civicrm/CRM/PCP/BAO/PCP.php | 7 +-
civicrm/CRM/PCP/Controller/PCP.php | 4 +-
civicrm/CRM/PCP/DAO/PCP.php | 4 +-
civicrm/CRM/PCP/DAO/PCPBlock.php | 4 +-
civicrm/CRM/PCP/Form/Campaign.php | 4 +-
civicrm/CRM/PCP/Form/Contribute.php | 4 +-
civicrm/CRM/PCP/Form/Event.php | 4 +-
civicrm/CRM/PCP/Form/PCP.php | 4 +-
civicrm/CRM/PCP/Form/PCPAccount.php | 4 +-
civicrm/CRM/PCP/Page/PCP.php | 4 +-
civicrm/CRM/PCP/Page/PCPInfo.php | 4 +-
civicrm/CRM/PCP/StateMachine/PCP.php | 4 +-
civicrm/CRM/Pledge/BAO/Pledge.php | 9 +-
civicrm/CRM/Pledge/BAO/PledgeBlock.php | 4 +-
civicrm/CRM/Pledge/BAO/PledgePayment.php | 4 +-
civicrm/CRM/Pledge/BAO/Query.php | 4 +-
civicrm/CRM/Pledge/Controller/Search.php | 4 +-
civicrm/CRM/Pledge/DAO/Pledge.php | 4 +-
civicrm/CRM/Pledge/DAO/PledgeBlock.php | 4 +-
civicrm/CRM/Pledge/DAO/PledgePayment.php | 4 +-
civicrm/CRM/Pledge/Form/Payment.php | 4 +-
civicrm/CRM/Pledge/Form/Pledge.php | 4 +-
civicrm/CRM/Pledge/Form/PledgeView.php | 4 +-
civicrm/CRM/Pledge/Form/Search.php | 4 +-
civicrm/CRM/Pledge/Form/Task.php | 4 +-
civicrm/CRM/Pledge/Form/Task/Delete.php | 4 +-
civicrm/CRM/Pledge/Form/Task/Print.php | 6 +-
civicrm/CRM/Pledge/Form/Task/Result.php | 4 +-
.../Pledge/Form/Task/SearchTaskHookSample.php | 4 +-
civicrm/CRM/Pledge/Info.php | 4 +-
civicrm/CRM/Pledge/Page/AJAX.php | 4 +-
civicrm/CRM/Pledge/Page/DashBoard.php | 4 +-
civicrm/CRM/Pledge/Page/Payment.php | 4 +-
civicrm/CRM/Pledge/Page/Tab.php | 4 +-
civicrm/CRM/Pledge/Page/UserDashboard.php | 4 +-
civicrm/CRM/Pledge/Selector/Search.php | 4 +-
civicrm/CRM/Pledge/StateMachine/Search.php | 4 +-
civicrm/CRM/Pledge/Task.php | 4 +-
civicrm/CRM/Price/BAO/LineItem.php | 43 +-
civicrm/CRM/Price/BAO/PriceField.php | 4 +-
civicrm/CRM/Price/BAO/PriceFieldValue.php | 4 +-
civicrm/CRM/Price/BAO/PriceSet.php | 27 +-
civicrm/CRM/Price/DAO/LineItem.php | 4 +-
civicrm/CRM/Price/DAO/PriceField.php | 4 +-
civicrm/CRM/Price/DAO/PriceFieldValue.php | 4 +-
civicrm/CRM/Price/DAO/PriceSet.php | 4 +-
civicrm/CRM/Price/DAO/PriceSetEntity.php | 4 +-
civicrm/CRM/Price/Form/DeleteField.php | 4 +-
civicrm/CRM/Price/Form/DeleteSet.php | 4 +-
civicrm/CRM/Price/Form/Field.php | 4 +-
civicrm/CRM/Price/Form/Option.php | 4 +-
civicrm/CRM/Price/Form/Preview.php | 4 +-
civicrm/CRM/Price/Form/Set.php | 4 +-
civicrm/CRM/Price/Page/Field.php | 4 +-
civicrm/CRM/Price/Page/Option.php | 4 +-
civicrm/CRM/Price/Page/Set.php | 4 +-
civicrm/CRM/Profile/Form.php | 4 +-
civicrm/CRM/Profile/Form/Dynamic.php | 4 +-
civicrm/CRM/Profile/Form/Edit.php | 4 +-
civicrm/CRM/Profile/Form/Search.php | 4 +-
civicrm/CRM/Profile/Page/Dynamic.php | 4 +-
civicrm/CRM/Profile/Page/Listings.php | 4 +-
.../Page/MultipleRecordFieldsListing.php | 4 +-
civicrm/CRM/Profile/Page/Router.php | 4 +-
civicrm/CRM/Profile/Page/View.php | 4 +-
civicrm/CRM/Profile/Selector/Listings.php | 4 +-
civicrm/CRM/Queue/BAO/QueueItem.php | 4 +-
civicrm/CRM/Queue/DAO/QueueItem.php | 4 +-
civicrm/CRM/Queue/ErrorPolicy.php | 2 +-
civicrm/CRM/Queue/Menu.php | 4 +-
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 | 4 +-
civicrm/CRM/Report/BAO/HookInterface.php | 4 +-
civicrm/CRM/Report/BAO/ReportInstance.php | 4 +-
civicrm/CRM/Report/DAO/ReportInstance.php | 4 +-
civicrm/CRM/Report/Form.php | 10 +-
civicrm/CRM/Report/Form/Activity.php | 4 +-
civicrm/CRM/Report/Form/ActivitySummary.php | 4 +-
.../Report/Form/Campaign/SurveyDetails.php | 4 +-
civicrm/CRM/Report/Form/Case/Demographics.php | 4 +-
civicrm/CRM/Report/Form/Case/Detail.php | 4 +-
civicrm/CRM/Report/Form/Case/Summary.php | 4 +-
civicrm/CRM/Report/Form/Case/TimeSpent.php | 4 +-
.../Report/Form/Contact/CurrentEmployer.php | 4 +-
civicrm/CRM/Report/Form/Contact/Detail.php | 4 +-
civicrm/CRM/Report/Form/Contact/Log.php | 4 +-
.../CRM/Report/Form/Contact/LoggingDetail.php | 4 +-
.../Report/Form/Contact/LoggingSummary.php | 13 +-
.../CRM/Report/Form/Contact/Relationship.php | 4 +-
civicrm/CRM/Report/Form/Contact/Summary.php | 4 +-
.../Report/Form/Contribute/Bookkeeping.php | 26 +-
civicrm/CRM/Report/Form/Contribute/Detail.php | 19 +-
.../CRM/Report/Form/Contribute/History.php | 4 +-
.../Form/Contribute/HouseholdSummary.php | 5 +-
.../Report/Form/Contribute/LoggingDetail.php | 4 +-
.../Report/Form/Contribute/LoggingSummary.php | 4 +-
civicrm/CRM/Report/Form/Contribute/Lybunt.php | 4 +-
.../Form/Contribute/OrganizationSummary.php | 5 +-
civicrm/CRM/Report/Form/Contribute/PCP.php | 4 +-
civicrm/CRM/Report/Form/Contribute/Recur.php | 4 +-
.../Report/Form/Contribute/RecurSummary.php | 4 +-
civicrm/CRM/Report/Form/Contribute/Repeat.php | 4 +-
.../CRM/Report/Form/Contribute/SoftCredit.php | 5 +-
.../CRM/Report/Form/Contribute/Summary.php | 4 +-
civicrm/CRM/Report/Form/Contribute/Sybunt.php | 5 +-
.../CRM/Report/Form/Contribute/TopDonor.php | 4 +-
civicrm/CRM/Report/Form/Event.php | 4 +-
civicrm/CRM/Report/Form/Event/Income.php | 4 +-
.../Report/Form/Event/IncomeCountSummary.php | 4 +-
.../Form/Event/ParticipantListCount.php | 4 +-
.../Report/Form/Event/ParticipantListing.php | 5 +-
civicrm/CRM/Report/Form/Event/Summary.php | 4 +-
civicrm/CRM/Report/Form/Extended.php | 4 +-
civicrm/CRM/Report/Form/Grant/Detail.php | 4 +-
civicrm/CRM/Report/Form/Grant/Statistics.php | 4 +-
civicrm/CRM/Report/Form/Instance.php | 2 +-
civicrm/CRM/Report/Form/Mailing/Bounce.php | 16 +-
civicrm/CRM/Report/Form/Mailing/Clicks.php | 16 +-
civicrm/CRM/Report/Form/Mailing/Detail.php | 16 +-
civicrm/CRM/Report/Form/Mailing/Opened.php | 16 +-
civicrm/CRM/Report/Form/Mailing/Summary.php | 4 +-
.../Report/Form/Member/ContributionDetail.php | 5 +-
civicrm/CRM/Report/Form/Member/Detail.php | 5 +-
civicrm/CRM/Report/Form/Member/Lapse.php | 4 +-
civicrm/CRM/Report/Form/Member/Summary.php | 5 +-
.../CRM/Report/Form/Membership/Summary.php | 4 +-
civicrm/CRM/Report/Form/Pledge/Detail.php | 5 +-
civicrm/CRM/Report/Form/Pledge/Pbnp.php | 5 +-
civicrm/CRM/Report/Form/Pledge/Summary.php | 4 +-
civicrm/CRM/Report/Form/Register.php | 4 +-
civicrm/CRM/Report/Form/Walklist/Walklist.php | 4 +-
civicrm/CRM/Report/Info.php | 4 +-
civicrm/CRM/Report/Interface.php | 4 +-
civicrm/CRM/Report/Page/Instance.php | 4 +-
civicrm/CRM/Report/Page/InstanceList.php | 4 +-
civicrm/CRM/Report/Page/Options.php | 4 +-
civicrm/CRM/Report/Page/Report.php | 4 +-
civicrm/CRM/Report/Page/TemplateList.php | 4 +-
civicrm/CRM/Report/Utils/Get.php | 4 +-
civicrm/CRM/Report/Utils/Report.php | 4 +-
civicrm/CRM/SMS/BAO/Provider.php | 4 +-
civicrm/CRM/SMS/Controller/Send.php | 4 +-
civicrm/CRM/SMS/DAO/Provider.php | 4 +-
civicrm/CRM/SMS/Form/Group.php | 4 +-
civicrm/CRM/SMS/Form/Provider.php | 4 +-
civicrm/CRM/SMS/Form/Schedule.php | 4 +-
civicrm/CRM/SMS/Form/Upload.php | 4 +-
civicrm/CRM/SMS/Page/Callback.php | 4 +-
civicrm/CRM/SMS/Page/Provider.php | 4 +-
civicrm/CRM/SMS/Provider.php | 4 +-
civicrm/CRM/SMS/StateMachine/Send.php | 4 +-
civicrm/CRM/Tag/Form/Tag.php | 4 +-
civicrm/CRM/UF/Form/AbstractPreview.php | 4 +-
civicrm/CRM/UF/Form/AdvanceSetting.php | 4 +-
civicrm/CRM/UF/Form/Field.php | 4 +-
civicrm/CRM/UF/Form/Group.php | 4 +-
civicrm/CRM/UF/Form/Inline/Preview.php | 4 +-
civicrm/CRM/UF/Form/Inline/PreviewById.php | 4 +-
civicrm/CRM/UF/Form/Preview.php | 4 +-
civicrm/CRM/UF/Page/AJAX.php | 4 +-
civicrm/CRM/UF/Page/Field.php | 4 +-
civicrm/CRM/UF/Page/Group.php | 4 +-
.../civicrm_msg_template.tpl | 16 +
.../event_online_receipt_html.tpl | 528 ++++++++++++++++++
.../event_online_receipt_text.tpl | 314 +++++++++++
civicrm/CRM/Upgrade/Controller.php | 4 +-
civicrm/CRM/Upgrade/Form.php | 4 +-
civicrm/CRM/Upgrade/Headless.php | 2 +-
civicrm/CRM/Upgrade/Incremental/Base.php | 2 +-
civicrm/CRM/Upgrade/Incremental/General.php | 4 +-
.../CRM/Upgrade/Incremental/php/FourFive.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourFour.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourOne.php | 4 +-
.../CRM/Upgrade/Incremental/php/FourSeven.php | 5 +-
.../CRM/Upgrade/Incremental/php/FourSix.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourThree.php | 2 +-
.../CRM/Upgrade/Incremental/php/FourTwo.php | 2 +-
.../Upgrade/Incremental/sql/4.7.5.mysql.tpl | 74 +++
.../Upgrade/Incremental/sql/4.7.6.mysql.tpl | 1 +
.../CRM/Upgrade/Incremental/sql/README.txt | 2 +-
civicrm/CRM/Upgrade/Page/Cleanup.php | 2 +-
civicrm/CRM/Upgrade/Page/Upgrade.php | 4 +-
.../Upgrade/Snapshot/V4p2/Price/BAO/Field.php | 4 +-
.../Snapshot/V4p2/Price/BAO/FieldValue.php | 4 +-
.../Snapshot/V4p2/Price/BAO/LineItem.php | 4 +-
.../Upgrade/Snapshot/V4p2/Price/BAO/Set.php | 4 +-
.../Upgrade/Snapshot/V4p2/Price/DAO/Field.php | 4 +-
.../Snapshot/V4p2/Price/DAO/FieldValue.php | 4 +-
.../Snapshot/V4p2/Price/DAO/LineItem.php | 4 +-
.../Upgrade/Snapshot/V4p2/Price/DAO/Set.php | 4 +-
.../Snapshot/V4p2/Price/DAO/SetEntity.php | 4 +-
civicrm/CRM/Upgrade/StateMachine.php | 4 +-
civicrm/CRM/Utils/API/AbstractFieldCoder.php | 4 +-
civicrm/CRM/Utils/API/HTMLInputCoder.php | 4 +-
civicrm/CRM/Utils/API/MatchOption.php | 4 +-
civicrm/CRM/Utils/API/NullOutputCoder.php | 4 +-
civicrm/CRM/Utils/API/ReloadOption.php | 4 +-
civicrm/CRM/Utils/Address.php | 4 +-
civicrm/CRM/Utils/Address/BatchUpdate.php | 4 +-
civicrm/CRM/Utils/Address/USPS.php | 4 +-
civicrm/CRM/Utils/Array.php | 4 +-
civicrm/CRM/Utils/AutoClean.php | 4 +-
civicrm/CRM/Utils/Cache.php | 4 +-
civicrm/CRM/Utils/Cache/APCcache.php | 4 +-
civicrm/CRM/Utils/Cache/ArrayCache.php | 4 +-
civicrm/CRM/Utils/Cache/Interface.php | 4 +-
civicrm/CRM/Utils/Cache/Memcache.php | 4 +-
civicrm/CRM/Utils/Cache/Memcached.php | 4 +-
civicrm/CRM/Utils/Cache/NoCache.php | 4 +-
civicrm/CRM/Utils/Cache/Redis.php | 4 +-
civicrm/CRM/Utils/Cache/SerializeCache.php | 4 +-
civicrm/CRM/Utils/Cache/SqlGroup.php | 4 +-
civicrm/CRM/Utils/Check.php | 4 +-
civicrm/CRM/Utils/Check/Component.php | 7 +-
civicrm/CRM/Utils/Check/Component/Case.php | 7 +-
civicrm/CRM/Utils/Check/Component/Env.php | 4 +-
.../CRM/Utils/Check/Component/Security.php | 4 +-
civicrm/CRM/Utils/Check/Message.php | 4 +-
civicrm/CRM/Utils/Constant.php | 4 +-
civicrm/CRM/Utils/Crypt.php | 4 +-
civicrm/CRM/Utils/Date.php | 4 +-
civicrm/CRM/Utils/DeprecatedUtils.php | 4 +-
civicrm/CRM/Utils/FakeObject.php | 4 +-
civicrm/CRM/Utils/File.php | 4 +-
civicrm/CRM/Utils/Geocode.php | 4 +-
civicrm/CRM/Utils/Geocode/Google.php | 4 +-
civicrm/CRM/Utils/Geocode/Yahoo.php | 4 +-
civicrm/CRM/Utils/GlobalStack.php | 4 +-
civicrm/CRM/Utils/Hook.php | 15 +-
civicrm/CRM/Utils/Hook/Backdrop.php | 4 +-
civicrm/CRM/Utils/Hook/Drupal.php | 4 +-
civicrm/CRM/Utils/Hook/Drupal6.php | 4 +-
civicrm/CRM/Utils/Hook/Drupal8.php | 4 +-
civicrm/CRM/Utils/Hook/DrupalBase.php | 4 +-
civicrm/CRM/Utils/Hook/Joomla.php | 4 +-
civicrm/CRM/Utils/Hook/Soap.php | 4 +-
civicrm/CRM/Utils/Hook/UnitTests.php | 4 +-
civicrm/CRM/Utils/Hook/WordPress.php | 4 +-
civicrm/CRM/Utils/Http.php | 4 +-
civicrm/CRM/Utils/HttpClient.php | 4 +-
civicrm/CRM/Utils/ICalendar.php | 4 +-
civicrm/CRM/Utils/JS.php | 4 +-
civicrm/CRM/Utils/JSON.php | 4 +-
civicrm/CRM/Utils/Mail.php | 13 +-
civicrm/CRM/Utils/Mail/EmailProcessor.php | 4 +-
civicrm/CRM/Utils/Mail/Incoming.php | 4 +-
civicrm/CRM/Utils/Migrate/Export.php | 4 +-
civicrm/CRM/Utils/Migrate/ExportJSON.php | 4 +-
civicrm/CRM/Utils/Migrate/Import.php | 4 +-
civicrm/CRM/Utils/Migrate/ImportJSON.php | 4 +-
civicrm/CRM/Utils/Money.php | 4 +-
civicrm/CRM/Utils/Network.php | 4 +-
civicrm/CRM/Utils/Number.php | 4 +-
civicrm/CRM/Utils/OpenFlashChart.php | 4 +-
civicrm/CRM/Utils/OptionBag.php | 4 +-
civicrm/CRM/Utils/PDF/Label.php | 4 +-
civicrm/CRM/Utils/PDF/Utils.php | 4 +-
civicrm/CRM/Utils/Pager.php | 4 +-
civicrm/CRM/Utils/PagerAToZ.php | 4 +-
civicrm/CRM/Utils/PseudoConstant.php | 6 +-
civicrm/CRM/Utils/QueryFormatter.php | 4 +-
civicrm/CRM/Utils/REST.php | 4 +-
civicrm/CRM/Utils/ReCAPTCHA.php | 4 +-
civicrm/CRM/Utils/Recent.php | 4 +-
civicrm/CRM/Utils/Request.php | 4 +-
civicrm/CRM/Utils/Rule.php | 4 +-
civicrm/CRM/Utils/SQL.php | 4 +-
civicrm/CRM/Utils/SQL/Select.php | 20 +-
civicrm/CRM/Utils/Signer.php | 4 +-
civicrm/CRM/Utils/SoapServer.php | 4 +-
civicrm/CRM/Utils/Sort.php | 4 +-
civicrm/CRM/Utils/String.php | 4 +-
civicrm/CRM/Utils/System.php | 4 +-
civicrm/CRM/Utils/System/Backdrop.php | 4 +-
civicrm/CRM/Utils/System/Drupal.php | 6 +-
civicrm/CRM/Utils/System/Drupal6.php | 4 +-
civicrm/CRM/Utils/System/Drupal8.php | 4 +-
civicrm/CRM/Utils/System/DrupalBase.php | 6 +-
civicrm/CRM/Utils/System/Joomla.php | 19 +-
civicrm/CRM/Utils/System/Soap.php | 4 +-
civicrm/CRM/Utils/System/UnitTests.php | 4 +-
civicrm/CRM/Utils/System/WordPress.php | 4 +-
civicrm/CRM/Utils/SystemLogger.php | 4 +-
civicrm/CRM/Utils/Time.php | 4 +-
civicrm/CRM/Utils/Token.php | 4 +-
civicrm/CRM/Utils/Type.php | 4 +-
civicrm/CRM/Utils/Verp.php | 4 +-
civicrm/CRM/Utils/VersionCheck.php | 4 +-
civicrm/CRM/Utils/Weight.php | 2 +-
civicrm/CRM/Utils/Wrapper.php | 4 +-
civicrm/CRM/Utils/XML.php | 4 +-
civicrm/CRM/Utils/Zip.php | 4 +-
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 | 4 +-
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 | 4 +-
.../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 | 54 +-
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/CCase/SequenceListener.php | 10 +-
civicrm/Civi/Core/DAO/Event/PostDelete.php | 2 +-
civicrm/Civi/Core/DAO/Event/PostUpdate.php | 2 +-
civicrm/Civi/Core/DatabaseInitializer.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/Lock/LockInterface.php | 2 +-
civicrm/Civi/Core/Lock/LockManager.php | 2 +-
civicrm/Civi/Core/Lock/NullLock.php | 4 +-
civicrm/Civi/Core/SettingsBag.php | 2 +-
civicrm/Civi/Core/SettingsManager.php | 2 +-
civicrm/Civi/Core/SettingsMetadata.php | 2 +-
civicrm/Civi/Core/Transaction/Frame.php | 4 +-
civicrm/Civi/Core/Transaction/Manager.php | 4 +-
.../Civi/Token/AbstractTokenSubscriber.php | 2 +-
civicrm/ang/crmMailing/BodyHtml.html | 1 +
civicrm/api/Exception.php | 2 +-
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 | 11 +-
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 | 4 +-
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 | 2 +-
civicrm/api/v3/Generic/Getactions.php | 2 +-
civicrm/api/v3/Generic/Getlist.php | 2 +-
civicrm/api/v3/Generic/Setvalue.php | 2 +-
civicrm/api/v3/Generic/Update.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 | 14 +-
civicrm/api/v3/LocBlock.php | 2 +-
civicrm/api/v3/LocationType.php | 2 +-
civicrm/api/v3/MailSettings.php | 2 +-
civicrm/api/v3/Mailing.php | 2 +-
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 | 4 +-
civicrm/api/v3/MappingField.php | 4 +-
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/PaymentProcessor.php | 2 +-
civicrm/api/v3/PaymentProcessorType.php | 2 +-
civicrm/api/v3/PaymentToken.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 | 2 +-
civicrm/api/v3/RelationshipType.php | 2 +-
civicrm/api/v3/ReportInstance.php | 2 +-
civicrm/api/v3/ReportTemplate.php | 2 +-
civicrm/api/v3/Setting.php | 2 +-
civicrm/api/v3/SmsProvider.php | 2 +-
civicrm/api/v3/StatusPreference.php | 2 +-
civicrm/api/v3/Survey.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 | 4 +-
civicrm/bin/cron.php | 2 +-
civicrm/bin/encryptDB.php | 4 +-
civicrm/bin/migrate/export.php | 4 +-
civicrm/bin/migrate/exportJSON.php | 4 +-
civicrm/bin/migrate/import.php | 4 +-
civicrm/bin/migrate/importJSON.php | 4 +-
civicrm/bin/migrate/move.php | 4 +-
civicrm/bower_components/ckeditor/.bower.json | 8 +-
civicrm/bower_components/ckeditor/CHANGES.md | 20 +-
civicrm/bower_components/ckeditor/ckeditor.js | 4 +-
.../bower_components/ckeditor/contents.css | 3 +
civicrm/bower_components/ckeditor/lang/nl.js | 2 +-
.../bower_components/ckeditor/package.json | 2 +-
.../ckeditor/plugins/colorbutton/plugin.js | 18 +-
.../ckeditor/plugins/language/lang/ast.js | 5 +
.../ckeditor/plugins/table/dialogs/table.js | 34 +-
civicrm/civicrm-version.php | 4 +-
civicrm/civicrm.config.php | 2 +
civicrm/extern/authorizeIPN.php | 4 +-
civicrm/extern/cxn.php | 2 +-
civicrm/extern/ipn.php | 7 +-
civicrm/extern/rest.php | 2 +-
civicrm/extern/soap.php | 2 +-
civicrm/extern/widget.php | 10 +-
civicrm/install/civicrm.php | 4 +-
civicrm/install/index.php | 19 +-
civicrm/js/jquery/jquery.dashboard.js | 2 +-
civicrm/js/wysiwyg/crm.ckeditor.js | 3 +
civicrm/packages/HTML/QuickForm.php | 2 +-
civicrm/packages/VERSIONS.php | 25 +-
civicrm/settings/Address.setting.php | 4 +-
civicrm/settings/Campaign.setting.php | 4 +-
civicrm/settings/Contribute.setting.php | 4 +-
civicrm/settings/Core.setting.php | 4 +-
civicrm/settings/Developer.setting.php | 4 +-
civicrm/settings/Directory.setting.php | 4 +-
civicrm/settings/Event.setting.php | 4 +-
civicrm/settings/Extension.setting.php | 4 +-
civicrm/settings/Localization.setting.php | 8 +-
civicrm/settings/Mailing.setting.php | 4 +-
civicrm/settings/Map.setting.php | 4 +-
civicrm/settings/Member.setting.php | 4 +-
civicrm/settings/Multisite.setting.php | 4 +-
civicrm/settings/Search.setting.php | 4 +-
civicrm/settings/Url.setting.php | 4 +-
civicrm/sql/civicrm.mysql | 10 +-
civicrm/sql/civicrm_acl.mysql | 2 +-
civicrm/sql/civicrm_case_sql.mysql | 2 +-
civicrm/sql/civicrm_data.mysql | 32 +-
civicrm/sql/civicrm_demo_processor.mysql | 2 +-
civicrm/sql/civicrm_devel_config.mysql | 2 +-
civicrm/sql/civicrm_drop.mysql | 2 +-
civicrm/sql/civicrm_generated.mysql | 4 +-
civicrm/sql/civicrm_navigation.mysql | 2 +-
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/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 +-
.../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 | 4 +-
.../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 | 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 +-
.../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 +-
civicrm/templates/CRM/Admin/Form/Tag.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 | 2 +-
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/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 +-
.../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/Admin/Page/Tag.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/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 +-
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/Delete.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 | 2 +-
.../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 +-
.../Contact/Form/Edit/Address/CustomField.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 +-
.../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 | 4 +-
.../templates/CRM/Contact/Form/OnBehalfOf.tpl | 2 +-
.../CRM/Contact/Form/RelatedContact.tpl | 2 +-
.../CRM/Contact/Form/Relationship.tpl | 2 +-
.../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.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 +-
.../Contact/Form/Task/AddToOrganization.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.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.tpl | 2 +-
.../CRM/Contact/Form/Task/PickProfile.tpl | 2 +-
.../templates/CRM/Contact/Form/Task/Print.tpl | 2 +-
.../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 | 2 +-
.../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 | 4 +-
.../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 | 2 +-
.../Form/Contribution/AuthorizeNetARB.tpl | 2 +-
.../Contribute/Form/Contribution/Confirm.tpl | 5 +-
.../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 | 4 +-
.../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 | 2 +-
.../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/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 +-
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/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 | 2 +-
.../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 | 4 +-
.../Event/Form/ParticipantFeeSelection.tpl | 2 +-
.../CRM/Event/Form/ParticipantView.tpl | 2 +-
.../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 | 2 +-
.../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/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/ParentGroups.tpl | 2 +-
civicrm/templates/CRM/Group/Form/Search.tpl | 4 +-
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 | 4 +-
civicrm/templates/CRM/Mailing/Page/Browse.hlp | 2 +-
civicrm/templates/CRM/Mailing/Page/Browse.tpl | 2 +-
.../templates/CRM/Mailing/Page/Component.tpl | 4 +-
.../templates/CRM/Mailing/Page/Confirm.tpl | 2 +-
civicrm/templates/CRM/Mailing/Page/Event.tpl | 2 +-
civicrm/templates/CRM/Mailing/Page/Report.tpl | 2 +-
.../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 | 22 +-
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 +-
.../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/Tag.tpl | 2 +-
civicrm/templates/CRM/Tag/Form/Tagtree.hlp | 2 +-
civicrm/templates/CRM/Tag/Form/Tagtree.tpl | 2 +-
.../templates/CRM/UF/Form/AdvanceSetting.tpl | 2 +-
civicrm/templates/CRM/UF/Form/Block.tpl | 4 +-
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 | 6 +-
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 | 2 +-
.../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/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 | 2 +-
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 +-
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/version.tpl | 2 +-
civicrm/templates/CRM/common/wordpress.tpl | 2 +-
civicrm/vendor/autoload.php | 2 +-
civicrm/vendor/composer/autoload_real.php | 10 +-
includes/civicrm.basepage.php | 2 -
includes/civicrm.shortcodes.modal.php | 2 -
includes/civicrm.shortcodes.php | 2 -
includes/civicrm.users.php | 2 -
2586 files changed, 5559 insertions(+), 4318 deletions(-)
create mode 100644 civicrm/CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl
create mode 100644 civicrm/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_html.tpl
create mode 100644 civicrm/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_text.tpl
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
create mode 100644 civicrm/CRM/Upgrade/Incremental/sql/4.7.6.mysql.tpl
create mode 100644 civicrm/bower_components/ckeditor/plugins/language/lang/ast.js
diff --git a/civicrm/CRM/ACL/API.php b/civicrm/CRM/ACL/API.php
index 8d616981ac..3d0c090dc9 100644
--- a/civicrm/CRM/ACL/API.php
+++ b/civicrm/CRM/ACL/API.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_ACL_API {
diff --git a/civicrm/CRM/ACL/BAO/ACL.php b/civicrm/CRM/ACL/BAO/ACL.php
index 9fd37f5ba0..54962f9cfa 100644
--- a/civicrm/CRM/ACL/BAO/ACL.php
+++ b/civicrm/CRM/ACL/BAO/ACL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/ACL/BAO/Cache.php b/civicrm/CRM/ACL/BAO/Cache.php
index 2ff804ca22..6f302a7a68 100644
--- a/civicrm/CRM/ACL/BAO/Cache.php
+++ b/civicrm/CRM/ACL/BAO/Cache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/ACL/BAO/EntityRole.php b/civicrm/CRM/ACL/BAO/EntityRole.php
index bfe68b49d7..89bcc3f440 100644
--- a/civicrm/CRM/ACL/BAO/EntityRole.php
+++ b/civicrm/CRM/ACL/BAO/EntityRole.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/ACL/DAO/ACL.php b/civicrm/CRM/ACL/DAO/ACL.php
index 72b8dce2b2..909ed72c77 100644
--- a/civicrm/CRM/ACL/DAO/ACL.php
+++ b/civicrm/CRM/ACL/DAO/ACL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/ACL/ACL.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/ACL/DAO/Cache.php b/civicrm/CRM/ACL/DAO/Cache.php
index bcfaf67a5f..e6512daf44 100644
--- a/civicrm/CRM/ACL/DAO/Cache.php
+++ b/civicrm/CRM/ACL/DAO/Cache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/ACL/Cache.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/ACL/DAO/EntityRole.php b/civicrm/CRM/ACL/DAO/EntityRole.php
index a955a7c543..639dd118b8 100644
--- a/civicrm/CRM/ACL/DAO/EntityRole.php
+++ b/civicrm/CRM/ACL/DAO/EntityRole.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/ACL/EntityRole.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/ACL/Form/ACL.php b/civicrm/CRM/ACL/Form/ACL.php
index cb635d6253..7de87c72d5 100644
--- a/civicrm/CRM/ACL/Form/ACL.php
+++ b/civicrm/CRM/ACL/Form/ACL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_ACL_Form_ACL extends CRM_Admin_Form {
diff --git a/civicrm/CRM/ACL/Form/ACLBasic.php b/civicrm/CRM/ACL/Form/ACLBasic.php
index df58d573c4..17a2666163 100644
--- a/civicrm/CRM/ACL/Form/ACLBasic.php
+++ b/civicrm/CRM/ACL/Form/ACLBasic.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_ACL_Form_ACLBasic extends CRM_Admin_Form {
diff --git a/civicrm/CRM/ACL/Form/EntityRole.php b/civicrm/CRM/ACL/Form/EntityRole.php
index b11f41ba5d..13b709b573 100644
--- a/civicrm/CRM/ACL/Form/EntityRole.php
+++ b/civicrm/CRM/ACL/Form/EntityRole.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_ACL_Form_EntityRole extends CRM_Admin_Form {
diff --git a/civicrm/CRM/ACL/Form/WordPress/Permissions.php b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
index 1b059b0c3f..32beb1b952 100644
--- a/civicrm/CRM/ACL/Form/WordPress/Permissions.php
+++ b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/ACL/Page/ACL.php b/civicrm/CRM/ACL/Page/ACL.php
index eccc9116d0..3a5861faf8 100644
--- a/civicrm/CRM/ACL/Page/ACL.php
+++ b/civicrm/CRM/ACL/Page/ACL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_ACL_Page_ACL extends CRM_Core_Page_Basic {
diff --git a/civicrm/CRM/ACL/Page/ACLBasic.php b/civicrm/CRM/ACL/Page/ACLBasic.php
index a81537304d..410e49ca81 100644
--- a/civicrm/CRM/ACL/Page/ACLBasic.php
+++ b/civicrm/CRM/ACL/Page/ACLBasic.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_ACL_Page_ACLBasic extends CRM_Core_Page_Basic {
diff --git a/civicrm/CRM/ACL/Page/EntityRole.php b/civicrm/CRM/ACL/Page/EntityRole.php
index 4e737f6d9b..44dbff44ef 100644
--- a/civicrm/CRM/ACL/Page/EntityRole.php
+++ b/civicrm/CRM/ACL/Page/EntityRole.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_ACL_Page_EntityRole extends CRM_Core_Page_Basic {
diff --git a/civicrm/CRM/Activity/ActionMapping.php b/civicrm/CRM/Activity/ActionMapping.php
index f095b71c9d..67fd6f8148 100644
--- a/civicrm/CRM/Activity/ActionMapping.php
+++ b/civicrm/CRM/Activity/ActionMapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
use Civi\ActionSchedule\RecipientBuilder;
diff --git a/civicrm/CRM/Activity/BAO/Activity.php b/civicrm/CRM/Activity/BAO/Activity.php
index 2faca0e791..154729bbee 100644
--- a/civicrm/CRM/Activity/BAO/Activity.php
+++ b/civicrm/CRM/Activity/BAO/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/BAO/ActivityAssignment.php b/civicrm/CRM/Activity/BAO/ActivityAssignment.php
index be0ead74d4..6a45522c8f 100644
--- a/civicrm/CRM/Activity/BAO/ActivityAssignment.php
+++ b/civicrm/CRM/Activity/BAO/ActivityAssignment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/BAO/ActivityContact.php b/civicrm/CRM/Activity/BAO/ActivityContact.php
index 2fd873e38b..a198afa47f 100644
--- a/civicrm/CRM/Activity/BAO/ActivityContact.php
+++ b/civicrm/CRM/Activity/BAO/ActivityContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/BAO/ActivityTarget.php b/civicrm/CRM/Activity/BAO/ActivityTarget.php
index ba08fba8ca..206e9d682b 100644
--- a/civicrm/CRM/Activity/BAO/ActivityTarget.php
+++ b/civicrm/CRM/Activity/BAO/ActivityTarget.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/BAO/ICalendar.php b/civicrm/CRM/Activity/BAO/ICalendar.php
index c02d08ad0a..7ccdf0bffd 100644
--- a/civicrm/CRM/Activity/BAO/ICalendar.php
+++ b/civicrm/CRM/Activity/BAO/ICalendar.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/BAO/Query.php b/civicrm/CRM/Activity/BAO/Query.php
index 20677e4977..370c16dd70 100644
--- a/civicrm/CRM/Activity/BAO/Query.php
+++ b/civicrm/CRM/Activity/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Activity_BAO_Query {
diff --git a/civicrm/CRM/Activity/Controller/Search.php b/civicrm/CRM/Activity/Controller/Search.php
index a9899a1252..fa7e16feb8 100644
--- a/civicrm/CRM/Activity/Controller/Search.php
+++ b/civicrm/CRM/Activity/Controller/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/DAO/Activity.php b/civicrm/CRM/Activity/DAO/Activity.php
index 01b1461271..1ee2f9d062 100644
--- a/civicrm/CRM/Activity/DAO/Activity.php
+++ b/civicrm/CRM/Activity/DAO/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Activity/Activity.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Activity/DAO/ActivityContact.php b/civicrm/CRM/Activity/DAO/ActivityContact.php
index a4f39de4c5..dd874b3d2b 100644
--- a/civicrm/CRM/Activity/DAO/ActivityContact.php
+++ b/civicrm/CRM/Activity/DAO/ActivityContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Activity/ActivityContact.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Activity/Form/Activity.php b/civicrm/CRM/Activity/Form/Activity.php
index 1d56c70888..9e74fffb56 100644
--- a/civicrm/CRM/Activity/Form/Activity.php
+++ b/civicrm/CRM/Activity/Form/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/ActivityFilter.php b/civicrm/CRM/Activity/Form/ActivityFilter.php
index bb47aafc87..19b19acdc6 100644
--- a/civicrm/CRM/Activity/Form/ActivityFilter.php
+++ b/civicrm/CRM/Activity/Form/ActivityFilter.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/ActivityLinks.php b/civicrm/CRM/Activity/Form/ActivityLinks.php
index 07053d4d6d..f0252ec75d 100644
--- a/civicrm/CRM/Activity/Form/ActivityLinks.php
+++ b/civicrm/CRM/Activity/Form/ActivityLinks.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/ActivityView.php b/civicrm/CRM/Activity/Form/ActivityView.php
index 1629429629..0174a83f62 100644
--- a/civicrm/CRM/Activity/Form/ActivityView.php
+++ b/civicrm/CRM/Activity/Form/ActivityView.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Search.php b/civicrm/CRM/Activity/Form/Search.php
index 3b81aead8a..14d23bdff8 100644
--- a/civicrm/CRM/Activity/Form/Search.php
+++ b/civicrm/CRM/Activity/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task.php b/civicrm/CRM/Activity/Form/Task.php
index c2a755dee3..bb64bcb7bc 100644
--- a/civicrm/CRM/Activity/Form/Task.php
+++ b/civicrm/CRM/Activity/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/AddToTag.php b/civicrm/CRM/Activity/Form/Task/AddToTag.php
index 155702b894..528d593d2f 100644
--- a/civicrm/CRM/Activity/Form/Task/AddToTag.php
+++ b/civicrm/CRM/Activity/Form/Task/AddToTag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/Batch.php b/civicrm/CRM/Activity/Form/Task/Batch.php
index 3d44c27b24..afc3eb931c 100644
--- a/civicrm/CRM/Activity/Form/Task/Batch.php
+++ b/civicrm/CRM/Activity/Form/Task/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/Delete.php b/civicrm/CRM/Activity/Form/Task/Delete.php
index addd960599..1339a4b0e0 100644
--- a/civicrm/CRM/Activity/Form/Task/Delete.php
+++ b/civicrm/CRM/Activity/Form/Task/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/Email.php b/civicrm/CRM/Activity/Form/Task/Email.php
index 5565596156..019bc77313 100644
--- a/civicrm/CRM/Activity/Form/Task/Email.php
+++ b/civicrm/CRM/Activity/Form/Task/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/FileOnCase.php b/civicrm/CRM/Activity/Form/Task/FileOnCase.php
index 0154767630..87c0e28256 100644
--- a/civicrm/CRM/Activity/Form/Task/FileOnCase.php
+++ b/civicrm/CRM/Activity/Form/Task/FileOnCase.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/PickOption.php b/civicrm/CRM/Activity/Form/Task/PickOption.php
index e81b27b8db..342e4d7541 100644
--- a/civicrm/CRM/Activity/Form/Task/PickOption.php
+++ b/civicrm/CRM/Activity/Form/Task/PickOption.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/PickProfile.php b/civicrm/CRM/Activity/Form/Task/PickProfile.php
index d310764ac9..de0d799c80 100644
--- a/civicrm/CRM/Activity/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Activity/Form/Task/PickProfile.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/Print.php b/civicrm/CRM/Activity/Form/Task/Print.php
index f746334083..9b085ed232 100644
--- a/civicrm/CRM/Activity/Form/Task/Print.php
+++ b/civicrm/CRM/Activity/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/RemoveFromTag.php b/civicrm/CRM/Activity/Form/Task/RemoveFromTag.php
index b3a5d98216..d04ab4dbff 100644
--- a/civicrm/CRM/Activity/Form/Task/RemoveFromTag.php
+++ b/civicrm/CRM/Activity/Form/Task/RemoveFromTag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/SMS.php b/civicrm/CRM/Activity/Form/Task/SMS.php
index 0ca7a880d1..a78159eedf 100644
--- a/civicrm/CRM/Activity/Form/Task/SMS.php
+++ b/civicrm/CRM/Activity/Form/Task/SMS.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php
index f7da94a4d4..0a40c36e19 100644
--- a/civicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Activity/Form/Task/SearchTaskHookSample.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Import/Controller.php b/civicrm/CRM/Activity/Import/Controller.php
index a8686829bf..4740fb2bbb 100644
--- a/civicrm/CRM/Activity/Import/Controller.php
+++ b/civicrm/CRM/Activity/Import/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Activity_Import_Controller extends CRM_Core_Controller {
diff --git a/civicrm/CRM/Activity/Import/Field.php b/civicrm/CRM/Activity/Import/Field.php
index 036cfdd040..d19ee7e6e4 100644
--- a/civicrm/CRM/Activity/Import/Field.php
+++ b/civicrm/CRM/Activity/Import/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Activity_Import_Field {
diff --git a/civicrm/CRM/Activity/Import/Form/DataSource.php b/civicrm/CRM/Activity/Import/Form/DataSource.php
index aa412bb2f3..f799dfe6ea 100644
--- a/civicrm/CRM/Activity/Import/Form/DataSource.php
+++ b/civicrm/CRM/Activity/Import/Form/DataSource.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Import/Form/MapField.php b/civicrm/CRM/Activity/Import/Form/MapField.php
index 5545264c2c..baec4b1f68 100644
--- a/civicrm/CRM/Activity/Import/Form/MapField.php
+++ b/civicrm/CRM/Activity/Import/Form/MapField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Import/Form/Preview.php b/civicrm/CRM/Activity/Import/Form/Preview.php
index 6ab2a173a7..3e1bebe603 100644
--- a/civicrm/CRM/Activity/Import/Form/Preview.php
+++ b/civicrm/CRM/Activity/Import/Form/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Import/Form/Summary.php b/civicrm/CRM/Activity/Import/Form/Summary.php
index 646b191df4..02a9c22350 100644
--- a/civicrm/CRM/Activity/Import/Form/Summary.php
+++ b/civicrm/CRM/Activity/Import/Form/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Import/Parser.php b/civicrm/CRM/Activity/Import/Parser.php
index 92a37e811c..497be5ec28 100644
--- a/civicrm/CRM/Activity/Import/Parser.php
+++ b/civicrm/CRM/Activity/Import/Parser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
diff --git a/civicrm/CRM/Activity/Import/Parser/Activity.php b/civicrm/CRM/Activity/Import/Parser/Activity.php
index afeec3f463..22dbddcb65 100644
--- a/civicrm/CRM/Activity/Import/Parser/Activity.php
+++ b/civicrm/CRM/Activity/Import/Parser/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
diff --git a/civicrm/CRM/Activity/Page/AJAX.php b/civicrm/CRM/Activity/Page/AJAX.php
index efb7415622..4035106c84 100644
--- a/civicrm/CRM/Activity/Page/AJAX.php
+++ b/civicrm/CRM/Activity/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
*/
diff --git a/civicrm/CRM/Activity/Page/Tab.php b/civicrm/CRM/Activity/Page/Tab.php
index 3289477025..349be6abd2 100644
--- a/civicrm/CRM/Activity/Page/Tab.php
+++ b/civicrm/CRM/Activity/Page/Tab.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Page/UserDashboard.php b/civicrm/CRM/Activity/Page/UserDashboard.php
index b9d5f89a2b..5804056d00 100644
--- a/civicrm/CRM/Activity/Page/UserDashboard.php
+++ b/civicrm/CRM/Activity/Page/UserDashboard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Selector/Activity.php b/civicrm/CRM/Activity/Selector/Activity.php
index 1813a2a635..ad26e32c1b 100644
--- a/civicrm/CRM/Activity/Selector/Activity.php
+++ b/civicrm/CRM/Activity/Selector/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Selector/Search.php b/civicrm/CRM/Activity/Selector/Search.php
index c17e5f2bdc..c7822ab62b 100644
--- a/civicrm/CRM/Activity/Selector/Search.php
+++ b/civicrm/CRM/Activity/Selector/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/StateMachine/Search.php b/civicrm/CRM/Activity/StateMachine/Search.php
index 0f8eea0c41..1f06cb7a9c 100644
--- a/civicrm/CRM/Activity/StateMachine/Search.php
+++ b/civicrm/CRM/Activity/StateMachine/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Activity_StateMachine_Search extends CRM_Core_StateMachine {
diff --git a/civicrm/CRM/Activity/Task.php b/civicrm/CRM/Activity/Task.php
index 02e6f5d4fe..5269448836 100644
--- a/civicrm/CRM/Activity/Task.php
+++ b/civicrm/CRM/Activity/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Activity/Tokens.php b/civicrm/CRM/Activity/Tokens.php
index c7643f70c9..def80cbd85 100644
--- a/civicrm/CRM/Activity/Tokens.php
+++ b/civicrm/CRM/Activity/Tokens.php
@@ -4,7 +4,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form.php b/civicrm/CRM/Admin/Form.php
index ea32fd3169..c6b535c079 100644
--- a/civicrm/CRM/Admin/Form.php
+++ b/civicrm/CRM/Admin/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/CMSUser.php b/civicrm/CRM/Admin/Form/CMSUser.php
index c88a2a58da..9571716d9f 100644
--- a/civicrm/CRM/Admin/Form/CMSUser.php
+++ b/civicrm/CRM/Admin/Form/CMSUser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/ContactType.php b/civicrm/CRM/Admin/Form/ContactType.php
index 09f589c871..d54229af9a 100644
--- a/civicrm/CRM/Admin/Form/ContactType.php
+++ b/civicrm/CRM/Admin/Form/ContactType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Extensions.php b/civicrm/CRM/Admin/Form/Extensions.php
index df93fbf23b..7aa2b80bb9 100644
--- a/civicrm/CRM/Admin/Form/Extensions.php
+++ b/civicrm/CRM/Admin/Form/Extensions.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Job.php b/civicrm/CRM/Admin/Form/Job.php
index 5209a92af0..46f221e7c1 100644
--- a/civicrm/CRM/Admin/Form/Job.php
+++ b/civicrm/CRM/Admin/Form/Job.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/LabelFormats.php b/civicrm/CRM/Admin/Form/LabelFormats.php
index 59e1a334d6..e6f9e4efdd 100644
--- a/civicrm/CRM/Admin/Form/LabelFormats.php
+++ b/civicrm/CRM/Admin/Form/LabelFormats.php
@@ -29,7 +29,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/LocationType.php b/civicrm/CRM/Admin/Form/LocationType.php
index 0646f7957f..68d2980c0b 100644
--- a/civicrm/CRM/Admin/Form/LocationType.php
+++ b/civicrm/CRM/Admin/Form/LocationType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/MailSettings.php b/civicrm/CRM/Admin/Form/MailSettings.php
index 4365a503c8..3d35b35fae 100644
--- a/civicrm/CRM/Admin/Form/MailSettings.php
+++ b/civicrm/CRM/Admin/Form/MailSettings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Mapping.php b/civicrm/CRM/Admin/Form/Mapping.php
index 0a56664812..4c0d84f380 100644
--- a/civicrm/CRM/Admin/Form/Mapping.php
+++ b/civicrm/CRM/Admin/Form/Mapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/MessageTemplates.php b/civicrm/CRM/Admin/Form/MessageTemplates.php
index 61b1fa2588..4ee63fc444 100644
--- a/civicrm/CRM/Admin/Form/MessageTemplates.php
+++ b/civicrm/CRM/Admin/Form/MessageTemplates.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -171,6 +171,7 @@ class CRM_Admin_Form_MessageTemplates extends CRM_Admin_Form {
'cols' => '80',
'rows' => '8',
'onkeyup' => "return verify(this)",
+ 'class' => 'crm-wysiwyg-fullpage',
)
);
}
diff --git a/civicrm/CRM/Admin/Form/Navigation.php b/civicrm/CRM/Admin/Form/Navigation.php
index 5f631f62e1..23270f05a4 100644
--- a/civicrm/CRM/Admin/Form/Navigation.php
+++ b/civicrm/CRM/Admin/Form/Navigation.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/OptionGroup.php b/civicrm/CRM/Admin/Form/OptionGroup.php
index df38787996..7a4ac77e3b 100644
--- a/civicrm/CRM/Admin/Form/OptionGroup.php
+++ b/civicrm/CRM/Admin/Form/OptionGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Options.php b/civicrm/CRM/Admin/Form/Options.php
index 25db9ff273..d157a48634 100644
--- a/civicrm/CRM/Admin/Form/Options.php
+++ b/civicrm/CRM/Admin/Form/Options.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/ParticipantStatusType.php b/civicrm/CRM/Admin/Form/ParticipantStatusType.php
index dc7c58aba7..0a2987d341 100644
--- a/civicrm/CRM/Admin/Form/ParticipantStatusType.php
+++ b/civicrm/CRM/Admin/Form/ParticipantStatusType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Admin_Form_ParticipantStatusType extends CRM_Admin_Form {
diff --git a/civicrm/CRM/Admin/Form/PaymentProcessor.php b/civicrm/CRM/Admin/Form/PaymentProcessor.php
index d392c4337f..a0367bb24b 100644
--- a/civicrm/CRM/Admin/Form/PaymentProcessor.php
+++ b/civicrm/CRM/Admin/Form/PaymentProcessor.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/PaymentProcessorType.php b/civicrm/CRM/Admin/Form/PaymentProcessorType.php
index 5c4e2e946f..0cc74ba8da 100644
--- a/civicrm/CRM/Admin/Form/PaymentProcessorType.php
+++ b/civicrm/CRM/Admin/Form/PaymentProcessorType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/PdfFormats.php b/civicrm/CRM/Admin/Form/PdfFormats.php
index da53bf5590..73e39e5191 100644
--- a/civicrm/CRM/Admin/Form/PdfFormats.php
+++ b/civicrm/CRM/Admin/Form/PdfFormats.php
@@ -29,7 +29,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Persistent.php b/civicrm/CRM/Admin/Form/Persistent.php
index cfcdf1b4f7..13eecb8bcb 100644
--- a/civicrm/CRM/Admin/Form/Persistent.php
+++ b/civicrm/CRM/Admin/Form/Persistent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Preferences.php b/civicrm/CRM/Admin/Form/Preferences.php
index 6b35849c9f..c39d615a50 100644
--- a/civicrm/CRM/Admin/Form/Preferences.php
+++ b/civicrm/CRM/Admin/Form/Preferences.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Preferences/Address.php b/civicrm/CRM/Admin/Form/Preferences/Address.php
index 17ec772b47..09ce28cd68 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Address.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Address.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Preferences/Campaign.php b/civicrm/CRM/Admin/Form/Preferences/Campaign.php
index 3fe6485238..d373274449 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Campaign.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Campaign.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: Display.php 36505 2011-10-03 14:19:56Z lobo $
*
*/
diff --git a/civicrm/CRM/Admin/Form/Preferences/Contribute.php b/civicrm/CRM/Admin/Form/Preferences/Contribute.php
index d3b1fc8c79..ec733fdc14 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Contribute.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Contribute.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Preferences/Display.php b/civicrm/CRM/Admin/Form/Preferences/Display.php
index 6ba66f8eaf..423f08c7b2 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Display.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Display.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Preferences/Event.php b/civicrm/CRM/Admin/Form/Preferences/Event.php
index 70b4844960..d8023890ef 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Event.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: Display.php 36505 2011-10-03 14:19:56Z lobo $
*
*/
diff --git a/civicrm/CRM/Admin/Form/Preferences/Mailing.php b/civicrm/CRM/Admin/Form/Preferences/Mailing.php
index 1c41c07922..7592ddaa68 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Mailing.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Mailing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: Display.php 36505 2011-10-03 14:19:56Z lobo $
*
*/
diff --git a/civicrm/CRM/Admin/Form/Preferences/Member.php b/civicrm/CRM/Admin/Form/Preferences/Member.php
index ad24d2e81d..1c0bfcfe51 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Member.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Member.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Preferences/Multisite.php b/civicrm/CRM/Admin/Form/Preferences/Multisite.php
index 30d2d97198..4ebdf158e2 100644
--- a/civicrm/CRM/Admin/Form/Preferences/Multisite.php
+++ b/civicrm/CRM/Admin/Form/Preferences/Multisite.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: Display.php 36505 2011-10-03 14:19:56Z lobo $
*
*/
diff --git a/civicrm/CRM/Admin/Form/PreferencesDate.php b/civicrm/CRM/Admin/Form/PreferencesDate.php
index 97d6455b86..68c6f6c518 100644
--- a/civicrm/CRM/Admin/Form/PreferencesDate.php
+++ b/civicrm/CRM/Admin/Form/PreferencesDate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/RelationshipType.php b/civicrm/CRM/Admin/Form/RelationshipType.php
index 41d108bf5b..f932cf3bda 100644
--- a/civicrm/CRM/Admin/Form/RelationshipType.php
+++ b/civicrm/CRM/Admin/Form/RelationshipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/ScheduleReminders.php b/civicrm/CRM/Admin/Form/ScheduleReminders.php
index 89c6240802..9df937354d 100644
--- a/civicrm/CRM/Admin/Form/ScheduleReminders.php
+++ b/civicrm/CRM/Admin/Form/ScheduleReminders.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -106,7 +106,7 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
'text',
'title',
ts('Title'),
- array('size' => 45, 'maxlength' => 128),
+ CRM_Core_DAO::getAttribute('CRM_Core_DAO_ActionSchedule', 'title'),
TRUE
);
@@ -309,11 +309,15 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
}
if (!empty($fields['is_active']) &&
- CRM_Utils_Array::value('mode', $fields) == 'SMS' &&
CRM_Utils_System::isNull($fields['subject'])
) {
$errors['subject'] = ts('Subject is a required field.');
}
+ if (!empty($fields['is_active']) &&
+ CRM_Utils_System::isNull(trim(strip_tags($fields['html_message'])))
+ ) {
+ $errors['html_message'] = ts('The HTML message is a required field.');
+ }
if (empty($self->_context) && CRM_Utils_System::isNull(CRM_Utils_Array::value(1, $fields['entity']))) {
$errors['entity'] = ts('Please select entity value');
diff --git a/civicrm/CRM/Admin/Form/Setting.php b/civicrm/CRM/Admin/Form/Setting.php
index 3064e2c9c4..3f1e648ec0 100644
--- a/civicrm/CRM/Admin/Form/Setting.php
+++ b/civicrm/CRM/Admin/Form/Setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Component.php b/civicrm/CRM/Admin/Form/Setting/Component.php
index 092a86c523..61df21517b 100644
--- a/civicrm/CRM/Admin/Form/Setting/Component.php
+++ b/civicrm/CRM/Admin/Form/Setting/Component.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Date.php b/civicrm/CRM/Admin/Form/Setting/Date.php
index 2fe63dc53a..72271ae377 100644
--- a/civicrm/CRM/Admin/Form/Setting/Date.php
+++ b/civicrm/CRM/Admin/Form/Setting/Date.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Debugging.php b/civicrm/CRM/Admin/Form/Setting/Debugging.php
index 3c718484bc..7c08c679b2 100644
--- a/civicrm/CRM/Admin/Form/Setting/Debugging.php
+++ b/civicrm/CRM/Admin/Form/Setting/Debugging.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Localization.php b/civicrm/CRM/Admin/Form/Setting/Localization.php
index 0dc24f4531..5ad770b38b 100644
--- a/civicrm/CRM/Admin/Form/Setting/Localization.php
+++ b/civicrm/CRM/Admin/Form/Setting/Localization.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Mail.php b/civicrm/CRM/Admin/Form/Setting/Mail.php
index b6e5237d5d..3d04558b03 100644
--- a/civicrm/CRM/Admin/Form/Setting/Mail.php
+++ b/civicrm/CRM/Admin/Form/Setting/Mail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Mapping.php b/civicrm/CRM/Admin/Form/Setting/Mapping.php
index e041e4b362..8069ac283b 100644
--- a/civicrm/CRM/Admin/Form/Setting/Mapping.php
+++ b/civicrm/CRM/Admin/Form/Setting/Mapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php b/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
index 1630ed9ce9..897ccef971 100644
--- a/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
+++ b/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Path.php b/civicrm/CRM/Admin/Form/Setting/Path.php
index ba11d3c46c..edf3ecc784 100644
--- a/civicrm/CRM/Admin/Form/Setting/Path.php
+++ b/civicrm/CRM/Admin/Form/Setting/Path.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Search.php b/civicrm/CRM/Admin/Form/Setting/Search.php
index 66bb8f7a88..ae4e40c675 100644
--- a/civicrm/CRM/Admin/Form/Setting/Search.php
+++ b/civicrm/CRM/Admin/Form/Setting/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Smtp.php b/civicrm/CRM/Admin/Form/Setting/Smtp.php
index 84272a9583..8d1d06141b 100644
--- a/civicrm/CRM/Admin/Form/Setting/Smtp.php
+++ b/civicrm/CRM/Admin/Form/Setting/Smtp.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/UF.php b/civicrm/CRM/Admin/Form/Setting/UF.php
index 760ecf227a..7b014d3543 100644
--- a/civicrm/CRM/Admin/Form/Setting/UF.php
+++ b/civicrm/CRM/Admin/Form/Setting/UF.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php b/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php
index c793c6990e..23a99a6b3e 100644
--- a/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php
+++ b/civicrm/CRM/Admin/Form/Setting/UpdateConfigBackend.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Setting/Url.php b/civicrm/CRM/Admin/Form/Setting/Url.php
index 7a3f8d0072..470e48c38e 100644
--- a/civicrm/CRM/Admin/Form/Setting/Url.php
+++ b/civicrm/CRM/Admin/Form/Setting/Url.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/Tag.php b/civicrm/CRM/Admin/Form/Tag.php
index af18b37b7f..98bc99e023 100644
--- a/civicrm/CRM/Admin/Form/Tag.php
+++ b/civicrm/CRM/Admin/Form/Tag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Form/WordReplacements.php b/civicrm/CRM/Admin/Form/WordReplacements.php
index 82ff6df5ee..0a5fabdb0c 100644
--- a/civicrm/CRM/Admin/Form/WordReplacements.php
+++ b/civicrm/CRM/Admin/Form/WordReplacements.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Admin_Form_WordReplacements extends CRM_Core_Form {
protected $_numStrings = 10;
diff --git a/civicrm/CRM/Admin/Page/AJAX.php b/civicrm/CRM/Admin/Page/AJAX.php
index 8e366fc14e..139321abe4 100644
--- a/civicrm/CRM/Admin/Page/AJAX.php
+++ b/civicrm/CRM/Admin/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/APIExplorer.php b/civicrm/CRM/Admin/Page/APIExplorer.php
index bc2d6ec732..90358db15f 100644
--- a/civicrm/CRM/Admin/Page/APIExplorer.php
+++ b/civicrm/CRM/Admin/Page/APIExplorer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/Access.php b/civicrm/CRM/Admin/Page/Access.php
index e7fa0e7bf0..62d84f0980 100644
--- a/civicrm/CRM/Admin/Page/Access.php
+++ b/civicrm/CRM/Admin/Page/Access.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -45,11 +45,11 @@ class CRM_Admin_Page_Access extends CRM_Core_Page {
switch ($config->userFramework) {
case 'Drupal':
- $this->assign('ufAccessURL', CRM_Utils_System::url('admin/people/permissions'));
+ $this->assign('ufAccessURL', url('admin/people/permissions'));
break;
case 'Drupal6':
- $this->assign('ufAccessURL', CRM_Utils_System::url('admin/user/permissions'));
+ $this->assign('ufAccessURL', url('admin/user/permissions'));
break;
case 'Joomla':
diff --git a/civicrm/CRM/Admin/Page/Admin.php b/civicrm/CRM/Admin/Page/Admin.php
index a0a261b3c9..88fb6553ff 100644
--- a/civicrm/CRM/Admin/Page/Admin.php
+++ b/civicrm/CRM/Admin/Page/Admin.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/CKEditorConfig.php b/civicrm/CRM/Admin/Page/CKEditorConfig.php
index 572f41476f..ebeb35a419 100644
--- a/civicrm/CRM/Admin/Page/CKEditorConfig.php
+++ b/civicrm/CRM/Admin/Page/CKEditorConfig.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/ConfigTaskList.php b/civicrm/CRM/Admin/Page/ConfigTaskList.php
index 6b52b4c8cc..76957494b3 100644
--- a/civicrm/CRM/Admin/Page/ConfigTaskList.php
+++ b/civicrm/CRM/Admin/Page/ConfigTaskList.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/ContactType.php b/civicrm/CRM/Admin/Page/ContactType.php
index 9da8ab50b3..8ad0e58087 100644
--- a/civicrm/CRM/Admin/Page/ContactType.php
+++ b/civicrm/CRM/Admin/Page/ContactType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/EventTemplate.php b/civicrm/CRM/Admin/Page/EventTemplate.php
index 84a7bcae69..5d2b45baf4 100644
--- a/civicrm/CRM/Admin/Page/EventTemplate.php
+++ b/civicrm/CRM/Admin/Page/EventTemplate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/Extensions.php b/civicrm/CRM/Admin/Page/Extensions.php
index 16adaedba2..b595b59162 100644
--- a/civicrm/CRM/Admin/Page/Extensions.php
+++ b/civicrm/CRM/Admin/Page/Extensions.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This is a part of CiviCRM extension management functionality.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/Job.php b/civicrm/CRM/Admin/Page/Job.php
index 750e9dc578..cd29853bc0 100644
--- a/civicrm/CRM/Admin/Page/Job.php
+++ b/civicrm/CRM/Admin/Page/Job.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/JobLog.php b/civicrm/CRM/Admin/Page/JobLog.php
index fd19c18100..869fcf364b 100644
--- a/civicrm/CRM/Admin/Page/JobLog.php
+++ b/civicrm/CRM/Admin/Page/JobLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/LabelFormats.php b/civicrm/CRM/Admin/Page/LabelFormats.php
index e9e8a0ce65..24b11e372a 100644
--- a/civicrm/CRM/Admin/Page/LabelFormats.php
+++ b/civicrm/CRM/Admin/Page/LabelFormats.php
@@ -29,7 +29,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/LocationType.php b/civicrm/CRM/Admin/Page/LocationType.php
index ce38c28476..d6699ad50c 100644
--- a/civicrm/CRM/Admin/Page/LocationType.php
+++ b/civicrm/CRM/Admin/Page/LocationType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/MailSettings.php b/civicrm/CRM/Admin/Page/MailSettings.php
index 2bf6c4893b..e4256c8e47 100644
--- a/civicrm/CRM/Admin/Page/MailSettings.php
+++ b/civicrm/CRM/Admin/Page/MailSettings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/Mapping.php b/civicrm/CRM/Admin/Page/Mapping.php
index 0aa0b2c81b..93eb274be3 100644
--- a/civicrm/CRM/Admin/Page/Mapping.php
+++ b/civicrm/CRM/Admin/Page/Mapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/MessageTemplates.php b/civicrm/CRM/Admin/Page/MessageTemplates.php
index 3a6c203bf4..f3ac667bb6 100644
--- a/civicrm/CRM/Admin/Page/MessageTemplates.php
+++ b/civicrm/CRM/Admin/Page/MessageTemplates.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/Navigation.php b/civicrm/CRM/Admin/Page/Navigation.php
index b7a301c173..18f5915a41 100644
--- a/civicrm/CRM/Admin/Page/Navigation.php
+++ b/civicrm/CRM/Admin/Page/Navigation.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/Options.php b/civicrm/CRM/Admin/Page/Options.php
index cc9d9b8d10..f2d10334f3 100644
--- a/civicrm/CRM/Admin/Page/Options.php
+++ b/civicrm/CRM/Admin/Page/Options.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/ParticipantStatusType.php b/civicrm/CRM/Admin/Page/ParticipantStatusType.php
index 687bba5519..fc46bb01c3 100644
--- a/civicrm/CRM/Admin/Page/ParticipantStatusType.php
+++ b/civicrm/CRM/Admin/Page/ParticipantStatusType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Admin_Page_ParticipantStatusType extends CRM_Core_Page_Basic {
diff --git a/civicrm/CRM/Admin/Page/PaymentProcessor.php b/civicrm/CRM/Admin/Page/PaymentProcessor.php
index d6ee3042b8..af23ee7896 100644
--- a/civicrm/CRM/Admin/Page/PaymentProcessor.php
+++ b/civicrm/CRM/Admin/Page/PaymentProcessor.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/PaymentProcessorType.php b/civicrm/CRM/Admin/Page/PaymentProcessorType.php
index ef65767914..758d557b70 100644
--- a/civicrm/CRM/Admin/Page/PaymentProcessorType.php
+++ b/civicrm/CRM/Admin/Page/PaymentProcessorType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/PdfFormats.php b/civicrm/CRM/Admin/Page/PdfFormats.php
index 57e9396be5..b76513170e 100644
--- a/civicrm/CRM/Admin/Page/PdfFormats.php
+++ b/civicrm/CRM/Admin/Page/PdfFormats.php
@@ -29,7 +29,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/Persistent.php b/civicrm/CRM/Admin/Page/Persistent.php
index e562780e1b..158a89fd3d 100644
--- a/civicrm/CRM/Admin/Page/Persistent.php
+++ b/civicrm/CRM/Admin/Page/Persistent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/PreferencesDate.php b/civicrm/CRM/Admin/Page/PreferencesDate.php
index 933265a7c8..5fcf4fd53c 100644
--- a/civicrm/CRM/Admin/Page/PreferencesDate.php
+++ b/civicrm/CRM/Admin/Page/PreferencesDate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/RelationshipType.php b/civicrm/CRM/Admin/Page/RelationshipType.php
index 7f35a0c1c6..f006aa89d4 100644
--- a/civicrm/CRM/Admin/Page/RelationshipType.php
+++ b/civicrm/CRM/Admin/Page/RelationshipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/ScheduleReminders.php b/civicrm/CRM/Admin/Page/ScheduleReminders.php
index 90f89f2e3b..6ef704d023 100644
--- a/civicrm/CRM/Admin/Page/ScheduleReminders.php
+++ b/civicrm/CRM/Admin/Page/ScheduleReminders.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/Setting.php b/civicrm/CRM/Admin/Page/Setting.php
index 55de3446b8..d497129ec4 100644
--- a/civicrm/CRM/Admin/Page/Setting.php
+++ b/civicrm/CRM/Admin/Page/Setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Admin/Page/Tag.php b/civicrm/CRM/Admin/Page/Tag.php
index 6742447ffd..938746037a 100644
--- a/civicrm/CRM/Admin/Page/Tag.php
+++ b/civicrm/CRM/Admin/Page/Tag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Badge/BAO/Badge.php b/civicrm/CRM/Badge/BAO/Badge.php
index ccd7167508..93c7f99af2 100644
--- a/civicrm/CRM/Badge/BAO/Badge.php
+++ b/civicrm/CRM/Badge/BAO/Badge.php
@@ -26,7 +26,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Badge/BAO/Layout.php b/civicrm/CRM/Badge/BAO/Layout.php
index b39b54d771..5de4043d76 100644
--- a/civicrm/CRM/Badge/BAO/Layout.php
+++ b/civicrm/CRM/Badge/BAO/Layout.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel {
diff --git a/civicrm/CRM/Badge/Form/Layout.php b/civicrm/CRM/Badge/Form/Layout.php
index 6f0fbaa3f5..3f0ece80f9 100644
--- a/civicrm/CRM/Badge/Form/Layout.php
+++ b/civicrm/CRM/Badge/Form/Layout.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Badge/Page/AJAX.php b/civicrm/CRM/Badge/Page/AJAX.php
index 46c7fa5a44..bb6348e79c 100644
--- a/civicrm/CRM/Badge/Page/AJAX.php
+++ b/civicrm/CRM/Badge/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
*/
class CRM_Badge_Page_AJAX {
diff --git a/civicrm/CRM/Badge/Page/Layout.php b/civicrm/CRM/Badge/Page/Layout.php
index 492dccd8b2..93f8b8f43f 100644
--- a/civicrm/CRM/Badge/Page/Layout.php
+++ b/civicrm/CRM/Badge/Page/Layout.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Batch/BAO/Batch.php b/civicrm/CRM/Batch/BAO/Batch.php
index cca022aa8a..0cbb4eff05 100644
--- a/civicrm/CRM/Batch/BAO/Batch.php
+++ b/civicrm/CRM/Batch/BAO/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Batch/BAO/EntityBatch.php b/civicrm/CRM/Batch/BAO/EntityBatch.php
index 1895eaa91a..589c1a2fa1 100644
--- a/civicrm/CRM/Batch/BAO/EntityBatch.php
+++ b/civicrm/CRM/Batch/BAO/EntityBatch.php
@@ -1,9 +1,9 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.6 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Batch_BAO_EntityBatch extends CRM_Batch_DAO_EntityBatch {
diff --git a/civicrm/CRM/Batch/DAO/Batch.php b/civicrm/CRM/Batch/DAO/Batch.php
index 6046869f83..c00430c6dd 100644
--- a/civicrm/CRM/Batch/DAO/Batch.php
+++ b/civicrm/CRM/Batch/DAO/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Batch/Batch.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Batch/DAO/EntityBatch.php b/civicrm/CRM/Batch/DAO/EntityBatch.php
index 750a4fd6b7..e8cf0f8666 100644
--- a/civicrm/CRM/Batch/DAO/EntityBatch.php
+++ b/civicrm/CRM/Batch/DAO/EntityBatch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Batch/EntityBatch.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Batch/Form/Batch.php b/civicrm/CRM/Batch/Form/Batch.php
index b39df19838..04788b7885 100644
--- a/civicrm/CRM/Batch/Form/Batch.php
+++ b/civicrm/CRM/Batch/Form/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Batch/Form/Entry.php b/civicrm/CRM/Batch/Form/Entry.php
index 9794357499..710ca0068a 100644
--- a/civicrm/CRM/Batch/Form/Entry.php
+++ b/civicrm/CRM/Batch/Form/Entry.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Batch/Form/Search.php b/civicrm/CRM/Batch/Form/Search.php
index 61ca13475e..7adc72b0b7 100644
--- a/civicrm/CRM/Batch/Form/Search.php
+++ b/civicrm/CRM/Batch/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Batch_Form_Search extends CRM_Core_Form {
/**
diff --git a/civicrm/CRM/Batch/Page/AJAX.php b/civicrm/CRM/Batch/Page/AJAX.php
index 5355ce5874..c340632fc1 100644
--- a/civicrm/CRM/Batch/Page/AJAX.php
+++ b/civicrm/CRM/Batch/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Batch/Page/Batch.php b/civicrm/CRM/Batch/Page/Batch.php
index 932b3c424c..facf36e92a 100644
--- a/civicrm/CRM/Batch/Page/Batch.php
+++ b/civicrm/CRM/Batch/Page/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Bridge/OG/CiviCRM.php b/civicrm/CRM/Bridge/OG/CiviCRM.php
index ddaf959d82..e0e82abeac 100644
--- a/civicrm/CRM/Bridge/OG/CiviCRM.php
+++ b/civicrm/CRM/Bridge/OG/CiviCRM.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Bridge_OG_CiviCRM {
diff --git a/civicrm/CRM/Bridge/OG/Drupal.php b/civicrm/CRM/Bridge/OG/Drupal.php
index e5557a8626..1cfdd68ef2 100644
--- a/civicrm/CRM/Bridge/OG/Drupal.php
+++ b/civicrm/CRM/Bridge/OG/Drupal.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Bridge/OG/Utils.php b/civicrm/CRM/Bridge/OG/Utils.php
index 123efc15cb..a9f0819650 100644
--- a/civicrm/CRM/Bridge/OG/Utils.php
+++ b/civicrm/CRM/Bridge/OG/Utils.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Bridge_OG_Utils {
const aclEnabled = 1, syncFromCiviCRM = 1;
diff --git a/civicrm/CRM/Campaign/BAO/Campaign.php b/civicrm/CRM/Campaign/BAO/Campaign.php
index dd793c9b50..5453c5d560 100644
--- a/civicrm/CRM/Campaign/BAO/Campaign.php
+++ b/civicrm/CRM/Campaign/BAO/Campaign.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Campaign_BAO_Campaign extends CRM_Campaign_DAO_Campaign {
diff --git a/civicrm/CRM/Campaign/BAO/Petition.php b/civicrm/CRM/Campaign/BAO/Petition.php
index d5e4c0a2ec..e2529fa093 100644
--- a/civicrm/CRM/Campaign/BAO/Petition.php
+++ b/civicrm/CRM/Campaign/BAO/Petition.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Campaign_BAO_Petition extends CRM_Campaign_BAO_Survey {
/**
diff --git a/civicrm/CRM/Campaign/BAO/Query.php b/civicrm/CRM/Campaign/BAO/Query.php
index 523ebb69e2..a47ed1fc85 100644
--- a/civicrm/CRM/Campaign/BAO/Query.php
+++ b/civicrm/CRM/Campaign/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Campaign_BAO_Query {
//since normal activity clause clause get collides.
diff --git a/civicrm/CRM/Campaign/BAO/Survey.php b/civicrm/CRM/Campaign/BAO/Survey.php
index f68a4d9eb1..97be80f889 100644
--- a/civicrm/CRM/Campaign/BAO/Survey.php
+++ b/civicrm/CRM/Campaign/BAO/Survey.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Controller/Search.php b/civicrm/CRM/Campaign/Controller/Search.php
index a12cd942c0..12ff9b1c47 100644
--- a/civicrm/CRM/Campaign/Controller/Search.php
+++ b/civicrm/CRM/Campaign/Controller/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/DAO/Campaign.php b/civicrm/CRM/Campaign/DAO/Campaign.php
index 58bee6bb68..6896e3b1b0 100644
--- a/civicrm/CRM/Campaign/DAO/Campaign.php
+++ b/civicrm/CRM/Campaign/DAO/Campaign.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Campaign/Campaign.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Campaign/DAO/CampaignGroup.php b/civicrm/CRM/Campaign/DAO/CampaignGroup.php
index 29417c0d38..7be14e385d 100644
--- a/civicrm/CRM/Campaign/DAO/CampaignGroup.php
+++ b/civicrm/CRM/Campaign/DAO/CampaignGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Campaign/CampaignGroup.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Campaign/DAO/Survey.php b/civicrm/CRM/Campaign/DAO/Survey.php
index 2a29a272e3..2ee5b930fb 100644
--- a/civicrm/CRM/Campaign/DAO/Survey.php
+++ b/civicrm/CRM/Campaign/DAO/Survey.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Campaign/Survey.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Campaign/Form/Campaign.php b/civicrm/CRM/Campaign/Form/Campaign.php
index 5511f1985e..5017bdbb50 100644
--- a/civicrm/CRM/Campaign/Form/Campaign.php
+++ b/civicrm/CRM/Campaign/Form/Campaign.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Gotv.php b/civicrm/CRM/Campaign/Form/Gotv.php
index f6c4c93656..e6b4c8874b 100644
--- a/civicrm/CRM/Campaign/Form/Gotv.php
+++ b/civicrm/CRM/Campaign/Form/Gotv.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Petition.php b/civicrm/CRM/Campaign/Form/Petition.php
index 44fbbe2f31..ddb82cbec9 100644
--- a/civicrm/CRM/Campaign/Form/Petition.php
+++ b/civicrm/CRM/Campaign/Form/Petition.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Petition/Signature.php b/civicrm/CRM/Campaign/Form/Petition/Signature.php
index 4347a92a7b..19b5b453a5 100644
--- a/civicrm/CRM/Campaign/Form/Petition/Signature.php
+++ b/civicrm/CRM/Campaign/Form/Petition/Signature.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Search.php b/civicrm/CRM/Campaign/Form/Search.php
index d223b29d26..8849404cff 100644
--- a/civicrm/CRM/Campaign/Form/Search.php
+++ b/civicrm/CRM/Campaign/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Search/Campaign.php b/civicrm/CRM/Campaign/Form/Search/Campaign.php
index 6e61d6a1bf..fb7a6cbb70 100644
--- a/civicrm/CRM/Campaign/Form/Search/Campaign.php
+++ b/civicrm/CRM/Campaign/Form/Search/Campaign.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Search/Petition.php b/civicrm/CRM/Campaign/Form/Search/Petition.php
index 4ca5509444..a73236344d 100644
--- a/civicrm/CRM/Campaign/Form/Search/Petition.php
+++ b/civicrm/CRM/Campaign/Form/Search/Petition.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Search/Survey.php b/civicrm/CRM/Campaign/Form/Search/Survey.php
index e1d1bfc045..b9d4750838 100644
--- a/civicrm/CRM/Campaign/Form/Search/Survey.php
+++ b/civicrm/CRM/Campaign/Form/Search/Survey.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Survey.php b/civicrm/CRM/Campaign/Form/Survey.php
index 2f7f2894e4..d13ca39a91 100644
--- a/civicrm/CRM/Campaign/Form/Survey.php
+++ b/civicrm/CRM/Campaign/Form/Survey.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Survey/Delete.php b/civicrm/CRM/Campaign/Form/Survey/Delete.php
index ac3db7c2c2..42188eaf0c 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Delete.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Survey/Main.php b/civicrm/CRM/Campaign/Form/Survey/Main.php
index 323664c8fa..42b719306a 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Main.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Main.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Survey/Questions.php b/civicrm/CRM/Campaign/Form/Survey/Questions.php
index d0869b3247..a728877cf5 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Questions.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Questions.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Survey/Results.php b/civicrm/CRM/Campaign/Form/Survey/Results.php
index 728fcf2ecc..3021fe16e9 100644
--- a/civicrm/CRM/Campaign/Form/Survey/Results.php
+++ b/civicrm/CRM/Campaign/Form/Survey/Results.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Survey/TabHeader.php b/civicrm/CRM/Campaign/Form/Survey/TabHeader.php
index 2e1bc7b3cc..06434dabb6 100644
--- a/civicrm/CRM/Campaign/Form/Survey/TabHeader.php
+++ b/civicrm/CRM/Campaign/Form/Survey/TabHeader.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/SurveyType.php b/civicrm/CRM/Campaign/Form/SurveyType.php
index a2dc62db54..ffaf7de83f 100644
--- a/civicrm/CRM/Campaign/Form/SurveyType.php
+++ b/civicrm/CRM/Campaign/Form/SurveyType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Task.php b/civicrm/CRM/Campaign/Form/Task.php
index bb5752067f..9a351d8880 100644
--- a/civicrm/CRM/Campaign/Form/Task.php
+++ b/civicrm/CRM/Campaign/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Task/Interview.php b/civicrm/CRM/Campaign/Form/Task/Interview.php
index 4247adb697..c81abf33c9 100644
--- a/civicrm/CRM/Campaign/Form/Task/Interview.php
+++ b/civicrm/CRM/Campaign/Form/Task/Interview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Task/Print.php b/civicrm/CRM/Campaign/Form/Task/Print.php
index 4ede318e25..1369266669 100644
--- a/civicrm/CRM/Campaign/Form/Task/Print.php
+++ b/civicrm/CRM/Campaign/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Task/Release.php b/civicrm/CRM/Campaign/Form/Task/Release.php
index 59abf6d3e2..b0e62995f8 100644
--- a/civicrm/CRM/Campaign/Form/Task/Release.php
+++ b/civicrm/CRM/Campaign/Form/Task/Release.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Task/Reserve.php b/civicrm/CRM/Campaign/Form/Task/Reserve.php
index 14b0e9d735..c6c2e76b02 100644
--- a/civicrm/CRM/Campaign/Form/Task/Reserve.php
+++ b/civicrm/CRM/Campaign/Form/Task/Reserve.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Form/Task/Result.php b/civicrm/CRM/Campaign/Form/Task/Result.php
index fcbebf5b47..0a76920026 100644
--- a/civicrm/CRM/Campaign/Form/Task/Result.php
+++ b/civicrm/CRM/Campaign/Form/Task/Result.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Info.php b/civicrm/CRM/Campaign/Info.php
index 8f3c74f0eb..b9a7c00f32 100644
--- a/civicrm/CRM/Campaign/Info.php
+++ b/civicrm/CRM/Campaign/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* abstract class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Campaign_Info extends CRM_Core_Component_Info {
diff --git a/civicrm/CRM/Campaign/Page/AJAX.php b/civicrm/CRM/Campaign/Page/AJAX.php
index f9dc85cd5b..3de8c6055c 100644
--- a/civicrm/CRM/Campaign/Page/AJAX.php
+++ b/civicrm/CRM/Campaign/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
*/
diff --git a/civicrm/CRM/Campaign/Page/DashBoard.php b/civicrm/CRM/Campaign/Page/DashBoard.php
index d455035c11..50580f4cff 100644
--- a/civicrm/CRM/Campaign/Page/DashBoard.php
+++ b/civicrm/CRM/Campaign/Page/DashBoard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Page/Petition.php b/civicrm/CRM/Campaign/Page/Petition.php
index 55d316c8cd..c78e656da6 100644
--- a/civicrm/CRM/Campaign/Page/Petition.php
+++ b/civicrm/CRM/Campaign/Page/Petition.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Page/Petition/Confirm.php b/civicrm/CRM/Campaign/Page/Petition/Confirm.php
index cf5e020936..1d0fc70ccd 100644
--- a/civicrm/CRM/Campaign/Page/Petition/Confirm.php
+++ b/civicrm/CRM/Campaign/Page/Petition/Confirm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Campaign_Page_Petition_Confirm extends CRM_Core_Page {
/**
diff --git a/civicrm/CRM/Campaign/Page/Petition/ThankYou.php b/civicrm/CRM/Campaign/Page/Petition/ThankYou.php
index 6c27ba2bc0..30a3f8c6bc 100644
--- a/civicrm/CRM/Campaign/Page/Petition/ThankYou.php
+++ b/civicrm/CRM/Campaign/Page/Petition/ThankYou.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Campaign_Page_Petition_ThankYou extends CRM_Core_Page {
/**
diff --git a/civicrm/CRM/Campaign/Page/SurveyType.php b/civicrm/CRM/Campaign/Page/SurveyType.php
index 817dc2d6cb..babf2893f7 100644
--- a/civicrm/CRM/Campaign/Page/SurveyType.php
+++ b/civicrm/CRM/Campaign/Page/SurveyType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Page/Vote.php b/civicrm/CRM/Campaign/Page/Vote.php
index 5c9ea35959..983a92c28e 100644
--- a/civicrm/CRM/Campaign/Page/Vote.php
+++ b/civicrm/CRM/Campaign/Page/Vote.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/PseudoConstant.php b/civicrm/CRM/Campaign/PseudoConstant.php
index 31b20f7dc0..a71ba31db0 100644
--- a/civicrm/CRM/Campaign/PseudoConstant.php
+++ b/civicrm/CRM/Campaign/PseudoConstant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/Selector/Search.php b/civicrm/CRM/Campaign/Selector/Search.php
index 888ebd96e8..1554344314 100644
--- a/civicrm/CRM/Campaign/Selector/Search.php
+++ b/civicrm/CRM/Campaign/Selector/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Campaign/StateMachine/Search.php b/civicrm/CRM/Campaign/StateMachine/Search.php
index a544c9ade1..68352f244d 100644
--- a/civicrm/CRM/Campaign/StateMachine/Search.php
+++ b/civicrm/CRM/Campaign/StateMachine/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Campaign_StateMachine_Search extends CRM_Core_StateMachine {
diff --git a/civicrm/CRM/Campaign/Task.php b/civicrm/CRM/Campaign/Task.php
index 914c2df17f..a6c1c64eb3 100644
--- a/civicrm/CRM/Campaign/Task.php
+++ b/civicrm/CRM/Campaign/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/BAO/Case.php b/civicrm/CRM/Case/BAO/Case.php
index 44b2557c75..9826eca3cf 100644
--- a/civicrm/CRM/Case/BAO/Case.php
+++ b/civicrm/CRM/Case/BAO/Case.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/BAO/CaseContact.php b/civicrm/CRM/Case/BAO/CaseContact.php
index 38beb7c8b4..cef1700a79 100644
--- a/civicrm/CRM/Case/BAO/CaseContact.php
+++ b/civicrm/CRM/Case/BAO/CaseContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/BAO/CaseType.php b/civicrm/CRM/Case/BAO/CaseType.php
index 889a9c1a65..65feb33fd4 100644
--- a/civicrm/CRM/Case/BAO/CaseType.php
+++ b/civicrm/CRM/Case/BAO/CaseType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/BAO/Query.php b/civicrm/CRM/Case/BAO/Query.php
index f55b737d8e..4a27d40c03 100644
--- a/civicrm/CRM/Case/BAO/Query.php
+++ b/civicrm/CRM/Case/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Case_BAO_Query {
diff --git a/civicrm/CRM/Case/Controller/Search.php b/civicrm/CRM/Case/Controller/Search.php
index c997926d42..74811c4cab 100644
--- a/civicrm/CRM/Case/Controller/Search.php
+++ b/civicrm/CRM/Case/Controller/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/DAO/Case.php b/civicrm/CRM/Case/DAO/Case.php
index bc691b0b12..eccb0b7109 100644
--- a/civicrm/CRM/Case/DAO/Case.php
+++ b/civicrm/CRM/Case/DAO/Case.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Case/Case.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Case/DAO/CaseActivity.php b/civicrm/CRM/Case/DAO/CaseActivity.php
index abeb99264e..28ef53a4aa 100644
--- a/civicrm/CRM/Case/DAO/CaseActivity.php
+++ b/civicrm/CRM/Case/DAO/CaseActivity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Case/CaseActivity.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Case/DAO/CaseContact.php b/civicrm/CRM/Case/DAO/CaseContact.php
index 6ce55a1783..cd9c5315d9 100644
--- a/civicrm/CRM/Case/DAO/CaseContact.php
+++ b/civicrm/CRM/Case/DAO/CaseContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Case/CaseContact.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Case/DAO/CaseType.php b/civicrm/CRM/Case/DAO/CaseType.php
index e58d614b48..6abb156497 100644
--- a/civicrm/CRM/Case/DAO/CaseType.php
+++ b/civicrm/CRM/Case/DAO/CaseType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Case/CaseType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Case/Form/Activity.php b/civicrm/CRM/Case/Form/Activity.php
index e58471ae02..4aef5c0270 100644
--- a/civicrm/CRM/Case/Form/Activity.php
+++ b/civicrm/CRM/Case/Form/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -415,7 +415,7 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
if ($this->_activityId) {
// retrieve and include the custom data of old Activity
$oldActivity = civicrm_api3('Activity', 'getsingle', array('id' => $this->_activityId));
- $params = array_merge($params, $oldActivity);
+ $params = array_merge($oldActivity, $params);
// unset custom fields-id from params since we want custom
// fields to be saved for new activity.
diff --git a/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php b/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php
index 07889baffb..1e0ea9e306 100644
--- a/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php
+++ b/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php b/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
index fe0a699e11..7e6f56d1b3 100644
--- a/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
+++ b/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Activity/ChangeCaseType.php b/civicrm/CRM/Case/Form/Activity/ChangeCaseType.php
index 2ad60558dd..d1c99102f2 100644
--- a/civicrm/CRM/Case/Form/Activity/ChangeCaseType.php
+++ b/civicrm/CRM/Case/Form/Activity/ChangeCaseType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Activity/LinkCases.php b/civicrm/CRM/Case/Form/Activity/LinkCases.php
index 805f3e64ae..43f8cee596 100644
--- a/civicrm/CRM/Case/Form/Activity/LinkCases.php
+++ b/civicrm/CRM/Case/Form/Activity/LinkCases.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Activity/OpenCase.php b/civicrm/CRM/Case/Form/Activity/OpenCase.php
index b6e32b03ca..91aff34516 100644
--- a/civicrm/CRM/Case/Form/Activity/OpenCase.php
+++ b/civicrm/CRM/Case/Form/Activity/OpenCase.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/ActivityToCase.php b/civicrm/CRM/Case/Form/ActivityToCase.php
index 3a981f898a..fb08fbb560 100644
--- a/civicrm/CRM/Case/Form/ActivityToCase.php
+++ b/civicrm/CRM/Case/Form/ActivityToCase.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/ActivityView.php b/civicrm/CRM/Case/Form/ActivityView.php
index c8aff71e14..3aaa8dbb8c 100644
--- a/civicrm/CRM/Case/Form/ActivityView.php
+++ b/civicrm/CRM/Case/Form/ActivityView.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Case.php b/civicrm/CRM/Case/Form/Case.php
index cb886e3028..76c61baaf5 100644
--- a/civicrm/CRM/Case/Form/Case.php
+++ b/civicrm/CRM/Case/Form/Case.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/CaseView.php b/civicrm/CRM/Case/Form/CaseView.php
index 513b588103..a597724c53 100644
--- a/civicrm/CRM/Case/Form/CaseView.php
+++ b/civicrm/CRM/Case/Form/CaseView.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/CustomData.php b/civicrm/CRM/Case/Form/CustomData.php
index 81f95b0af6..b5c633e163 100644
--- a/civicrm/CRM/Case/Form/CustomData.php
+++ b/civicrm/CRM/Case/Form/CustomData.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/EditClient.php b/civicrm/CRM/Case/Form/EditClient.php
index 650d3d6b3c..8fd5b67e56 100644
--- a/civicrm/CRM/Case/Form/EditClient.php
+++ b/civicrm/CRM/Case/Form/EditClient.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Report.php b/civicrm/CRM/Case/Form/Report.php
index 7bfe64f2f1..f2b65efc8f 100644
--- a/civicrm/CRM/Case/Form/Report.php
+++ b/civicrm/CRM/Case/Form/Report.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Search.php b/civicrm/CRM/Case/Form/Search.php
index 1fdc9a265e..cf2199f319 100644
--- a/civicrm/CRM/Case/Form/Search.php
+++ b/civicrm/CRM/Case/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Task.php b/civicrm/CRM/Case/Form/Task.php
index 71570e5838..6deaed3f38 100644
--- a/civicrm/CRM/Case/Form/Task.php
+++ b/civicrm/CRM/Case/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Task/Delete.php b/civicrm/CRM/Case/Form/Task/Delete.php
index 7e9e2473ef..dcc325b45d 100644
--- a/civicrm/CRM/Case/Form/Task/Delete.php
+++ b/civicrm/CRM/Case/Form/Task/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Task/Print.php b/civicrm/CRM/Case/Form/Task/Print.php
index 1477e5ffd6..2b7250d029 100644
--- a/civicrm/CRM/Case/Form/Task/Print.php
+++ b/civicrm/CRM/Case/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Task/Restore.php b/civicrm/CRM/Case/Form/Task/Restore.php
index ec3e5a632e..384cfd7fa6 100644
--- a/civicrm/CRM/Case/Form/Task/Restore.php
+++ b/civicrm/CRM/Case/Form/Task/Restore.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Task/Result.php b/civicrm/CRM/Case/Form/Task/Result.php
index fdc52f5cd8..a32a4112be 100644
--- a/civicrm/CRM/Case/Form/Task/Result.php
+++ b/civicrm/CRM/Case/Form/Task/Result.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Case/Form/Task/SearchTaskHookSample.php
index 78a42f4e20..345a10b5b6 100644
--- a/civicrm/CRM/Case/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Case/Form/Task/SearchTaskHookSample.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Info.php b/civicrm/CRM/Case/Info.php
index 89669c2cb6..f361cfb6b0 100644
--- a/civicrm/CRM/Case/Info.php
+++ b/civicrm/CRM/Case/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* abstract class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Case_Info extends CRM_Core_Component_Info {
diff --git a/civicrm/CRM/Case/Page/AJAX.php b/civicrm/CRM/Case/Page/AJAX.php
index 23f286f9e5..8c7d125281 100644
--- a/civicrm/CRM/Case/Page/AJAX.php
+++ b/civicrm/CRM/Case/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
*/
diff --git a/civicrm/CRM/Case/Page/CaseDetails.php b/civicrm/CRM/Case/Page/CaseDetails.php
index 51bf4a1da8..ea2e349f68 100644
--- a/civicrm/CRM/Case/Page/CaseDetails.php
+++ b/civicrm/CRM/Case/Page/CaseDetails.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Case_Page_CaseDetails extends CRM_Core_Page {
diff --git a/civicrm/CRM/Case/Page/DashBoard.php b/civicrm/CRM/Case/Page/DashBoard.php
index b22da4aba7..2ea0811ad2 100644
--- a/civicrm/CRM/Case/Page/DashBoard.php
+++ b/civicrm/CRM/Case/Page/DashBoard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Page/Tab.php b/civicrm/CRM/Case/Page/Tab.php
index 347796e085..9ad7e348a9 100644
--- a/civicrm/CRM/Case/Page/Tab.php
+++ b/civicrm/CRM/Case/Page/Tab.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/PseudoConstant.php b/civicrm/CRM/Case/PseudoConstant.php
index d40fa669dd..c80425acfa 100644
--- a/civicrm/CRM/Case/PseudoConstant.php
+++ b/civicrm/CRM/Case/PseudoConstant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/Selector/Search.php b/civicrm/CRM/Case/Selector/Search.php
index 283b36d827..b47f2b1483 100644
--- a/civicrm/CRM/Case/Selector/Search.php
+++ b/civicrm/CRM/Case/Selector/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/StateMachine/Search.php b/civicrm/CRM/Case/StateMachine/Search.php
index 9fda0907b3..82b43ef781 100644
--- a/civicrm/CRM/Case/StateMachine/Search.php
+++ b/civicrm/CRM/Case/StateMachine/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Case_StateMachine_Search extends CRM_Core_StateMachine {
diff --git a/civicrm/CRM/Case/Task.php b/civicrm/CRM/Case/Task.php
index ec47b90661..789b4fd2be 100644
--- a/civicrm/CRM/Case/Task.php
+++ b/civicrm/CRM/Case/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Case/XMLProcessor.php b/civicrm/CRM/Case/XMLProcessor.php
index ab60bf19ba..286a64c570 100644
--- a/civicrm/CRM/Case/XMLProcessor.php
+++ b/civicrm/CRM/Case/XMLProcessor.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Case_XMLProcessor {
diff --git a/civicrm/CRM/Case/XMLProcessor/Process.php b/civicrm/CRM/Case/XMLProcessor/Process.php
index a920f9b808..9abc42bf05 100644
--- a/civicrm/CRM/Case/XMLProcessor/Process.php
+++ b/civicrm/CRM/Case/XMLProcessor/Process.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Case_XMLProcessor_Process extends CRM_Case_XMLProcessor {
/**
diff --git a/civicrm/CRM/Case/XMLProcessor/Report.php b/civicrm/CRM/Case/XMLProcessor/Report.php
index 3d4156d697..94d735d299 100644
--- a/civicrm/CRM/Case/XMLProcessor/Report.php
+++ b/civicrm/CRM/Case/XMLProcessor/Report.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Case_XMLProcessor_Report extends CRM_Case_XMLProcessor {
diff --git a/civicrm/CRM/Case/XMLProcessor/Settings.php b/civicrm/CRM/Case/XMLProcessor/Settings.php
index a9ea2d5a6f..368e4e32b1 100644
--- a/civicrm/CRM/Case/XMLProcessor/Settings.php
+++ b/civicrm/CRM/Case/XMLProcessor/Settings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Case_XMLProcessor_Settings extends CRM_Case_XMLProcessor {
diff --git a/civicrm/CRM/Case/XMLRepository.php b/civicrm/CRM/Case/XMLRepository.php
index 7e3af8c479..6a06b58613 100644
--- a/civicrm/CRM/Case/XMLRepository.php
+++ b/civicrm/CRM/Case/XMLRepository.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* The XMLRepository is responsible for loading XML for case-types.
* It includes any bulk operations that apply across the list of all XML
diff --git a/civicrm/CRM/Contact/ActionMapping.php b/civicrm/CRM/Contact/ActionMapping.php
index 3ba1fda819..69a7dd3ca1 100644
--- a/civicrm/CRM/Contact/ActionMapping.php
+++ b/civicrm/CRM/Contact/ActionMapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contact/BAO/Contact.php b/civicrm/CRM/Contact/BAO/Contact.php
index d8b00f9a44..309d552023 100644
--- a/civicrm/CRM/Contact/BAO/Contact.php
+++ b/civicrm/CRM/Contact/BAO/Contact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_Contact extends CRM_Contact_DAO_Contact {
diff --git a/civicrm/CRM/Contact/BAO/Contact/Location.php b/civicrm/CRM/Contact/BAO/Contact/Location.php
index df696802eb..44d36c87c9 100644
--- a/civicrm/CRM/Contact/BAO/Contact/Location.php
+++ b/civicrm/CRM/Contact/BAO/Contact/Location.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_Contact_Location {
diff --git a/civicrm/CRM/Contact/BAO/Contact/Optimizer.php b/civicrm/CRM/Contact/BAO/Contact/Optimizer.php
index 7b29de360d..bce6a44d14 100644
--- a/civicrm/CRM/Contact/BAO/Contact/Optimizer.php
+++ b/civicrm/CRM/Contact/BAO/Contact/Optimizer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_Contact_Optimizer {
/**
diff --git a/civicrm/CRM/Contact/BAO/Contact/Permission.php b/civicrm/CRM/Contact/BAO/Contact/Permission.php
index 91935931b4..17e74f87f5 100644
--- a/civicrm/CRM/Contact/BAO/Contact/Permission.php
+++ b/civicrm/CRM/Contact/BAO/Contact/Permission.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_Contact_Permission {
diff --git a/civicrm/CRM/Contact/BAO/Contact/Utils.php b/civicrm/CRM/Contact/BAO/Contact/Utils.php
index 17fd4e1b47..5324795647 100644
--- a/civicrm/CRM/Contact/BAO/Contact/Utils.php
+++ b/civicrm/CRM/Contact/BAO/Contact/Utils.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_Contact_Utils {
diff --git a/civicrm/CRM/Contact/BAO/ContactType.php b/civicrm/CRM/Contact/BAO/ContactType.php
index 90f470cfff..48711b11e0 100644
--- a/civicrm/CRM/Contact/BAO/ContactType.php
+++ b/civicrm/CRM/Contact/BAO/ContactType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_ContactType extends CRM_Contact_DAO_ContactType {
diff --git a/civicrm/CRM/Contact/BAO/DashboardContact.php b/civicrm/CRM/Contact/BAO/DashboardContact.php
index c3b034c80e..15146a1e09 100644
--- a/civicrm/CRM/Contact/BAO/DashboardContact.php
+++ b/civicrm/CRM/Contact/BAO/DashboardContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_DashboardContact extends CRM_Contact_DAO_DashboardContact {
}
diff --git a/civicrm/CRM/Contact/BAO/Group.php b/civicrm/CRM/Contact/BAO/Group.php
index afa89e2b6e..3a198b0a03 100644
--- a/civicrm/CRM/Contact/BAO/Group.php
+++ b/civicrm/CRM/Contact/BAO/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
@@ -750,7 +750,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
$value['class'] = array_diff($value['class'], array('crm-row-parent'));
}
$group['DT_RowId'] = 'row_' . $value['id'];
- if (!$params['parentsOnly']) {
+ if (!empty($params['parentsOnly'])) {
foreach ($value['class'] as $id => $class) {
if ($class == 'crm-group-parent') {
unset($value['class'][$id]);
@@ -801,7 +801,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
$config = CRM_Core_Config::singleton();
$whereClause = self::whereClause($params, FALSE);
-
//$this->pagerAToZ( $whereClause, $params );
if (!empty($params['rowCount']) &&
diff --git a/civicrm/CRM/Contact/BAO/GroupContact.php b/civicrm/CRM/Contact/BAO/GroupContact.php
index 57a258bbdd..fabed592d1 100644
--- a/civicrm/CRM/Contact/BAO/GroupContact.php
+++ b/civicrm/CRM/Contact/BAO/GroupContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact {
diff --git a/civicrm/CRM/Contact/BAO/GroupContactCache.php b/civicrm/CRM/Contact/BAO/GroupContactCache.php
index 690a200e69..2f39a469b0 100644
--- a/civicrm/CRM/Contact/BAO/GroupContactCache.php
+++ b/civicrm/CRM/Contact/BAO/GroupContactCache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_GroupContactCache extends CRM_Contact_DAO_GroupContactCache {
diff --git a/civicrm/CRM/Contact/BAO/GroupNestingCache.php b/civicrm/CRM/Contact/BAO/GroupNestingCache.php
index 632277794e..4e0351e3d9 100644
--- a/civicrm/CRM/Contact/BAO/GroupNestingCache.php
+++ b/civicrm/CRM/Contact/BAO/GroupNestingCache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_GroupNestingCache {
diff --git a/civicrm/CRM/Contact/BAO/GroupOrganization.php b/civicrm/CRM/Contact/BAO/GroupOrganization.php
index 89ad08170c..a22f778103 100644
--- a/civicrm/CRM/Contact/BAO/GroupOrganization.php
+++ b/civicrm/CRM/Contact/BAO/GroupOrganization.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_GroupOrganization extends CRM_Contact_DAO_GroupOrganization {
diff --git a/civicrm/CRM/Contact/BAO/Household.php b/civicrm/CRM/Contact/BAO/Household.php
index e37ec0f009..3246b84d7a 100644
--- a/civicrm/CRM/Contact/BAO/Household.php
+++ b/civicrm/CRM/Contact/BAO/Household.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_Household extends CRM_Contact_DAO_Contact {
diff --git a/civicrm/CRM/Contact/BAO/Individual.php b/civicrm/CRM/Contact/BAO/Individual.php
index d5346628e5..557b1c563e 100644
--- a/civicrm/CRM/Contact/BAO/Individual.php
+++ b/civicrm/CRM/Contact/BAO/Individual.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/BAO/ProximityQuery.php b/civicrm/CRM/Contact/BAO/ProximityQuery.php
index 46ce6ff90d..9f0a1d920f 100644
--- a/civicrm/CRM/Contact/BAO/ProximityQuery.php
+++ b/civicrm/CRM/Contact/BAO/ProximityQuery.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_ProximityQuery {
diff --git a/civicrm/CRM/Contact/BAO/Query.php b/civicrm/CRM/Contact/BAO/Query.php
index f0ff34aeb6..8b414c3b73 100644
--- a/civicrm/CRM/Contact/BAO/Query.php
+++ b/civicrm/CRM/Contact/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -2064,11 +2064,17 @@ class CRM_Contact_BAO_Query {
$strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower';
$locationType = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
+ if (isset($locType[1]) && is_numeric($locType[1])) {
+ $lType = $locationType[$locType[1]];
+ }
+ if ($lType) {
+ $field['title'] .= " ($lType)";
+ }
if (substr($name, 0, 14) === 'state_province') {
if (isset($locType[1]) && is_numeric($locType[1])) {
$setTables = FALSE;
- $aName = "{$locationType[$locType[1]]}-address";
+ $aName = "{$lType}-address";
$where = "`$aName`.state_province_id";
}
else {
@@ -2077,7 +2083,7 @@ class CRM_Contact_BAO_Query {
$this->_where[$grouping][] = self::buildClause($where, $op, $value);
list($qillop, $qillVal) = self::buildQillForFieldValue('CRM_Core_DAO_Address', "state_province_id", $value, $op);
- $this->_qill[$grouping][] = ts("State %1 %2", array(1 => $qillop, 2 => $qillVal));
+ $this->_qill[$grouping][] = ts("%1 %2 %3", array(1 => $field['title'], 2 => $qillop, 3 => $qillVal));
}
elseif (!empty($field['pseudoconstant'])) {
$this->optionValueQuery(
@@ -2096,7 +2102,7 @@ class CRM_Contact_BAO_Query {
$name = (substr($name, 0, 7) === 'country') ? "country_id" : "county_id";
if (isset($locType[1]) && is_numeric($locType[1])) {
$setTables = FALSE;
- $aName = "{$locationType[$locType[1]]}-address";
+ $aName = "{$lType}-address";
$where = "`$aName`.$name";
}
else {
@@ -2105,9 +2111,6 @@ class CRM_Contact_BAO_Query {
$this->_where[$grouping][] = self::buildClause($where, $op, $value, 'Positive');
- if ($lType) {
- $field['title'] .= " ($lType)";
- }
list($qillop, $qillVal) = CRM_Contact_BAO_Query::buildQillForFieldValue(NULL, $name, $value, $op);
$this->_qill[$grouping][] = ts("%1 %2 %3", array(1 => $field['title'], 2 => $qillop, 3 => $qillVal));
}
@@ -4607,18 +4610,21 @@ civicrm_relationship.is_permission_a_b = 0
switch ($field) {
case 'city':
case 'postal_code':
- $this->_whereTables["civicrm_address"] = 1;
+ $this->_tables["civicrm_address"] = $this->_whereTables["civicrm_address"] = 1;
$order = str_replace($field, "civicrm_address.{$field}", $order);
break;
case 'country':
case 'state_province':
- $this->_whereTables["civicrm_{$field}"] = 1;
+ $this->_tables["civicrm_{$field}"] = $this->_whereTables["civicrm_{$field}"] = 1;
+ if (is_array($this->_returnProperties) && empty($this->_returnProperties)) {
+ $additionalFromClause .= " LEFT JOIN civicrm_{$field} ON civicrm_{$field}.id = civicrm_address.{$field}_id";
+ }
$order = str_replace($field, "civicrm_{$field}.name", $order);
break;
case 'email':
- $this->_whereTables["civicrm_email"] = 1;
+ $this->_tables["civicrm_email"] = $this->_whereTables["civicrm_email"] = 1;
$order = str_replace($field, "civicrm_email.{$field}", $order);
break;
@@ -5884,9 +5890,6 @@ AND displayRelType.is_active = 1
elseif ($daoName == 'CRM_Contact_DAO_Group' && $fieldName == 'id') {
$pseudoOptions = CRM_Core_PseudoConstant::group();
}
- elseif ($fieldName == 'country_id') {
- $pseudoOptions = CRM_Core_PseudoConstant::country();
- }
elseif ($daoName) {
$pseudoOptions = CRM_Core_PseudoConstant::get($daoName, $fieldName, $pseudoExtraParam);
}
diff --git a/civicrm/CRM/Contact/BAO/Query/Hook.php b/civicrm/CRM/Contact/BAO/Query/Hook.php
index f40a79b6f6..3cb31b1c39 100644
--- a/civicrm/CRM/Contact/BAO/Query/Hook.php
+++ b/civicrm/CRM/Contact/BAO/Query/Hook.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/BAO/Query/Interface.php b/civicrm/CRM/Contact/BAO/Query/Interface.php
index f3c9c41fdb..293645aa8e 100644
--- a/civicrm/CRM/Contact/BAO/Query/Interface.php
+++ b/civicrm/CRM/Contact/BAO/Query/Interface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/BAO/Relationship.php b/civicrm/CRM/Contact/BAO/Relationship.php
index 8f4c19f378..8183748483 100644
--- a/civicrm/CRM/Contact/BAO/Relationship.php
+++ b/civicrm/CRM/Contact/BAO/Relationship.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contact/BAO/RelationshipType.php b/civicrm/CRM/Contact/BAO/RelationshipType.php
index f7e49f6bec..0e3cc3bf89 100644
--- a/civicrm/CRM/Contact/BAO/RelationshipType.php
+++ b/civicrm/CRM/Contact/BAO/RelationshipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType {
diff --git a/civicrm/CRM/Contact/BAO/SavedSearch.php b/civicrm/CRM/Contact/BAO/SavedSearch.php
index 65a86f9809..87158cdb51 100644
--- a/civicrm/CRM/Contact/BAO/SavedSearch.php
+++ b/civicrm/CRM/Contact/BAO/SavedSearch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/BAO/SearchCustom.php b/civicrm/CRM/Contact/BAO/SearchCustom.php
index 203a170d2b..263f648a09 100644
--- a/civicrm/CRM/Contact/BAO/SearchCustom.php
+++ b/civicrm/CRM/Contact/BAO/SearchCustom.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_BAO_SearchCustom {
diff --git a/civicrm/CRM/Contact/BAO/SubscriptionHistory.php b/civicrm/CRM/Contact/BAO/SubscriptionHistory.php
index 7ea942ffe4..3fbb10bf78 100644
--- a/civicrm/CRM/Contact/BAO/SubscriptionHistory.php
+++ b/civicrm/CRM/Contact/BAO/SubscriptionHistory.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Controller/Search.php b/civicrm/CRM/Contact/Controller/Search.php
index e066f45133..5192c8541a 100644
--- a/civicrm/CRM/Contact/Controller/Search.php
+++ b/civicrm/CRM/Contact/Controller/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/DAO/ACLContactCache.php b/civicrm/CRM/Contact/DAO/ACLContactCache.php
index 219297ba29..00ea58ca77 100644
--- a/civicrm/CRM/Contact/DAO/ACLContactCache.php
+++ b/civicrm/CRM/Contact/DAO/ACLContactCache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/ACLContactCache.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/Contact.php b/civicrm/CRM/Contact/DAO/Contact.php
index 4c277b7127..ca2241ac98 100644
--- a/civicrm/CRM/Contact/DAO/Contact.php
+++ b/civicrm/CRM/Contact/DAO/Contact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/Contact.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/ContactType.php b/civicrm/CRM/Contact/DAO/ContactType.php
index 44cb431666..da64128c51 100644
--- a/civicrm/CRM/Contact/DAO/ContactType.php
+++ b/civicrm/CRM/Contact/DAO/ContactType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/ContactType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/DashboardContact.php b/civicrm/CRM/Contact/DAO/DashboardContact.php
index 0bfc773930..75c9d4b342 100644
--- a/civicrm/CRM/Contact/DAO/DashboardContact.php
+++ b/civicrm/CRM/Contact/DAO/DashboardContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/DashboardContact.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/Group.php b/civicrm/CRM/Contact/DAO/Group.php
index e0695ca9b3..6048e5257e 100644
--- a/civicrm/CRM/Contact/DAO/Group.php
+++ b/civicrm/CRM/Contact/DAO/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/Group.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/GroupContact.php b/civicrm/CRM/Contact/DAO/GroupContact.php
index 3f5c26f639..d85de2ab5a 100644
--- a/civicrm/CRM/Contact/DAO/GroupContact.php
+++ b/civicrm/CRM/Contact/DAO/GroupContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/GroupContact.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/GroupContactCache.php b/civicrm/CRM/Contact/DAO/GroupContactCache.php
index 1e654c258a..0a0c121deb 100644
--- a/civicrm/CRM/Contact/DAO/GroupContactCache.php
+++ b/civicrm/CRM/Contact/DAO/GroupContactCache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/GroupContactCache.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/GroupNesting.php b/civicrm/CRM/Contact/DAO/GroupNesting.php
index bf70a4b433..08397565b5 100644
--- a/civicrm/CRM/Contact/DAO/GroupNesting.php
+++ b/civicrm/CRM/Contact/DAO/GroupNesting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/GroupNesting.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/GroupOrganization.php b/civicrm/CRM/Contact/DAO/GroupOrganization.php
index 1c7bca8af0..7a9c07208f 100644
--- a/civicrm/CRM/Contact/DAO/GroupOrganization.php
+++ b/civicrm/CRM/Contact/DAO/GroupOrganization.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/GroupOrganization.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/Relationship.php b/civicrm/CRM/Contact/DAO/Relationship.php
index a0c25186cd..b339d102e9 100644
--- a/civicrm/CRM/Contact/DAO/Relationship.php
+++ b/civicrm/CRM/Contact/DAO/Relationship.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/Relationship.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/RelationshipType.php b/civicrm/CRM/Contact/DAO/RelationshipType.php
index b56c53e6b1..be776d00b8 100644
--- a/civicrm/CRM/Contact/DAO/RelationshipType.php
+++ b/civicrm/CRM/Contact/DAO/RelationshipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/RelationshipType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/SavedSearch.php b/civicrm/CRM/Contact/DAO/SavedSearch.php
index b83e046c22..cebc9d2961 100644
--- a/civicrm/CRM/Contact/DAO/SavedSearch.php
+++ b/civicrm/CRM/Contact/DAO/SavedSearch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/SavedSearch.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/DAO/SubscriptionHistory.php b/civicrm/CRM/Contact/DAO/SubscriptionHistory.php
index 990122cda3..d7dcf7de21 100644
--- a/civicrm/CRM/Contact/DAO/SubscriptionHistory.php
+++ b/civicrm/CRM/Contact/DAO/SubscriptionHistory.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contact/SubscriptionHistory.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contact/Form/Contact.php b/civicrm/CRM/Contact/Form/Contact.php
index c1bab38f93..32780cd8da 100644
--- a/civicrm/CRM/Contact/Form/Contact.php
+++ b/civicrm/CRM/Contact/Form/Contact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/CustomData.php b/civicrm/CRM/Contact/Form/CustomData.php
index 04b6819906..b38d740313 100644
--- a/civicrm/CRM/Contact/Form/CustomData.php
+++ b/civicrm/CRM/Contact/Form/CustomData.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -155,8 +155,8 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
// when custom data is included in this page
if (!empty($_POST['hidden_custom'])) {
- for ($i = 0; $i <= $_POST['hidden_custom_group_count'][$this->_groupID]; $i++) {
- CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_contactSubType, $i, $this->_contactType, $this->_groupID);
+ for ($i = 1; $i <= $_POST['hidden_custom_group_count'][$this->_groupID]; $i++) {
+ CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_contactSubType, $i, $this->_contactType, $this->_tableID);
CRM_Custom_Form_CustomData::buildQuickForm($this);
CRM_Custom_Form_CustomData::setDefaultValues($this);
}
@@ -265,7 +265,7 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
$groupTree = &CRM_Core_BAO_CustomGroup::getTree($this->_contactType, $this, $this->_tableID,
$this->_groupID, $this->_contactSubType
);
- $customValueCount = CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, TRUE, $this->_groupID);
+ $customValueCount = CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, TRUE, $this->_groupID, NULL, NULL, $this->_tableID);
}
else {
$customValueCount = $_POST['hidden_custom_group_count'][$this->_groupID];
@@ -282,7 +282,8 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
*/
public function postProcess() {
// Get the form values and groupTree
- $params = CRM_Utils_Request::exportValues();
+ //CRM-18183
+ $params = $this->controller->exportValues($this->_name);
CRM_Core_BAO_CustomValueTable::postProcess($params,
'civicrm_contact',
diff --git a/civicrm/CRM/Contact/Form/DedupeFind.php b/civicrm/CRM/Contact/Form/DedupeFind.php
index 2a80263676..cf8bb23b8f 100644
--- a/civicrm/CRM/Contact/Form/DedupeFind.php
+++ b/civicrm/CRM/Contact/Form/DedupeFind.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/DedupeRules.php b/civicrm/CRM/Contact/Form/DedupeRules.php
index 30de265dd9..d3d36ccc8f 100644
--- a/civicrm/CRM/Contact/Form/DedupeRules.php
+++ b/civicrm/CRM/Contact/Form/DedupeRules.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Domain.php b/civicrm/CRM/Contact/Form/Domain.php
index c44dcfede8..a4064d2bb1 100644
--- a/civicrm/CRM/Contact/Form/Domain.php
+++ b/civicrm/CRM/Contact/Form/Domain.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/Address.php b/civicrm/CRM/Contact/Form/Edit/Address.php
index a32fc10471..aacbf14de0 100644
--- a/civicrm/CRM/Contact/Form/Edit/Address.php
+++ b/civicrm/CRM/Contact/Form/Edit/Address.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php b/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php
index 03ba749b80..5adefd8d6f 100644
--- a/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php
+++ b/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/CustomData.php b/civicrm/CRM/Contact/Form/Edit/CustomData.php
index 03005de06a..2a227e397b 100644
--- a/civicrm/CRM/Contact/Form/Edit/CustomData.php
+++ b/civicrm/CRM/Contact/Form/Edit/CustomData.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/Demographics.php b/civicrm/CRM/Contact/Form/Edit/Demographics.php
index 144ba4ea0f..c8a277eb75 100644
--- a/civicrm/CRM/Contact/Form/Edit/Demographics.php
+++ b/civicrm/CRM/Contact/Form/Edit/Demographics.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/Email.php b/civicrm/CRM/Contact/Form/Edit/Email.php
index 85dde87edd..813a9197bf 100644
--- a/civicrm/CRM/Contact/Form/Edit/Email.php
+++ b/civicrm/CRM/Contact/Form/Edit/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/Household.php b/civicrm/CRM/Contact/Form/Edit/Household.php
index 74e165228e..e58c3cf728 100644
--- a/civicrm/CRM/Contact/Form/Edit/Household.php
+++ b/civicrm/CRM/Contact/Form/Edit/Household.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/IM.php b/civicrm/CRM/Contact/Form/Edit/IM.php
index 56bf9585d1..d2cc369d05 100644
--- a/civicrm/CRM/Contact/Form/Edit/IM.php
+++ b/civicrm/CRM/Contact/Form/Edit/IM.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/Individual.php b/civicrm/CRM/Contact/Form/Edit/Individual.php
index 7fa39fe910..90ece4b9f6 100644
--- a/civicrm/CRM/Contact/Form/Edit/Individual.php
+++ b/civicrm/CRM/Contact/Form/Edit/Individual.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/Lock.php b/civicrm/CRM/Contact/Form/Edit/Lock.php
index 6ee89261e2..503e5a2a7b 100644
--- a/civicrm/CRM/Contact/Form/Edit/Lock.php
+++ b/civicrm/CRM/Contact/Form/Edit/Lock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/Notes.php b/civicrm/CRM/Contact/Form/Edit/Notes.php
index 409ed0dbea..14252bf58e 100644
--- a/civicrm/CRM/Contact/Form/Edit/Notes.php
+++ b/civicrm/CRM/Contact/Form/Edit/Notes.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Edit_Notes {
diff --git a/civicrm/CRM/Contact/Form/Edit/OpenID.php b/civicrm/CRM/Contact/Form/Edit/OpenID.php
index b73f38c85b..460e0019a0 100644
--- a/civicrm/CRM/Contact/Form/Edit/OpenID.php
+++ b/civicrm/CRM/Contact/Form/Edit/OpenID.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/Organization.php b/civicrm/CRM/Contact/Form/Edit/Organization.php
index 5c7bd3c973..4a877b5854 100644
--- a/civicrm/CRM/Contact/Form/Edit/Organization.php
+++ b/civicrm/CRM/Contact/Form/Edit/Organization.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/Phone.php b/civicrm/CRM/Contact/Form/Edit/Phone.php
index fc2c4cab31..fdaa2d1fcb 100644
--- a/civicrm/CRM/Contact/Form/Edit/Phone.php
+++ b/civicrm/CRM/Contact/Form/Edit/Phone.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Edit/TagsAndGroups.php b/civicrm/CRM/Contact/Form/Edit/TagsAndGroups.php
index a8d462468a..229fa469b2 100644
--- a/civicrm/CRM/Contact/Form/Edit/TagsAndGroups.php
+++ b/civicrm/CRM/Contact/Form/Edit/TagsAndGroups.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Edit_TagsAndGroups {
diff --git a/civicrm/CRM/Contact/Form/Edit/Website.php b/civicrm/CRM/Contact/Form/Edit/Website.php
index 576ca7d2c7..8c05f8b5b8 100644
--- a/civicrm/CRM/Contact/Form/Edit/Website.php
+++ b/civicrm/CRM/Contact/Form/Edit/Website.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/GroupContact.php b/civicrm/CRM/Contact/Form/GroupContact.php
index c883232042..d57ee65e24 100644
--- a/civicrm/CRM/Contact/Form/GroupContact.php
+++ b/civicrm/CRM/Contact/Form/GroupContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline.php b/civicrm/CRM/Contact/Form/Inline.php
index bc5add2d28..c7996c9f7f 100644
--- a/civicrm/CRM/Contact/Form/Inline.php
+++ b/civicrm/CRM/Contact/Form/Inline.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/Address.php b/civicrm/CRM/Contact/Form/Inline/Address.php
index 65ba413377..d7e3161d57 100644
--- a/civicrm/CRM/Contact/Form/Inline/Address.php
+++ b/civicrm/CRM/Contact/Form/Inline/Address.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php b/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php
index fe5bc1a13d..f9a6b60075 100644
--- a/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php
+++ b/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/ContactInfo.php b/civicrm/CRM/Contact/Form/Inline/ContactInfo.php
index 9ed6b74597..6b6b0739c3 100644
--- a/civicrm/CRM/Contact/Form/Inline/ContactInfo.php
+++ b/civicrm/CRM/Contact/Form/Inline/ContactInfo.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/ContactName.php b/civicrm/CRM/Contact/Form/Inline/ContactName.php
index 00b5c9bd75..c6af3fcfbc 100644
--- a/civicrm/CRM/Contact/Form/Inline/ContactName.php
+++ b/civicrm/CRM/Contact/Form/Inline/ContactName.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/CustomData.php b/civicrm/CRM/Contact/Form/Inline/CustomData.php
index 18e6dc1c7c..4570b75cc8 100644
--- a/civicrm/CRM/Contact/Form/Inline/CustomData.php
+++ b/civicrm/CRM/Contact/Form/Inline/CustomData.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/Demographics.php b/civicrm/CRM/Contact/Form/Inline/Demographics.php
index 9be0cc7166..06341d4e6c 100644
--- a/civicrm/CRM/Contact/Form/Inline/Demographics.php
+++ b/civicrm/CRM/Contact/Form/Inline/Demographics.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/Email.php b/civicrm/CRM/Contact/Form/Inline/Email.php
index deafc95416..6aa2a3a1e1 100644
--- a/civicrm/CRM/Contact/Form/Inline/Email.php
+++ b/civicrm/CRM/Contact/Form/Inline/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/IM.php b/civicrm/CRM/Contact/Form/Inline/IM.php
index 37b6842c66..3e546111ec 100644
--- a/civicrm/CRM/Contact/Form/Inline/IM.php
+++ b/civicrm/CRM/Contact/Form/Inline/IM.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/Lock.php b/civicrm/CRM/Contact/Form/Inline/Lock.php
index 1c367c3216..9be79b3284 100644
--- a/civicrm/CRM/Contact/Form/Inline/Lock.php
+++ b/civicrm/CRM/Contact/Form/Inline/Lock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/OpenID.php b/civicrm/CRM/Contact/Form/Inline/OpenID.php
index b0cb88ff59..616f7639d2 100644
--- a/civicrm/CRM/Contact/Form/Inline/OpenID.php
+++ b/civicrm/CRM/Contact/Form/Inline/OpenID.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/Phone.php b/civicrm/CRM/Contact/Form/Inline/Phone.php
index d3d87875d7..f45b2afdd2 100644
--- a/civicrm/CRM/Contact/Form/Inline/Phone.php
+++ b/civicrm/CRM/Contact/Form/Inline/Phone.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Inline/Website.php b/civicrm/CRM/Contact/Form/Inline/Website.php
index 3f34c369e2..db6f022a42 100644
--- a/civicrm/CRM/Contact/Form/Inline/Website.php
+++ b/civicrm/CRM/Contact/Form/Inline/Website.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Location.php b/civicrm/CRM/Contact/Form/Location.php
index 260d072ccb..e28876b3a2 100644
--- a/civicrm/CRM/Contact/Form/Location.php
+++ b/civicrm/CRM/Contact/Form/Location.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Location {
diff --git a/civicrm/CRM/Contact/Form/Merge.php b/civicrm/CRM/Contact/Form/Merge.php
index 270275ab0b..ba62395199 100644
--- a/civicrm/CRM/Contact/Form/Merge.php
+++ b/civicrm/CRM/Contact/Form/Merge.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/RelatedContact.php b/civicrm/CRM/Contact/Form/RelatedContact.php
index 0ecca9b304..74cd406445 100644
--- a/civicrm/CRM/Contact/Form/RelatedContact.php
+++ b/civicrm/CRM/Contact/Form/RelatedContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Relationship.php b/civicrm/CRM/Contact/Form/Relationship.php
index 4c92293f59..8f2a096f3b 100644
--- a/civicrm/CRM/Contact/Form/Relationship.php
+++ b/civicrm/CRM/Contact/Form/Relationship.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contact/Form/Search.php b/civicrm/CRM/Contact/Form/Search.php
index 6a0ee798a6..b5ee9cc481 100644
--- a/civicrm/CRM/Contact/Form/Search.php
+++ b/civicrm/CRM/Contact/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Search/Advanced.php b/civicrm/CRM/Contact/Form/Search/Advanced.php
index 7c059e41c8..8aa70546f3 100644
--- a/civicrm/CRM/Contact/Form/Search/Advanced.php
+++ b/civicrm/CRM/Contact/Form/Search/Advanced.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Search/Basic.php b/civicrm/CRM/Contact/Form/Search/Basic.php
index 1c0c5c464d..56ee6723e2 100644
--- a/civicrm/CRM/Contact/Form/Search/Basic.php
+++ b/civicrm/CRM/Contact/Form/Search/Basic.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Search/Builder.php b/civicrm/CRM/Contact/Form/Search/Builder.php
index 9f4995cf76..75d6eeb9f5 100644
--- a/civicrm/CRM/Contact/Form/Search/Builder.php
+++ b/civicrm/CRM/Contact/Form/Search/Builder.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Search/Criteria.php b/civicrm/CRM/Contact/Form/Search/Criteria.php
index 2bb9f0a919..ae31277548 100644
--- a/civicrm/CRM/Contact/Form/Search/Criteria.php
+++ b/civicrm/CRM/Contact/Form/Search/Criteria.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Criteria {
/**
diff --git a/civicrm/CRM/Contact/Form/Search/Custom.php b/civicrm/CRM/Contact/Form/Search/Custom.php
index a0fe82d91a..7d8dd678e4 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom extends CRM_Contact_Form_Search {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/ActivitySearch.php b/civicrm/CRM/Contact/Form/Search/Custom/ActivitySearch.php
index 340c76bb46..6b4da6304d 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/ActivitySearch.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/ActivitySearch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_ActivitySearch extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Base.php b/civicrm/CRM/Contact/Form/Search/Custom/Base.php
index 8f2a909663..f96b34bd38 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Base.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Base.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_Base {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Basic.php b/civicrm/CRM/Contact/Form/Search/Custom/Basic.php
index 1f83727cb9..6dc90fd7e1 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Basic.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Basic.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_Basic extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
@@ -44,7 +44,6 @@ class CRM_Contact_Form_Search_Custom_Basic extends CRM_Contact_Form_Search_Custo
public function __construct(&$formValues) {
parent::__construct($formValues);
- $this->normalize();
$this->_columns = array(
'' => 'contact_type',
ts('Name') => 'sort_name',
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/ContribSYBNT.php b/civicrm/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
index e3621e77b7..c0e33bf8b0 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_ContribSYBNT extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/ContributionAggregate.php b/civicrm/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
index cec75bd970..c5015b0a3a 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_ContributionAggregate extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/DateAdded.php b/civicrm/CRM/Contact/Form/Search/Custom/DateAdded.php
index c457efa5d5..2186d33860 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/DateAdded.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/DateAdded.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_DateAdded extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/EventAggregate.php b/civicrm/CRM/Contact/Form/Search/Custom/EventAggregate.php
index cdf031766e..199f93564f 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/EventAggregate.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/EventAggregate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_EventAggregate extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText.php
index ee587bbbeb..b8a9993144 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_FullText extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/AbstractPartialQuery.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/AbstractPartialQuery.php
index c1a277149f..e0e9626049 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/AbstractPartialQuery.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/AbstractPartialQuery.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
abstract class CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Activity.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Activity.php
index acd1c57c45..2e30090b51 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Activity.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_FullText_Activity extends CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Case.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Case.php
index 99e6c340f7..b9e86478df 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Case.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Case.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_FullText_Case extends CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contact.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contact.php
index e0d2950ac1..e696e639c1 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contact.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_FullText_Contact extends CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contribution.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contribution.php
index ee7a2ad41d..b180b0d03d 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contribution.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Contribution.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_FullText_Contribution extends CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Membership.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Membership.php
index 357c2e3adb..9c0a4c2307 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Membership.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Membership.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_FullText_Membership extends CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Participant.php b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Participant.php
index 43d758483d..fd46ca274f 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/FullText/Participant.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/FullText/Participant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_FullText_Participant extends CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Group.php b/civicrm/CRM/Contact/Form/Search/Custom/Group.php
index dc8968f0a3..8b889dfd0e 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Group.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_Group extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/MultipleValues.php b/civicrm/CRM/Contact/Form/Search/Custom/MultipleValues.php
index 67c053dd66..f5742817f4 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/MultipleValues.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/MultipleValues.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_MultipleValues extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/PostalMailing.php b/civicrm/CRM/Contact/Form/Search/Custom/PostalMailing.php
index d36f66062b..c44fe27419 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/PostalMailing.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/PostalMailing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_PostalMailing extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
protected $_aclFrom = NULL;
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/PriceSet.php b/civicrm/CRM/Contact/Form/Search/Custom/PriceSet.php
index eca744c22a..5f550adb7c 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/PriceSet.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/PriceSet.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_PriceSet extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Proximity.php b/civicrm/CRM/Contact/Form/Search/Custom/Proximity.php
index bf53ab8c2a..c719f131d1 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Proximity.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Proximity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_Proximity extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/RandomSegment.php b/civicrm/CRM/Contact/Form/Search/Custom/RandomSegment.php
index 2d55f9e8bf..74465434e6 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/RandomSegment.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/RandomSegment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_RandomSegment extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/Sample.php b/civicrm/CRM/Contact/Form/Search/Custom/Sample.php
index b79bfce55b..a6f8f0e562 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/Sample.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/Sample.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_Sample extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
protected $_aclFrom = NULL;
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/TagContributions.php b/civicrm/CRM/Contact/Form/Search/Custom/TagContributions.php
index 8263773cdf..d7d153f01d 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/TagContributions.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/TagContributions.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_TagContributions extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Search/Custom/ZipCodeRange.php b/civicrm/CRM/Contact/Form/Search/Custom/ZipCodeRange.php
index 40d59fca71..33f26c07b2 100644
--- a/civicrm/CRM/Contact/Form/Search/Custom/ZipCodeRange.php
+++ b/civicrm/CRM/Contact/Form/Search/Custom/ZipCodeRange.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Form_Search_Custom_ZipCodeRange extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
protected $_aclFrom = NULL;
diff --git a/civicrm/CRM/Contact/Form/Search/Interface.php b/civicrm/CRM/Contact/Form/Search/Interface.php
index 4899a4c0e4..7b806759fb 100644
--- a/civicrm/CRM/Contact/Form/Search/Interface.php
+++ b/civicrm/CRM/Contact/Form/Search/Interface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
interface CRM_Contact_Form_Search_Interface {
diff --git a/civicrm/CRM/Contact/Form/Task.php b/civicrm/CRM/Contact/Form/Task.php
index 9e0ab17f62..0c6f616d5d 100644
--- a/civicrm/CRM/Contact/Form/Task.php
+++ b/civicrm/CRM/Contact/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/AddToGroup.php b/civicrm/CRM/Contact/Form/Task/AddToGroup.php
index 29b4f883ed..74e7a6c4a5 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToGroup.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/AddToHousehold.php b/civicrm/CRM/Contact/Form/Task/AddToHousehold.php
index 95298009b3..24481b654d 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToHousehold.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToHousehold.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contact/Form/Task/AddToOrganization.php b/civicrm/CRM/Contact/Form/Task/AddToOrganization.php
index 145d77323a..279eb519eb 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToOrganization.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToOrganization.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/AddToParentClass.php b/civicrm/CRM/Contact/Form/Task/AddToParentClass.php
index fb9997a0e3..43e7c507f4 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToParentClass.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToParentClass.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contact/Form/Task/AddToTag.php b/civicrm/CRM/Contact/Form/Task/AddToTag.php
index 16b2e16264..77af701ff8 100644
--- a/civicrm/CRM/Contact/Form/Task/AddToTag.php
+++ b/civicrm/CRM/Contact/Form/Task/AddToTag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/AlterPreferences.php b/civicrm/CRM/Contact/Form/Task/AlterPreferences.php
index 49aabe86a1..a25fbfc93a 100644
--- a/civicrm/CRM/Contact/Form/Task/AlterPreferences.php
+++ b/civicrm/CRM/Contact/Form/Task/AlterPreferences.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Batch.php b/civicrm/CRM/Contact/Form/Task/Batch.php
index 15d81fa0b6..a96887d789 100644
--- a/civicrm/CRM/Contact/Form/Task/Batch.php
+++ b/civicrm/CRM/Contact/Form/Task/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Delete.php b/civicrm/CRM/Contact/Form/Task/Delete.php
index a8dfc08aef..73e17c64a6 100644
--- a/civicrm/CRM/Contact/Form/Task/Delete.php
+++ b/civicrm/CRM/Contact/Form/Task/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Email.php b/civicrm/CRM/Contact/Form/Task/Email.php
index de2f0fe079..3ab2cd522a 100644
--- a/civicrm/CRM/Contact/Form/Task/Email.php
+++ b/civicrm/CRM/Contact/Form/Task/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/EmailCommon.php b/civicrm/CRM/Contact/Form/Task/EmailCommon.php
index b4a5142fdd..296e7dd2b5 100644
--- a/civicrm/CRM/Contact/Form/Task/EmailCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/EmailCommon.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/HookSample.php b/civicrm/CRM/Contact/Form/Task/HookSample.php
index d3ec87f17c..0fdd74186c 100644
--- a/civicrm/CRM/Contact/Form/Task/HookSample.php
+++ b/civicrm/CRM/Contact/Form/Task/HookSample.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Label.php b/civicrm/CRM/Contact/Form/Task/Label.php
index 6bd801bb60..a144481e6b 100644
--- a/civicrm/CRM/Contact/Form/Task/Label.php
+++ b/civicrm/CRM/Contact/Form/Task/Label.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/LabelCommon.php b/civicrm/CRM/Contact/Form/Task/LabelCommon.php
index ddf5eefc85..4a9890cef6 100644
--- a/civicrm/CRM/Contact/Form/Task/LabelCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/LabelCommon.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Map.php b/civicrm/CRM/Contact/Form/Task/Map.php
index e1fef1f906..851f0d7b90 100644
--- a/civicrm/CRM/Contact/Form/Task/Map.php
+++ b/civicrm/CRM/Contact/Form/Task/Map.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Map/Event.php b/civicrm/CRM/Contact/Form/Task/Map/Event.php
index 955d893d3d..5f94617f37 100644
--- a/civicrm/CRM/Contact/Form/Task/Map/Event.php
+++ b/civicrm/CRM/Contact/Form/Task/Map/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Merge.php b/civicrm/CRM/Contact/Form/Task/Merge.php
index 00c780d5f9..05834d2945 100644
--- a/civicrm/CRM/Contact/Form/Task/Merge.php
+++ b/civicrm/CRM/Contact/Form/Task/Merge.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/PDF.php b/civicrm/CRM/Contact/Form/Task/PDF.php
index 67a7476086..fe9089b01a 100644
--- a/civicrm/CRM/Contact/Form/Task/PDF.php
+++ b/civicrm/CRM/Contact/Form/Task/PDF.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php b/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php
index 24745b6561..da9c8f6ec3 100644
--- a/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/PDFLetterCommon.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/PickProfile.php b/civicrm/CRM/Contact/Form/Task/PickProfile.php
index 78323f4cd5..63b1d88de2 100644
--- a/civicrm/CRM/Contact/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Contact/Form/Task/PickProfile.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Print.php b/civicrm/CRM/Contact/Form/Task/Print.php
index a80f5f665f..8882d123a9 100644
--- a/civicrm/CRM/Contact/Form/Task/Print.php
+++ b/civicrm/CRM/Contact/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/ProximityCommon.php b/civicrm/CRM/Contact/Form/Task/ProximityCommon.php
index 759c5b657b..5bb7418e74 100644
--- a/civicrm/CRM/Contact/Form/Task/ProximityCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/ProximityCommon.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/RemoveFromGroup.php b/civicrm/CRM/Contact/Form/Task/RemoveFromGroup.php
index 664fba80e5..72b41e5138 100644
--- a/civicrm/CRM/Contact/Form/Task/RemoveFromGroup.php
+++ b/civicrm/CRM/Contact/Form/Task/RemoveFromGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/RemoveFromTag.php b/civicrm/CRM/Contact/Form/Task/RemoveFromTag.php
index 4e5d5c6b74..5857e81662 100644
--- a/civicrm/CRM/Contact/Form/Task/RemoveFromTag.php
+++ b/civicrm/CRM/Contact/Form/Task/RemoveFromTag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Result.php b/civicrm/CRM/Contact/Form/Task/Result.php
index f3c4d11f76..f062bbfbc0 100644
--- a/civicrm/CRM/Contact/Form/Task/Result.php
+++ b/civicrm/CRM/Contact/Form/Task/Result.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/SMS.php b/civicrm/CRM/Contact/Form/Task/SMS.php
index f9d2159592..ae629e3945 100644
--- a/civicrm/CRM/Contact/Form/Task/SMS.php
+++ b/civicrm/CRM/Contact/Form/Task/SMS.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/SMSCommon.php b/civicrm/CRM/Contact/Form/Task/SMSCommon.php
index 23af8cecaf..63ac2807a7 100644
--- a/civicrm/CRM/Contact/Form/Task/SMSCommon.php
+++ b/civicrm/CRM/Contact/Form/Task/SMSCommon.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/SaveSearch.php b/civicrm/CRM/Contact/Form/Task/SaveSearch.php
index d055d2e267..62f3ee8a92 100644
--- a/civicrm/CRM/Contact/Form/Task/SaveSearch.php
+++ b/civicrm/CRM/Contact/Form/Task/SaveSearch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/SaveSearch/Update.php b/civicrm/CRM/Contact/Form/Task/SaveSearch/Update.php
index 5b9583eb12..3f1be4fc0b 100644
--- a/civicrm/CRM/Contact/Form/Task/SaveSearch/Update.php
+++ b/civicrm/CRM/Contact/Form/Task/SaveSearch/Update.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Form/Task/Useradd.php b/civicrm/CRM/Contact/Form/Task/Useradd.php
index 88f3141735..a13941cfc6 100644
--- a/civicrm/CRM/Contact/Form/Task/Useradd.php
+++ b/civicrm/CRM/Contact/Form/Task/Useradd.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contact/Import/Controller.php b/civicrm/CRM/Contact/Import/Controller.php
index d2a661f21f..ca610bb72d 100644
--- a/civicrm/CRM/Contact/Import/Controller.php
+++ b/civicrm/CRM/Contact/Import/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Import_Controller extends CRM_Core_Controller {
diff --git a/civicrm/CRM/Contact/Import/Field.php b/civicrm/CRM/Contact/Import/Field.php
index fd4f6329fa..95b01f49bf 100644
--- a/civicrm/CRM/Contact/Import/Field.php
+++ b/civicrm/CRM/Contact/Import/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contact/Import/Form/DataSource.php b/civicrm/CRM/Contact/Import/Form/DataSource.php
index 007b8a3323..7f5a60b2de 100644
--- a/civicrm/CRM/Contact/Import/Form/DataSource.php
+++ b/civicrm/CRM/Contact/Import/Form/DataSource.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Import/Form/MapField.php b/civicrm/CRM/Contact/Import/Form/MapField.php
index 0265d5cce8..61722c9810 100644
--- a/civicrm/CRM/Contact/Import/Form/MapField.php
+++ b/civicrm/CRM/Contact/Import/Form/MapField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Import/Form/Preview.php b/civicrm/CRM/Contact/Import/Form/Preview.php
index a9b0549321..e979cbc9a0 100644
--- a/civicrm/CRM/Contact/Import/Form/Preview.php
+++ b/civicrm/CRM/Contact/Import/Form/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Import/Form/Summary.php b/civicrm/CRM/Contact/Import/Form/Summary.php
index c326ac76cd..506f439df2 100644
--- a/civicrm/CRM/Contact/Import/Form/Summary.php
+++ b/civicrm/CRM/Contact/Import/Form/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Import/ImportJob.php b/civicrm/CRM/Contact/Import/ImportJob.php
index b0ec85c527..c5643532ea 100644
--- a/civicrm/CRM/Contact/Import/ImportJob.php
+++ b/civicrm/CRM/Contact/Import/ImportJob.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Import/Importer.php b/civicrm/CRM/Contact/Import/Importer.php
index 90088f6be2..3001c7ebca 100644
--- a/civicrm/CRM/Contact/Import/Importer.php
+++ b/civicrm/CRM/Contact/Import/Importer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Import/Page/AJAX.php b/civicrm/CRM/Contact/Import/Page/AJAX.php
index 50ac2f340b..fe7bff2b2f 100644
--- a/civicrm/CRM/Contact/Import/Page/AJAX.php
+++ b/civicrm/CRM/Contact/Import/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Import/Parser.php b/civicrm/CRM/Contact/Import/Parser.php
index 31ec9982ca..ebb786e8ef 100644
--- a/civicrm/CRM/Contact/Import/Parser.php
+++ b/civicrm/CRM/Contact/Import/Parser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
diff --git a/civicrm/CRM/Contact/Import/Parser/Contact.php b/civicrm/CRM/Contact/Import/Parser/Contact.php
index 1b1f83e2cc..6c63c13429 100644
--- a/civicrm/CRM/Contact/Import/Parser/Contact.php
+++ b/civicrm/CRM/Contact/Import/Parser/Contact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/AJAX.php b/civicrm/CRM/Contact/Page/AJAX.php
index ddab661e09..14336ac4d7 100644
--- a/civicrm/CRM/Contact/Page/AJAX.php
+++ b/civicrm/CRM/Contact/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
*/
diff --git a/civicrm/CRM/Contact/Page/CustomSearch.php b/civicrm/CRM/Contact/Page/CustomSearch.php
index c0c7499ef5..76765c0898 100644
--- a/civicrm/CRM/Contact/Page/CustomSearch.php
+++ b/civicrm/CRM/Contact/Page/CustomSearch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/DashBoard.php b/civicrm/CRM/Contact/Page/DashBoard.php
index 3e50cd5cfe..5f95110a91 100644
--- a/civicrm/CRM/Contact/Page/DashBoard.php
+++ b/civicrm/CRM/Contact/Page/DashBoard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Dashlet.php b/civicrm/CRM/Contact/Page/Dashlet.php
index 721e0559cd..fa90e1dabe 100644
--- a/civicrm/CRM/Contact/Page/Dashlet.php
+++ b/civicrm/CRM/Contact/Page/Dashlet.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/DedupeException.php b/civicrm/CRM/Contact/Page/DedupeException.php
index 3ce43ca50b..f1fa495542 100644
--- a/civicrm/CRM/Contact/Page/DedupeException.php
+++ b/civicrm/CRM/Contact/Page/DedupeException.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/DedupeFind.php b/civicrm/CRM/Contact/Page/DedupeFind.php
index 1820a84715..3305b9d71a 100644
--- a/civicrm/CRM/Contact/Page/DedupeFind.php
+++ b/civicrm/CRM/Contact/Page/DedupeFind.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_DedupeFind extends CRM_Core_Page_Basic {
protected $_cid = NULL;
diff --git a/civicrm/CRM/Contact/Page/DedupeMerge.php b/civicrm/CRM/Contact/Page/DedupeMerge.php
index eb0213eb12..6dc571756e 100644
--- a/civicrm/CRM/Contact/Page/DedupeMerge.php
+++ b/civicrm/CRM/Contact/Page/DedupeMerge.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page {
diff --git a/civicrm/CRM/Contact/Page/DedupeRules.php b/civicrm/CRM/Contact/Page/DedupeRules.php
index 56e3dec39b..34059066a4 100644
--- a/civicrm/CRM/Contact/Page/DedupeRules.php
+++ b/civicrm/CRM/Contact/Page/DedupeRules.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
diff --git a/civicrm/CRM/Contact/Page/ImageFile.php b/civicrm/CRM/Contact/Page/ImageFile.php
index 8b7cb76c6e..0c2dd66e82 100644
--- a/civicrm/CRM/Contact/Page/ImageFile.php
+++ b/civicrm/CRM/Contact/Page/ImageFile.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_ImageFile extends CRM_Core_Page {
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/Actions.php b/civicrm/CRM/Contact/Page/Inline/Actions.php
index 614451c0e5..0c5bd99dcb 100644
--- a/civicrm/CRM/Contact/Page/Inline/Actions.php
+++ b/civicrm/CRM/Contact/Page/Inline/Actions.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/Address.php b/civicrm/CRM/Contact/Page/Inline/Address.php
index 9bd2834854..b9d780c1b0 100644
--- a/civicrm/CRM/Contact/Page/Inline/Address.php
+++ b/civicrm/CRM/Contact/Page/Inline/Address.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/CommunicationPreferences.php b/civicrm/CRM/Contact/Page/Inline/CommunicationPreferences.php
index 646f2228b5..a04a08262e 100644
--- a/civicrm/CRM/Contact/Page/Inline/CommunicationPreferences.php
+++ b/civicrm/CRM/Contact/Page/Inline/CommunicationPreferences.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/ContactInfo.php b/civicrm/CRM/Contact/Page/Inline/ContactInfo.php
index ec9a5cc030..7993754236 100644
--- a/civicrm/CRM/Contact/Page/Inline/ContactInfo.php
+++ b/civicrm/CRM/Contact/Page/Inline/ContactInfo.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/ContactName.php b/civicrm/CRM/Contact/Page/Inline/ContactName.php
index 7db5a76c5c..fd48196b6a 100644
--- a/civicrm/CRM/Contact/Page/Inline/ContactName.php
+++ b/civicrm/CRM/Contact/Page/Inline/ContactName.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/CustomData.php b/civicrm/CRM/Contact/Page/Inline/CustomData.php
index 3df11dbfa2..f3098df758 100644
--- a/civicrm/CRM/Contact/Page/Inline/CustomData.php
+++ b/civicrm/CRM/Contact/Page/Inline/CustomData.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/Demographics.php b/civicrm/CRM/Contact/Page/Inline/Demographics.php
index af8b06b224..d87945c8b1 100644
--- a/civicrm/CRM/Contact/Page/Inline/Demographics.php
+++ b/civicrm/CRM/Contact/Page/Inline/Demographics.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/Email.php b/civicrm/CRM/Contact/Page/Inline/Email.php
index efcace3c35..4b46a6a9e8 100644
--- a/civicrm/CRM/Contact/Page/Inline/Email.php
+++ b/civicrm/CRM/Contact/Page/Inline/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/IM.php b/civicrm/CRM/Contact/Page/Inline/IM.php
index d7e6736a4c..42fa7c886a 100644
--- a/civicrm/CRM/Contact/Page/Inline/IM.php
+++ b/civicrm/CRM/Contact/Page/Inline/IM.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/OpenID.php b/civicrm/CRM/Contact/Page/Inline/OpenID.php
index 72ab101432..fa0bc83942 100644
--- a/civicrm/CRM/Contact/Page/Inline/OpenID.php
+++ b/civicrm/CRM/Contact/Page/Inline/OpenID.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/Phone.php b/civicrm/CRM/Contact/Page/Inline/Phone.php
index 6a3388cdef..f252adc6fa 100644
--- a/civicrm/CRM/Contact/Page/Inline/Phone.php
+++ b/civicrm/CRM/Contact/Page/Inline/Phone.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Inline/Website.php b/civicrm/CRM/Contact/Page/Inline/Website.php
index bea1d498ef..3ca3509731 100644
--- a/civicrm/CRM/Contact/Page/Inline/Website.php
+++ b/civicrm/CRM/Contact/Page/Inline/Website.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/SavedSearch.php b/civicrm/CRM/Contact/Page/SavedSearch.php
index 54091dcf86..82507cd773 100644
--- a/civicrm/CRM/Contact/Page/SavedSearch.php
+++ b/civicrm/CRM/Contact/Page/SavedSearch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/Task.php b/civicrm/CRM/Contact/Page/Task.php
index 7b740caa58..fd4d5ef523 100644
--- a/civicrm/CRM/Contact/Page/Task.php
+++ b/civicrm/CRM/Contact/Page/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/View.php b/civicrm/CRM/Contact/Page/View.php
index 44d7a0a2a6..77ddb07b3e 100644
--- a/civicrm/CRM/Contact/Page/View.php
+++ b/civicrm/CRM/Contact/Page/View.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php b/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php
index 314dea2f19..2bf4f5ef9e 100644
--- a/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php
+++ b/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_View_ContactSmartGroup extends CRM_Core_Page {
diff --git a/civicrm/CRM/Contact/Page/View/CustomData.php b/civicrm/CRM/Contact/Page/View/CustomData.php
index b56d3b6187..d8d5633751 100644
--- a/civicrm/CRM/Contact/Page/View/CustomData.php
+++ b/civicrm/CRM/Contact/Page/View/CustomData.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -151,7 +151,7 @@ class CRM_Contact_Page_View_CustomData extends CRM_Core_Page {
$this->assign('multiRecordDisplay', $this->_multiRecordDisplay);
$this->assign('skipTitle', 1);
}
- CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, FALSE, NULL, NULL, $recId);
+ CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, FALSE, NULL, NULL, $recId, $this->_contactId);
}
}
else {
diff --git a/civicrm/CRM/Contact/Page/View/GroupContact.php b/civicrm/CRM/Contact/Page/View/GroupContact.php
index 5828f414ef..ac8c20d51c 100644
--- a/civicrm/CRM/Contact/Page/View/GroupContact.php
+++ b/civicrm/CRM/Contact/Page/View/GroupContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_View_GroupContact extends CRM_Core_Page {
diff --git a/civicrm/CRM/Contact/Page/View/Log.php b/civicrm/CRM/Contact/Page/View/Log.php
index 38e7a0ca42..17efe79c3a 100644
--- a/civicrm/CRM/Contact/Page/View/Log.php
+++ b/civicrm/CRM/Contact/Page/View/Log.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_View_Log extends CRM_Core_Page {
diff --git a/civicrm/CRM/Contact/Page/View/Note.php b/civicrm/CRM/Contact/Page/View/Note.php
index b762d92666..1b9a134504 100644
--- a/civicrm/CRM/Contact/Page/View/Note.php
+++ b/civicrm/CRM/Contact/Page/View/Note.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/View/Print.php b/civicrm/CRM/Contact/Page/View/Print.php
index 202568ebcb..a02912aac4 100644
--- a/civicrm/CRM/Contact/Page/View/Print.php
+++ b/civicrm/CRM/Contact/Page/View/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/View/Relationship.php b/civicrm/CRM/Contact/Page/View/Relationship.php
index a7379d924a..1e44f43e7c 100644
--- a/civicrm/CRM/Contact/Page/View/Relationship.php
+++ b/civicrm/CRM/Contact/Page/View/Relationship.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_View_Relationship extends CRM_Core_Page {
diff --git a/civicrm/CRM/Contact/Page/View/Summary.php b/civicrm/CRM/Contact/Page/View/Summary.php
index 88973dad03..11eb55571b 100644
--- a/civicrm/CRM/Contact/Page/View/Summary.php
+++ b/civicrm/CRM/Contact/Page/View/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/View/Tag.php b/civicrm/CRM/Contact/Page/View/Tag.php
index f15688b889..b1a668f2d0 100644
--- a/civicrm/CRM/Contact/Page/View/Tag.php
+++ b/civicrm/CRM/Contact/Page/View/Tag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_View_Tag extends CRM_Core_Page {
diff --git a/civicrm/CRM/Contact/Page/View/UserDashBoard.php b/civicrm/CRM/Contact/Page/View/UserDashBoard.php
index c14196073a..a4ba1d3f00 100644
--- a/civicrm/CRM/Contact/Page/View/UserDashBoard.php
+++ b/civicrm/CRM/Contact/Page/View/UserDashBoard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php b/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php
index 11f8c09eb2..730030e4e5 100644
--- a/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php
+++ b/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Page_View_UserDashBoard_GroupContact extends CRM_Contact_Page_View_UserDashBoard {
diff --git a/civicrm/CRM/Contact/Page/View/Useradd.php b/civicrm/CRM/Contact/Page/View/Useradd.php
index c8d1da566e..8a917c9794 100644
--- a/civicrm/CRM/Contact/Page/View/Useradd.php
+++ b/civicrm/CRM/Contact/Page/View/Useradd.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contact/Page/View/Vcard.php b/civicrm/CRM/Contact/Page/View/Vcard.php
index c7cad12c2a..ac5e084cc4 100644
--- a/civicrm/CRM/Contact/Page/View/Vcard.php
+++ b/civicrm/CRM/Contact/Page/View/Vcard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'Contact/Vcard/Build.php';
diff --git a/civicrm/CRM/Contact/Selector.php b/civicrm/CRM/Contact/Selector.php
index d1b8a4ac56..295c569fc8 100644
--- a/civicrm/CRM/Contact/Selector.php
+++ b/civicrm/CRM/Contact/Selector.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contact/Selector/Controller.php b/civicrm/CRM/Contact/Selector/Controller.php
index 816a854b9e..e1dab181dd 100644
--- a/civicrm/CRM/Contact/Selector/Controller.php
+++ b/civicrm/CRM/Contact/Selector/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_Selector_Controller extends CRM_Core_Selector_Controller {
/**
diff --git a/civicrm/CRM/Contact/Selector/Custom.php b/civicrm/CRM/Contact/Selector/Custom.php
index 3ac10fa31a..b1c192dae2 100644
--- a/civicrm/CRM/Contact/Selector/Custom.php
+++ b/civicrm/CRM/Contact/Selector/Custom.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: Selector.php 11510 2007-09-18 09:21:34Z lobo $
*/
diff --git a/civicrm/CRM/Contact/StateMachine/Search.php b/civicrm/CRM/Contact/StateMachine/Search.php
index 45aee4c3a2..296087b653 100644
--- a/civicrm/CRM/Contact/StateMachine/Search.php
+++ b/civicrm/CRM/Contact/StateMachine/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contact_StateMachine_Search extends CRM_Core_StateMachine {
diff --git a/civicrm/CRM/Contact/Task.php b/civicrm/CRM/Contact/Task.php
index cffc5fdab9..2b426daa82 100644
--- a/civicrm/CRM/Contact/Task.php
+++ b/civicrm/CRM/Contact/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/ActionMapping/ByPage.php b/civicrm/CRM/Contribute/ActionMapping/ByPage.php
index b6f86d7620..175c412757 100644
--- a/civicrm/CRM/Contribute/ActionMapping/ByPage.php
+++ b/civicrm/CRM/Contribute/ActionMapping/ByPage.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contribute/ActionMapping/ByType.php b/civicrm/CRM/Contribute/ActionMapping/ByType.php
index ce10b31923..a52506c322 100644
--- a/civicrm/CRM/Contribute/ActionMapping/ByType.php
+++ b/civicrm/CRM/Contribute/ActionMapping/ByType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contribute/BAO/Contribution.php b/civicrm/CRM/Contribute/BAO/Contribution.php
index 365ca8f1e2..eaa08dfa1a 100644
--- a/civicrm/CRM/Contribute/BAO/Contribution.php
+++ b/civicrm/CRM/Contribute/BAO/Contribution.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
@@ -2823,7 +2823,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
$template->assign('trxn_id', $this->trxn_id);
$template->assign('receive_date',
- CRM_Utils_Date::mysqlToIso($this->receive_date)
+ CRM_Utils_Date::processDate($this->receive_date)
);
$template->assign('contributeMode', 'notify');
$template->assign('action', $this->is_test ? 1024 : 1);
@@ -4763,7 +4763,10 @@ LIMIT 1;";
* @throws \CiviCRM_API3_Exception
*/
protected static function getRecurringContributionDescription($contribution, $event) {
- if (!empty($contribution->contribution_page_id)) {
+ if (!empty($contribution->source)) {
+ return $contribution->source;
+ }
+ elseif (!empty($contribution->contribution_page_id)) {
$contributionPageTitle = civicrm_api3('ContributionPage', 'getvalue', array(
'id' => $contribution->contribution_page_id,
'return' => 'title',
diff --git a/civicrm/CRM/Contribute/BAO/Contribution/Utils.php b/civicrm/CRM/Contribute/BAO/Contribution/Utils.php
index a450bc81e5..f99f910511 100644
--- a/civicrm/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/civicrm/CRM/Contribute/BAO/Contribution/Utils.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_BAO_Contribution_Utils {
diff --git a/civicrm/CRM/Contribute/BAO/ContributionPage.php b/civicrm/CRM/Contribute/BAO/ContributionPage.php
index 35f0291ba2..990eefb846 100644
--- a/civicrm/CRM/Contribute/BAO/ContributionPage.php
+++ b/civicrm/CRM/Contribute/BAO/ContributionPage.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/BAO/ContributionRecur.php b/civicrm/CRM/Contribute/BAO/ContributionRecur.php
index 98b1a1d9f4..7478d39c52 100644
--- a/civicrm/CRM/Contribute/BAO/ContributionRecur.php
+++ b/civicrm/CRM/Contribute/BAO/ContributionRecur.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_BAO_ContributionRecur extends CRM_Contribute_DAO_ContributionRecur {
@@ -459,6 +459,7 @@ INNER JOIN civicrm_contribution con ON ( con.id = mp.contribution_id )
'contribution_recur_id' => $id,
'options' => array('limit' => 1, 'sort' => array('id DESC')),
'sequential' => 1,
+ 'contribution_test' => '',
));
if ($templateContribution['count']) {
return $templateContribution['values'][0];
diff --git a/civicrm/CRM/Contribute/BAO/ContributionSoft.php b/civicrm/CRM/Contribute/BAO/ContributionSoft.php
index bd7354d7fa..b9f8044e8e 100644
--- a/civicrm/CRM/Contribute/BAO/ContributionSoft.php
+++ b/civicrm/CRM/Contribute/BAO/ContributionSoft.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_ContributionSoft {
diff --git a/civicrm/CRM/Contribute/BAO/ManagePremiums.php b/civicrm/CRM/Contribute/BAO/ManagePremiums.php
index 448bab6422..4c7e3b8c45 100644
--- a/civicrm/CRM/Contribute/BAO/ManagePremiums.php
+++ b/civicrm/CRM/Contribute/BAO/ManagePremiums.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_BAO_ManagePremiums extends CRM_Contribute_DAO_Product {
diff --git a/civicrm/CRM/Contribute/BAO/Premium.php b/civicrm/CRM/Contribute/BAO/Premium.php
index eff02f0cd2..a92aced3cb 100644
--- a/civicrm/CRM/Contribute/BAO/Premium.php
+++ b/civicrm/CRM/Contribute/BAO/Premium.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium {
diff --git a/civicrm/CRM/Contribute/BAO/Query.php b/civicrm/CRM/Contribute/BAO/Query.php
index 157b0b9f6d..aa236a5e66 100644
--- a/civicrm/CRM/Contribute/BAO/Query.php
+++ b/civicrm/CRM/Contribute/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_BAO_Query {
diff --git a/civicrm/CRM/Contribute/BAO/Widget.php b/civicrm/CRM/Contribute/BAO/Widget.php
index c7456707fc..ce1afe2b7b 100644
--- a/civicrm/CRM/Contribute/BAO/Widget.php
+++ b/civicrm/CRM/Contribute/BAO/Widget.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Controller/Contribution.php b/civicrm/CRM/Contribute/Controller/Contribution.php
index a3914e3817..75e81eeb87 100644
--- a/civicrm/CRM/Contribute/Controller/Contribution.php
+++ b/civicrm/CRM/Contribute/Controller/Contribution.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Controller/ContributionPage.php b/civicrm/CRM/Contribute/Controller/ContributionPage.php
index b87aa8c065..a5e761b177 100644
--- a/civicrm/CRM/Contribute/Controller/ContributionPage.php
+++ b/civicrm/CRM/Contribute/Controller/ContributionPage.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Controller/Search.php b/civicrm/CRM/Contribute/Controller/Search.php
index da2c749f61..c4ae7dfb7d 100644
--- a/civicrm/CRM/Contribute/Controller/Search.php
+++ b/civicrm/CRM/Contribute/Controller/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/DAO/Contribution.php b/civicrm/CRM/Contribute/DAO/Contribution.php
index 797ebf550e..95512cee8b 100644
--- a/civicrm/CRM/Contribute/DAO/Contribution.php
+++ b/civicrm/CRM/Contribute/DAO/Contribution.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contribute/Contribution.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contribute/DAO/ContributionPage.php b/civicrm/CRM/Contribute/DAO/ContributionPage.php
index 74f6a126a6..2d1d605c98 100644
--- a/civicrm/CRM/Contribute/DAO/ContributionPage.php
+++ b/civicrm/CRM/Contribute/DAO/ContributionPage.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contribute/ContributionPage.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contribute/DAO/ContributionProduct.php b/civicrm/CRM/Contribute/DAO/ContributionProduct.php
index 871089fb80..cfa006dc2d 100644
--- a/civicrm/CRM/Contribute/DAO/ContributionProduct.php
+++ b/civicrm/CRM/Contribute/DAO/ContributionProduct.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contribute/ContributionProduct.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contribute/DAO/ContributionRecur.php b/civicrm/CRM/Contribute/DAO/ContributionRecur.php
index 400dfa00ff..c6367c6342 100644
--- a/civicrm/CRM/Contribute/DAO/ContributionRecur.php
+++ b/civicrm/CRM/Contribute/DAO/ContributionRecur.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contribute/ContributionRecur.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contribute/DAO/ContributionSoft.php b/civicrm/CRM/Contribute/DAO/ContributionSoft.php
index d021c1b3e2..8ea3151f43 100644
--- a/civicrm/CRM/Contribute/DAO/ContributionSoft.php
+++ b/civicrm/CRM/Contribute/DAO/ContributionSoft.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contribute/ContributionSoft.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contribute/DAO/Premium.php b/civicrm/CRM/Contribute/DAO/Premium.php
index 963e50d48d..297f58c2f8 100644
--- a/civicrm/CRM/Contribute/DAO/Premium.php
+++ b/civicrm/CRM/Contribute/DAO/Premium.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contribute/Premium.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contribute/DAO/PremiumsProduct.php b/civicrm/CRM/Contribute/DAO/PremiumsProduct.php
index be31ba7243..4df1c0b740 100644
--- a/civicrm/CRM/Contribute/DAO/PremiumsProduct.php
+++ b/civicrm/CRM/Contribute/DAO/PremiumsProduct.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contribute/PremiumsProduct.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contribute/DAO/Product.php b/civicrm/CRM/Contribute/DAO/Product.php
index 07cf535804..9455bf14f0 100644
--- a/civicrm/CRM/Contribute/DAO/Product.php
+++ b/civicrm/CRM/Contribute/DAO/Product.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contribute/Product.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contribute/DAO/Widget.php b/civicrm/CRM/Contribute/DAO/Widget.php
index 729df7f000..002b93d6d2 100644
--- a/civicrm/CRM/Contribute/DAO/Widget.php
+++ b/civicrm/CRM/Contribute/DAO/Widget.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Contribute/Widget.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Contribute/Form.php b/civicrm/CRM/Contribute/Form.php
index 43e7529971..320f28f209 100644
--- a/civicrm/CRM/Contribute/Form.php
+++ b/civicrm/CRM/Contribute/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/AbstractEditPayment.php b/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
index d8bc3999c0..36c221f39d 100644
--- a/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
+++ b/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/AdditionalInfo.php b/civicrm/CRM/Contribute/Form/AdditionalInfo.php
index d59606a1a1..33b6c8a7a1 100644
--- a/civicrm/CRM/Contribute/Form/AdditionalInfo.php
+++ b/civicrm/CRM/Contribute/Form/AdditionalInfo.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Form_AdditionalInfo {
diff --git a/civicrm/CRM/Contribute/Form/AdditionalPayment.php b/civicrm/CRM/Contribute/Form/AdditionalPayment.php
index 0077c79128..2aef27eac5 100644
--- a/civicrm/CRM/Contribute/Form/AdditionalPayment.php
+++ b/civicrm/CRM/Contribute/Form/AdditionalPayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/CancelSubscription.php b/civicrm/CRM/Contribute/Form/CancelSubscription.php
index be0dbbd76c..db83d20ffc 100644
--- a/civicrm/CRM/Contribute/Form/CancelSubscription.php
+++ b/civicrm/CRM/Contribute/Form/CancelSubscription.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Contribution.php b/civicrm/CRM/Contribute/Form/Contribution.php
index 2c90c8159d..dcac3e4145 100644
--- a/civicrm/CRM/Contribute/Form/Contribution.php
+++ b/civicrm/CRM/Contribute/Form/Contribution.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Contribute/Form/Contribution/Confirm.php b/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
index 8a6db269bb..6450cf416e 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -223,9 +223,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
}
// if onbehalf-of-organization
if (!empty($this->_values['onbehalf_profile_id']) && !empty($this->_params['onbehalf']['organization_name'])) {
- // CRM-15182
- $this->_params['organization_id'] = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $this->_params['onbehalf']['organization_name'], 'id', 'display_name');
-
+ $this->_params['organization_id'] = CRM_Utils_Array::value('onbehalfof_id', $this->_params);
$this->_params['organization_name'] = $this->_params['onbehalf']['organization_name'];
$addressBlocks = array(
'street_address',
@@ -455,7 +453,12 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
$this->buildCustom($this->_values['custom_pre_id'], 'customPre', TRUE);
$this->buildCustom($this->_values['custom_post_id'], 'customPost', TRUE);
- if (!empty($this->_values['onbehalf_profile_id']) && !empty($params['onbehalf'])) {
+ if (!empty($this->_values['onbehalf_profile_id']) &&
+ !empty($params['onbehalf']) &&
+ ($this->_values['is_for_organization'] == 2 ||
+ !empty($params['is_for_organization'])
+ )
+ ) {
$fieldTypes = array('Contact', 'Organization');
$contactSubType = CRM_Contact_BAO_ContactType::subTypes('Organization');
$fieldTypes = array_merge($fieldTypes, $contactSubType);
@@ -1401,7 +1404,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
$isProcessSeparateMembershipTransaction, $financialTypeID, $membershipLineItems, $isPayLater, $isPending) {
$membershipContribution = NULL;
$isTest = CRM_Utils_Array::value('is_test', $membershipParams, FALSE);
- $errors = $createdMemberships = $paymentResults = array();
+ $errors = $paymentResults = array();
$form->_values['isMembership'] = TRUE;
$isRecurForFirstTransaction = CRM_Utils_Array::value('is_recur', $form->_values, CRM_Utils_Array::value('is_recur', $membershipParams));
$totalAmount = $membershipParams['amount'];
@@ -1512,10 +1515,8 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
}
if ($form->_priceSetId && !empty($form->_useForMember) && !empty($form->_lineItem)) {
foreach ($form->_lineItem[$form->_priceSetId] as & $priceFieldOp) {
- if (!empty($priceFieldOp['membership_type_id']) &&
- isset($createdMemberships[$priceFieldOp['membership_type_id']])
- ) {
- $membershipOb = $createdMemberships[$priceFieldOp['membership_type_id']];
+ if (!empty($priceFieldOp['membership_type_id']) && $membership->membership_type_id == $priceFieldOp['membership_type_id']) {
+ $membershipOb = $membership;
$priceFieldOp['start_date'] = $membershipOb->start_date ? CRM_Utils_Date::customFormat($membershipOb->start_date, '%B %E%f, %Y') : '-';
$priceFieldOp['end_date'] = $membershipOb->end_date ? CRM_Utils_Date::customFormat($membershipOb->end_date, '%B %E%f, %Y') : '-';
}
@@ -1536,23 +1537,17 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
// CRM-7851 - Moved after processing Payment Errors
//@todo - the reasoning for this being here seems a little outdated
- foreach ($createdMemberships as $createdMembership) {
- CRM_Core_BAO_CustomValueTable::postProcess(
- $form->_params,
- 'civicrm_membership',
- $createdMembership->id,
- 'Membership'
- );
- $form->_params['createdMembershipIDs'][] = $createdMembership->id;
- }
- if (count($createdMemberships) == 1) {
+ CRM_Core_BAO_CustomValueTable::postProcess($form->_params, 'civicrm_membership', $membership->id, 'Membership');
+ $form->_params['createdMembershipIDs'][] = $membership->id;
+
+ if ($membership) {
//presumably this is only relevant for exactly 1 membership
- $form->_params['membershipID'] = $createdMembership->id;
+ $form->_params['membershipID'] = $membership->id;
}
//CRM-15232: Check if membership is created and on the basis of it use
//membership receipt template to send payment receipt
- if (count($createdMemberships)) {
+ if ($membership) {
$form->_values['isMembership'] = TRUE;
}
if (isset($membershipContributionID)) {
@@ -1592,6 +1587,18 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
// This feels like a bizarre hack as the variable name doesn't seem to be directly connected to it's use in the template.
$emailValues['useForMember'] = 0;
$emailValues['amount'] = 0;
+
+ //CRM-18071, where on selecting $0 free membership payment section got hidden and
+ // also it reset any payment processor selection result into pending free membership
+ // so its a kind of hack to complete free membership at this point since there is no $form->_paymentProcessor info
+ if (empty($form->_params['is_pay_later']) && !empty($membershipContribution) && !is_a($membershipContribution, 'CRM_Core_Error')) {
+ $paymentProcessorIDs = explode(CRM_Core_DAO::VALUE_SEPARATOR, CRM_Utils_Array::value('payment_processor', $this->_values));
+ if (empty($form->_paymentProcessor) && !empty($paymentProcessorIDs)) {
+ $this->_paymentProcessor['id'] = $paymentProcessorIDs[0];
+ }
+ $result = array('payment_status_id' => 1, 'contribution' => $membershipContribution);
+ $this->completeTransaction($result, $result['contribution']->id);
+ }
}
CRM_Contribute_BAO_ContributionPage::sendMail($contactID,
@@ -1910,7 +1917,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
// (note it might make sense to make this a row in the processor table in the db).
$this->_params['payment_processor_id'] = 0;
}
- if (isset($this->_params['payment_processor_id']) && $this->_params['payment_processor_id'] == 0) {
+ if (isset($this->_params['payment_processor_id']) && $this->_params['payment_processor_id'] === 0) {
$this->_params['is_pay_later'] = $isPayLater = TRUE;
}
// add a description field at the very beginning
@@ -2083,7 +2090,12 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
// If onbehalf-of-organization contribution / signup, add organization
// and it's location.
- if (isset($this->_values['onbehalf_profile_id']) && isset($behalfOrganization['organization_name']) && !empty($this->_params['is_for_organization'])) {
+ if (isset($this->_values['onbehalf_profile_id']) &&
+ isset($behalfOrganization['organization_name']) &&
+ ($this->_values['is_for_organization'] == 2 ||
+ !empty($this->_params['is_for_organization'])
+ )
+ ) {
$ufFields = array();
foreach ($this->_fields['onbehalf'] as $name => $value) {
$ufFields[$name] = 1;
diff --git a/civicrm/CRM/Contribute/Form/Contribution/Main.php b/civicrm/CRM/Contribute/Form/Contribution/Main.php
index 73cb547540..abd7bce7ad 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/Main.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/Main.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -600,6 +600,11 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
public static function formRule($fields, $files, $self) {
$errors = array();
$amount = self::computeAmount($fields, $self->_values);
+ if (CRM_Utils_Array::value('auto_renew', $fields) &&
+ CRM_Utils_Array::value('payment_processor_id', $fields) == 0
+ ) {
+ $errors['auto_renew'] = ts('You cannot have auto-renewal on if you are paying later.');
+ }
if ((!empty($fields['selectMembership']) &&
$fields['selectMembership'] != 'no_thanks'
diff --git a/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php b/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
index 073cbea3a6..753d41c774 100644
--- a/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
+++ b/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -186,7 +186,12 @@ class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont
$this->buildCustom($this->_values['custom_pre_id'], 'customPre', TRUE);
$this->buildCustom($this->_values['custom_post_id'], 'customPost', TRUE);
- if (!empty($params['onbehalf'])) {
+ if (!empty($this->_values['onbehalf_profile_id']) &&
+ !empty($params['onbehalf']) &&
+ ($this->_values['is_for_organization'] == 2 ||
+ !empty($params['is_for_organization'])
+ )
+ ) {
$fieldTypes = array('Contact', 'Organization');
$contactSubType = CRM_Contact_BAO_ContactType::subTypes('Organization');
$fieldTypes = array_merge($fieldTypes, $contactSubType);
diff --git a/civicrm/CRM/Contribute/Form/ContributionBase.php b/civicrm/CRM/Contribute/Form/ContributionBase.php
index 753e275e4d..4bd0558559 100644
--- a/civicrm/CRM/Contribute/Form/ContributionBase.php
+++ b/civicrm/CRM/Contribute/Form/ContributionBase.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -1108,7 +1108,7 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
$allowAutoRenewOpt = (int) $memType['auto_renew'];
if (is_array($this->_paymentProcessors)) {
foreach ($this->_paymentProcessors as $id => $val) {
- if (!$val['is_recur']) {
+ if ($id && !$val['is_recur']) {
$allowAutoRenewOpt = 0;
continue;
}
@@ -1199,7 +1199,7 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
$this->assign('autoRenewOption', $autoRenewOption);
}
- if (!$this->_values['is_pay_later'] && is_array($this->_paymentProcessors) && ($allowAutoRenewMembership || $autoRenewOption)) {
+ if ((!$this->_values['is_pay_later'] || is_array($this->_paymentProcessors)) && ($allowAutoRenewMembership || $autoRenewOption)) {
$this->addElement('checkbox', 'auto_renew', ts('Please renew my membership automatically.'));
}
diff --git a/civicrm/CRM/Contribute/Form/ContributionCharts.php b/civicrm/CRM/Contribute/Form/ContributionCharts.php
index f5868f59c4..90738e91aa 100644
--- a/civicrm/CRM/Contribute/Form/ContributionCharts.php
+++ b/civicrm/CRM/Contribute/Form/ContributionCharts.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Form_ContributionCharts extends CRM_Core_Form {
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage.php b/civicrm/CRM/Contribute/Form/ContributionPage.php
index bab925650b..e196b61c7f 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/AddProduct.php b/civicrm/CRM/Contribute/Form/ContributionPage/AddProduct.php
index 35a730063e..b858afb07d 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/AddProduct.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/AddProduct.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php b/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php
index c4637a93dd..3c46e992a5 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Amount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Custom.php b/civicrm/CRM/Contribute/Form/ContributionPage/Custom.php
index 54c8c175b7..2c23783ae0 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Custom.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Custom.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Delete.php b/civicrm/CRM/Contribute/Form/ContributionPage/Delete.php
index ae7d9aa685..7ca58ae578 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Delete.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Premium.php b/civicrm/CRM/Contribute/Form/ContributionPage/Premium.php
index e5f7d5ae5c..d62fef0fd8 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Premium.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Premium.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Settings.php b/civicrm/CRM/Contribute/Form/ContributionPage/Settings.php
index 6efc73568e..8c6b784df8 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Settings.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Settings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Form_ContributionPage_Settings extends CRM_Contribute_Form_ContributionPage {
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php b/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php
index 7cd255ea25..754805c53c 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/ThankYou.php b/civicrm/CRM/Contribute/Form/ContributionPage/ThankYou.php
index 5f22ef4ae9..ccda370764 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/ThankYou.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/ThankYou.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php b/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php
index 1b84182c64..9bc5355475 100644
--- a/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php
+++ b/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Form_ContributionPage_Widget extends CRM_Contribute_Form_ContributionPage {
protected $_colors;
diff --git a/civicrm/CRM/Contribute/Form/ContributionView.php b/civicrm/CRM/Contribute/Form/ContributionView.php
index 5b2446178b..860ad317a4 100644
--- a/civicrm/CRM/Contribute/Form/ContributionView.php
+++ b/civicrm/CRM/Contribute/Form/ContributionView.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/ManagePremiums.php b/civicrm/CRM/Contribute/Form/ManagePremiums.php
index 35bcb9e09a..72a7d8ff9a 100644
--- a/civicrm/CRM/Contribute/Form/ManagePremiums.php
+++ b/civicrm/CRM/Contribute/Form/ManagePremiums.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Search.php b/civicrm/CRM/Contribute/Form/Search.php
index 7d3d5b7205..866c736fd9 100644
--- a/civicrm/CRM/Contribute/Form/Search.php
+++ b/civicrm/CRM/Contribute/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/SearchContribution.php b/civicrm/CRM/Contribute/Form/SearchContribution.php
index b828bc6434..b52b5a6f5a 100644
--- a/civicrm/CRM/Contribute/Form/SearchContribution.php
+++ b/civicrm/CRM/Contribute/Form/SearchContribution.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Form_SearchContribution extends CRM_Core_Form {
diff --git a/civicrm/CRM/Contribute/Form/SoftCredit.php b/civicrm/CRM/Contribute/Form/SoftCredit.php
index 78411d4d51..a739ae7e02 100644
--- a/civicrm/CRM/Contribute/Form/SoftCredit.php
+++ b/civicrm/CRM/Contribute/Form/SoftCredit.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task.php b/civicrm/CRM/Contribute/Form/Task.php
index b3bc0dca75..9e943e35a5 100644
--- a/civicrm/CRM/Contribute/Form/Task.php
+++ b/civicrm/CRM/Contribute/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/Batch.php b/civicrm/CRM/Contribute/Form/Task/Batch.php
index fcd34a23e2..4976a0addd 100644
--- a/civicrm/CRM/Contribute/Form/Task/Batch.php
+++ b/civicrm/CRM/Contribute/Form/Task/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/Delete.php b/civicrm/CRM/Contribute/Form/Task/Delete.php
index 5a78a0835d..842d04f0d1 100644
--- a/civicrm/CRM/Contribute/Form/Task/Delete.php
+++ b/civicrm/CRM/Contribute/Form/Task/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/Email.php b/civicrm/CRM/Contribute/Form/Task/Email.php
index e2db75182a..8922985a96 100644
--- a/civicrm/CRM/Contribute/Form/Task/Email.php
+++ b/civicrm/CRM/Contribute/Form/Task/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/Invoice.php b/civicrm/CRM/Contribute/Form/Task/Invoice.php
index 90cd0e3dfc..1debcaa6c4 100644
--- a/civicrm/CRM/Contribute/Form/Task/Invoice.php
+++ b/civicrm/CRM/Contribute/Form/Task/Invoice.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/PDF.php b/civicrm/CRM/Contribute/Form/Task/PDF.php
index a3b941811f..f8f6ece6e1 100644
--- a/civicrm/CRM/Contribute/Form/Task/PDF.php
+++ b/civicrm/CRM/Contribute/Form/Task/PDF.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -115,7 +115,7 @@ AND {$this->_componentClause}";
array(0 => ts('- default -')) + CRM_Core_BAO_PdfFormat::getList(TRUE)
);
$this->add('checkbox', 'receipt_update', ts('Update receipt dates for these contributions'), FALSE);
- $this->add('checkbox', 'override_privacy', ts('Override privacy setting? (Do no email / Do not mail)'), FALSE);
+ $this->add('checkbox', 'override_privacy', ts('Override privacy setting? (Do not email / Do not mail)'), FALSE);
$this->addButtons(array(
array(
diff --git a/civicrm/CRM/Contribute/Form/Task/PDFLetter.php b/civicrm/CRM/Contribute/Form/Task/PDFLetter.php
index 103da03345..f7e620192b 100644
--- a/civicrm/CRM/Contribute/Form/Task/PDFLetter.php
+++ b/civicrm/CRM/Contribute/Form/Task/PDFLetter.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/PickProfile.php b/civicrm/CRM/Contribute/Form/Task/PickProfile.php
index 0f812908fb..4d7583584c 100644
--- a/civicrm/CRM/Contribute/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Contribute/Form/Task/PickProfile.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/Print.php b/civicrm/CRM/Contribute/Form/Task/Print.php
index 967f3c3f32..2fd9f38e87 100644
--- a/civicrm/CRM/Contribute/Form/Task/Print.php
+++ b/civicrm/CRM/Contribute/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/Result.php b/civicrm/CRM/Contribute/Form/Task/Result.php
index 903ae3658d..99ff986a53 100644
--- a/civicrm/CRM/Contribute/Form/Task/Result.php
+++ b/civicrm/CRM/Contribute/Form/Task/Result.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Contribute/Form/Task/SearchTaskHookSample.php
index e455e784d2..5ee7ddc018 100644
--- a/civicrm/CRM/Contribute/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Contribute/Form/Task/SearchTaskHookSample.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/Task/Status.php b/civicrm/CRM/Contribute/Form/Task/Status.php
index 16e6a8426f..8fe0396559 100644
--- a/civicrm/CRM/Contribute/Form/Task/Status.php
+++ b/civicrm/CRM/Contribute/Form/Task/Status.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/UpdateBilling.php b/civicrm/CRM/Contribute/Form/UpdateBilling.php
index 25a1e4df26..683f94c0e1 100644
--- a/civicrm/CRM/Contribute/Form/UpdateBilling.php
+++ b/civicrm/CRM/Contribute/Form/UpdateBilling.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Form/UpdateSubscription.php b/civicrm/CRM/Contribute/Form/UpdateSubscription.php
index dc332d3618..a6837c5cdc 100644
--- a/civicrm/CRM/Contribute/Form/UpdateSubscription.php
+++ b/civicrm/CRM/Contribute/Form/UpdateSubscription.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Import/Controller.php b/civicrm/CRM/Contribute/Import/Controller.php
index 2e2f9ae042..0cb1b2a11e 100644
--- a/civicrm/CRM/Contribute/Import/Controller.php
+++ b/civicrm/CRM/Contribute/Import/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Import_Controller extends CRM_Core_Controller {
diff --git a/civicrm/CRM/Contribute/Import/Field.php b/civicrm/CRM/Contribute/Import/Field.php
index 6aaf46ad36..4f4080046a 100644
--- a/civicrm/CRM/Contribute/Import/Field.php
+++ b/civicrm/CRM/Contribute/Import/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Import_Field {
diff --git a/civicrm/CRM/Contribute/Import/Form/DataSource.php b/civicrm/CRM/Contribute/Import/Form/DataSource.php
index 009ea1b259..ec0c6d1e35 100644
--- a/civicrm/CRM/Contribute/Import/Form/DataSource.php
+++ b/civicrm/CRM/Contribute/Import/Form/DataSource.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Import/Form/MapField.php b/civicrm/CRM/Contribute/Import/Form/MapField.php
index d8ca305e0a..4c68992b6c 100644
--- a/civicrm/CRM/Contribute/Import/Form/MapField.php
+++ b/civicrm/CRM/Contribute/Import/Form/MapField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Import/Form/Preview.php b/civicrm/CRM/Contribute/Import/Form/Preview.php
index a0317e44fc..28c078add2 100644
--- a/civicrm/CRM/Contribute/Import/Form/Preview.php
+++ b/civicrm/CRM/Contribute/Import/Form/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Import/Form/Summary.php b/civicrm/CRM/Contribute/Import/Form/Summary.php
index 4c05bf95d3..ee580e7f4f 100644
--- a/civicrm/CRM/Contribute/Import/Form/Summary.php
+++ b/civicrm/CRM/Contribute/Import/Form/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Import/Parser.php b/civicrm/CRM/Contribute/Import/Parser.php
index ba7be327fe..ea3ee32695 100644
--- a/civicrm/CRM/Contribute/Import/Parser.php
+++ b/civicrm/CRM/Contribute/Import/Parser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
diff --git a/civicrm/CRM/Contribute/Import/Parser/Contribution.php b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
index e7bd85efdd..de86b842c3 100644
--- a/civicrm/CRM/Contribute/Import/Parser/Contribution.php
+++ b/civicrm/CRM/Contribute/Import/Parser/Contribution.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Info.php b/civicrm/CRM/Contribute/Info.php
index f479887f8e..29fa1b5ab4 100644
--- a/civicrm/CRM/Contribute/Info.php
+++ b/civicrm/CRM/Contribute/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* abstract class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Info extends CRM_Core_Component_Info {
diff --git a/civicrm/CRM/Contribute/Page/ContributionPage.php b/civicrm/CRM/Contribute/Page/ContributionPage.php
index b82b485e0a..bfc2e236fb 100644
--- a/civicrm/CRM/Contribute/Page/ContributionPage.php
+++ b/civicrm/CRM/Contribute/Page/ContributionPage.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Page/ContributionRecur.php b/civicrm/CRM/Contribute/Page/ContributionRecur.php
index 7071b5cb77..c8313f0a03 100644
--- a/civicrm/CRM/Contribute/Page/ContributionRecur.php
+++ b/civicrm/CRM/Contribute/Page/ContributionRecur.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Page/DashBoard.php b/civicrm/CRM/Contribute/Page/DashBoard.php
index 03a45021d9..60b6e8b7de 100644
--- a/civicrm/CRM/Contribute/Page/DashBoard.php
+++ b/civicrm/CRM/Contribute/Page/DashBoard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Page/ManagePremiums.php b/civicrm/CRM/Contribute/Page/ManagePremiums.php
index 3483d36c74..1b8ae1a62c 100644
--- a/civicrm/CRM/Contribute/Page/ManagePremiums.php
+++ b/civicrm/CRM/Contribute/Page/ManagePremiums.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Page/PaymentInfo.php b/civicrm/CRM/Contribute/Page/PaymentInfo.php
index 016d4a89d5..9975748dc8 100644
--- a/civicrm/CRM/Contribute/Page/PaymentInfo.php
+++ b/civicrm/CRM/Contribute/Page/PaymentInfo.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Page_PaymentInfo extends CRM_Core_Page {
public function preProcess() {
@@ -53,16 +53,14 @@ class CRM_Contribute_Page_PaymentInfo extends CRM_Core_Page {
}
/**
- * This function takes care of all the things common to all
- * pages. This typically involves assigning the appropriate
+ * Run page.
+ *
+ * This typically involves assigning the appropriate
* smarty variable :)
*
* @return string
* The content generated by running this page
*/
- /**
- * @return string
- */
public function run() {
$this->preProcess();
if ($this->_action) {
diff --git a/civicrm/CRM/Contribute/Page/Premium.php b/civicrm/CRM/Contribute/Page/Premium.php
index 22f2e16aa9..525f3e623c 100644
--- a/civicrm/CRM/Contribute/Page/Premium.php
+++ b/civicrm/CRM/Contribute/Page/Premium.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Page/SubscriptionStatus.php b/civicrm/CRM/Contribute/Page/SubscriptionStatus.php
index 834d9d64d5..873ec6928f 100644
--- a/civicrm/CRM/Contribute/Page/SubscriptionStatus.php
+++ b/civicrm/CRM/Contribute/Page/SubscriptionStatus.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Page_SubscriptionStatus extends CRM_Core_Page {
diff --git a/civicrm/CRM/Contribute/Page/Tab.php b/civicrm/CRM/Contribute/Page/Tab.php
index e7ee1f2cfd..a5d0ad071f 100644
--- a/civicrm/CRM/Contribute/Page/Tab.php
+++ b/civicrm/CRM/Contribute/Page/Tab.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Page_Tab extends CRM_Core_Page {
diff --git a/civicrm/CRM/Contribute/Page/UserDashboard.php b/civicrm/CRM/Contribute/Page/UserDashboard.php
index b255854d0c..05f2b6dc99 100644
--- a/civicrm/CRM/Contribute/Page/UserDashboard.php
+++ b/civicrm/CRM/Contribute/Page/UserDashboard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_Page_UserDashboard extends CRM_Contact_Page_View_UserDashBoard {
diff --git a/civicrm/CRM/Contribute/PseudoConstant.php b/civicrm/CRM/Contribute/PseudoConstant.php
index 975be0c6d7..f5f79750b5 100644
--- a/civicrm/CRM/Contribute/PseudoConstant.php
+++ b/civicrm/CRM/Contribute/PseudoConstant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Selector/Search.php b/civicrm/CRM/Contribute/Selector/Search.php
index ef60698c88..91cec687be 100644
--- a/civicrm/CRM/Contribute/Selector/Search.php
+++ b/civicrm/CRM/Contribute/Selector/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/StateMachine/Contribution.php b/civicrm/CRM/Contribute/StateMachine/Contribution.php
index 086846f728..b363c25d05 100644
--- a/civicrm/CRM/Contribute/StateMachine/Contribution.php
+++ b/civicrm/CRM/Contribute/StateMachine/Contribution.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/StateMachine/ContributionPage.php b/civicrm/CRM/Contribute/StateMachine/ContributionPage.php
index 063f390d22..25a0b889e9 100644
--- a/civicrm/CRM/Contribute/StateMachine/ContributionPage.php
+++ b/civicrm/CRM/Contribute/StateMachine/ContributionPage.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/StateMachine/Search.php b/civicrm/CRM/Contribute/StateMachine/Search.php
index 2480d432a5..d0951b69b1 100644
--- a/civicrm/CRM/Contribute/StateMachine/Search.php
+++ b/civicrm/CRM/Contribute/StateMachine/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Contribute_StateMachine_Search extends CRM_Core_StateMachine {
diff --git a/civicrm/CRM/Contribute/Task.php b/civicrm/CRM/Contribute/Task.php
index fae3005e3c..25edbc0c9a 100644
--- a/civicrm/CRM/Contribute/Task.php
+++ b/civicrm/CRM/Contribute/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Contribute/Tokens.php b/civicrm/CRM/Contribute/Tokens.php
index ad9972f5c9..d199af8a37 100644
--- a/civicrm/CRM/Contribute/Tokens.php
+++ b/civicrm/CRM/Contribute/Tokens.php
@@ -4,7 +4,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Action.php b/civicrm/CRM/Core/Action.php
index 6a82e0e81e..6deb2799b2 100644
--- a/civicrm/CRM/Core/Action.php
+++ b/civicrm/CRM/Core/Action.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* and similar across all objects (thus providing both reuse and standards)
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/ActionLog.php b/civicrm/CRM/Core/BAO/ActionLog.php
index ab44d5573d..4033e482cf 100644
--- a/civicrm/CRM/Core/BAO/ActionLog.php
+++ b/civicrm/CRM/Core/BAO/ActionLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/ActionSchedule.php b/civicrm/CRM/Core/BAO/ActionSchedule.php
index 88cf6f61a9..09d5998093 100644
--- a/civicrm/CRM/Core/BAO/ActionSchedule.php
+++ b/civicrm/CRM/Core/BAO/ActionSchedule.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/Address.php b/civicrm/CRM/Core/BAO/Address.php
index 14367b8a03..0cd1448e5a 100644
--- a/civicrm/CRM/Core/BAO/Address.php
+++ b/civicrm/CRM/Core/BAO/Address.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/Block.php b/civicrm/CRM/Core/BAO/Block.php
index fc57b538ed..4f09025f15 100644
--- a/civicrm/CRM/Core/BAO/Block.php
+++ b/civicrm/CRM/Core/BAO/Block.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Add static functions to include some common functionality used across location sub object BAO classes.
*/
diff --git a/civicrm/CRM/Core/BAO/CMSUser.php b/civicrm/CRM/Core/BAO/CMSUser.php
index dd45a5a82c..88e9b40c8a 100644
--- a/civicrm/CRM/Core/BAO/CMSUser.php
+++ b/civicrm/CRM/Core/BAO/CMSUser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/Cache.php b/civicrm/CRM/Core/BAO/Cache.php
index 3652934971..6f9874fac7 100644
--- a/civicrm/CRM/Core/BAO/Cache.php
+++ b/civicrm/CRM/Core/BAO/Cache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/BAO/ConfigSetting.php b/civicrm/CRM/Core/BAO/ConfigSetting.php
index 4f239044c7..e2a708c3dc 100644
--- a/civicrm/CRM/Core/BAO/ConfigSetting.php
+++ b/civicrm/CRM/Core/BAO/ConfigSetting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/Country.php b/civicrm/CRM/Core/BAO/Country.php
index 0b0bc21de0..9a311cd7e5 100644
--- a/civicrm/CRM/Core/BAO/Country.php
+++ b/civicrm/CRM/Core/BAO/Country.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/CustomField.php b/civicrm/CRM/Core/BAO/CustomField.php
index a562a1c1d4..50cf7d067e 100644
--- a/civicrm/CRM/Core/BAO/CustomField.php
+++ b/civicrm/CRM/Core/BAO/CustomField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -1635,11 +1635,11 @@ SELECT id
// rename this file to go into the secure directory only if
// user has uploaded new file not existing verfied on the basis of $fileID
- if (!$fileID && !rename($fName, $config->customFileUploadDir . $filename)) {
+ if (empty($fileID) && !rename($fName, $config->customFileUploadDir . $filename)) {
CRM_Core_Error::statusBounce(ts('Could not move custom file to custom upload directory'));
}
- if ($customValueId && !$fileID) {
+ if ($customValueId && empty($fileID)) {
$query = "
SELECT $columnName
FROM $tableName
diff --git a/civicrm/CRM/Core/BAO/CustomGroup.php b/civicrm/CRM/Core/BAO/CustomGroup.php
index fba9745c92..c8d2e8d600 100644
--- a/civicrm/CRM/Core/BAO/CustomGroup.php
+++ b/civicrm/CRM/Core/BAO/CustomGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/CustomOption.php b/civicrm/CRM/Core/BAO/CustomOption.php
index 4f2bc05dc7..e0b87dd24a 100644
--- a/civicrm/CRM/Core/BAO/CustomOption.php
+++ b/civicrm/CRM/Core/BAO/CustomOption.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/CustomQuery.php b/civicrm/CRM/Core/BAO/CustomQuery.php
index 12cbfaa4a6..c2a1db9f51 100644
--- a/civicrm/CRM/Core/BAO/CustomQuery.php
+++ b/civicrm/CRM/Core/BAO/CustomQuery.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_BAO_CustomQuery {
const PREFIX = 'custom_value_';
diff --git a/civicrm/CRM/Core/BAO/CustomValue.php b/civicrm/CRM/Core/BAO/CustomValue.php
index 482a173581..a6a856b305 100644
--- a/civicrm/CRM/Core/BAO/CustomValue.php
+++ b/civicrm/CRM/Core/BAO/CustomValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/CustomValueTable.php b/civicrm/CRM/Core/BAO/CustomValueTable.php
index 985fa51596..aecb546b1b 100644
--- a/civicrm/CRM/Core/BAO/CustomValueTable.php
+++ b/civicrm/CRM/Core/BAO/CustomValueTable.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/Dashboard.php b/civicrm/CRM/Core/BAO/Dashboard.php
index c8df7cbdc7..5759ae679d 100644
--- a/civicrm/CRM/Core/BAO/Dashboard.php
+++ b/civicrm/CRM/Core/BAO/Dashboard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/Discount.php b/civicrm/CRM/Core/BAO/Discount.php
index 5e464bef6d..6469b355a2 100644
--- a/civicrm/CRM/Core/BAO/Discount.php
+++ b/civicrm/CRM/Core/BAO/Discount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/Domain.php b/civicrm/CRM/Core/BAO/Domain.php
index ffc1709fae..806407568c 100644
--- a/civicrm/CRM/Core/BAO/Domain.php
+++ b/civicrm/CRM/Core/BAO/Domain.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/Email.php b/civicrm/CRM/Core/BAO/Email.php
index 0226f588ed..cbdf43d981 100644
--- a/civicrm/CRM/Core/BAO/Email.php
+++ b/civicrm/CRM/Core/BAO/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/EntityTag.php b/civicrm/CRM/Core/BAO/EntityTag.php
index 449bbb6779..4ecdded214 100644
--- a/civicrm/CRM/Core/BAO/EntityTag.php
+++ b/civicrm/CRM/Core/BAO/EntityTag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This class contains functions for managing Tag(tag) for a contact
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
diff --git a/civicrm/CRM/Core/BAO/Extension.php b/civicrm/CRM/Core/BAO/Extension.php
index c2347fc240..ebcec012a6 100644
--- a/civicrm/CRM/Core/BAO/Extension.php
+++ b/civicrm/CRM/Core/BAO/Extension.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/File.php b/civicrm/CRM/Core/BAO/File.php
index 97210ef52c..7104b416a9 100644
--- a/civicrm/CRM/Core/BAO/File.php
+++ b/civicrm/CRM/Core/BAO/File.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/FinancialTrxn.php b/civicrm/CRM/Core/BAO/FinancialTrxn.php
index 90eb7a056f..d05ce54f94 100644
--- a/civicrm/CRM/Core/BAO/FinancialTrxn.php
+++ b/civicrm/CRM/Core/BAO/FinancialTrxn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/IM.php b/civicrm/CRM/Core/BAO/IM.php
index 30e8a58b97..572a8962db 100644
--- a/civicrm/CRM/Core/BAO/IM.php
+++ b/civicrm/CRM/Core/BAO/IM.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/Job.php b/civicrm/CRM/Core/BAO/Job.php
index cf3583b5b3..e0e663f5d4 100644
--- a/civicrm/CRM/Core/BAO/Job.php
+++ b/civicrm/CRM/Core/BAO/Job.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: $
*
*/
diff --git a/civicrm/CRM/Core/BAO/LabelFormat.php b/civicrm/CRM/Core/BAO/LabelFormat.php
index 6aafb678ab..d6c8800f4b 100644
--- a/civicrm/CRM/Core/BAO/LabelFormat.php
+++ b/civicrm/CRM/Core/BAO/LabelFormat.php
@@ -29,7 +29,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/Location.php b/civicrm/CRM/Core/BAO/Location.php
index f527f9b6b4..c44431dd4c 100644
--- a/civicrm/CRM/Core/BAO/Location.php
+++ b/civicrm/CRM/Core/BAO/Location.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/LocationType.php b/civicrm/CRM/Core/BAO/LocationType.php
index 0d6d0e5ef5..0f2f2fb0e7 100644
--- a/civicrm/CRM/Core/BAO/LocationType.php
+++ b/civicrm/CRM/Core/BAO/LocationType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/Log.php b/civicrm/CRM/Core/BAO/Log.php
index 87a695f092..8e669e900f 100644
--- a/civicrm/CRM/Core/BAO/Log.php
+++ b/civicrm/CRM/Core/BAO/Log.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/MailSettings.php b/civicrm/CRM/Core/BAO/MailSettings.php
index 4644b79fe8..4fc3cb2d90 100644
--- a/civicrm/CRM/Core/BAO/MailSettings.php
+++ b/civicrm/CRM/Core/BAO/MailSettings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/Mapping.php b/civicrm/CRM/Core/BAO/Mapping.php
index 270c86408f..3c8494b642 100644
--- a/civicrm/CRM/Core/BAO/Mapping.php
+++ b/civicrm/CRM/Core/BAO/Mapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
@@ -597,7 +597,7 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
$relationshipType->id = $id;
if ($relationshipType->find(TRUE)) {
$direction = "contact_sub_type_$second";
- $target_type = 'contact_type_' . $second;
+ $target_type = 'contact_type_' . $second;
if (isset($relationshipType->$direction)) {
$relatedFields = array_merge((array) $relatedMapperFields[$relationshipType->$direction], (array) $relationshipCustomFields);
}
diff --git a/civicrm/CRM/Core/BAO/MessageTemplate.php b/civicrm/CRM/Core/BAO/MessageTemplate.php
index 3f6e7a7114..b2ee6bded4 100644
--- a/civicrm/CRM/Core/BAO/MessageTemplate.php
+++ b/civicrm/CRM/Core/BAO/MessageTemplate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'Mail/mime.php';
diff --git a/civicrm/CRM/Core/BAO/Navigation.php b/civicrm/CRM/Core/BAO/Navigation.php
index 0a5c7da17a..08c345ef25 100644
--- a/civicrm/CRM/Core/BAO/Navigation.php
+++ b/civicrm/CRM/Core/BAO/Navigation.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation {
diff --git a/civicrm/CRM/Core/BAO/Note.php b/civicrm/CRM/Core/BAO/Note.php
index da068241b6..14432a8b9a 100644
--- a/civicrm/CRM/Core/BAO/Note.php
+++ b/civicrm/CRM/Core/BAO/Note.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/OpenID.php b/civicrm/CRM/Core/BAO/OpenID.php
index a3f4abb688..d563605f77 100644
--- a/civicrm/CRM/Core/BAO/OpenID.php
+++ b/civicrm/CRM/Core/BAO/OpenID.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/OptionGroup.php b/civicrm/CRM/Core/BAO/OptionGroup.php
index 64c496cf50..9a72f90042 100644
--- a/civicrm/CRM/Core/BAO/OptionGroup.php
+++ b/civicrm/CRM/Core/BAO/OptionGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/OptionValue.php b/civicrm/CRM/Core/BAO/OptionValue.php
index 6386676f99..9eabbf380c 100644
--- a/civicrm/CRM/Core/BAO/OptionValue.php
+++ b/civicrm/CRM/Core/BAO/OptionValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue {
diff --git a/civicrm/CRM/Core/BAO/PaperSize.php b/civicrm/CRM/Core/BAO/PaperSize.php
index 439ef42cd0..eaa673b8fb 100644
--- a/civicrm/CRM/Core/BAO/PaperSize.php
+++ b/civicrm/CRM/Core/BAO/PaperSize.php
@@ -29,7 +29,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/PdfFormat.php b/civicrm/CRM/Core/BAO/PdfFormat.php
index ccdbe4a9f0..d28353a686 100644
--- a/civicrm/CRM/Core/BAO/PdfFormat.php
+++ b/civicrm/CRM/Core/BAO/PdfFormat.php
@@ -29,7 +29,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/Persistent.php b/civicrm/CRM/Core/BAO/Persistent.php
index bd8ca3ba39..af5b64facf 100644
--- a/civicrm/CRM/Core/BAO/Persistent.php
+++ b/civicrm/CRM/Core/BAO/Persistent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/Phone.php b/civicrm/CRM/Core/BAO/Phone.php
index 00c6cdacaf..af12e9b795 100644
--- a/civicrm/CRM/Core/BAO/Phone.php
+++ b/civicrm/CRM/Core/BAO/Phone.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/PreferencesDate.php b/civicrm/CRM/Core/BAO/PreferencesDate.php
index 607206d760..fd015408f3 100644
--- a/civicrm/CRM/Core/BAO/PreferencesDate.php
+++ b/civicrm/CRM/Core/BAO/PreferencesDate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_BAO_PreferencesDate extends CRM_Core_DAO_PreferencesDate {
diff --git a/civicrm/CRM/Core/BAO/PrevNextCache.php b/civicrm/CRM/Core/BAO/PrevNextCache.php
index 17d42affdf..898b9da9fd 100644
--- a/civicrm/CRM/Core/BAO/PrevNextCache.php
+++ b/civicrm/CRM/Core/BAO/PrevNextCache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/RecurringEntity.php b/civicrm/CRM/Core/BAO/RecurringEntity.php
index 3c51e3d332..a200f890f1 100644
--- a/civicrm/CRM/Core/BAO/RecurringEntity.php
+++ b/civicrm/CRM/Core/BAO/RecurringEntity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'packages/When/When.php';
diff --git a/civicrm/CRM/Core/BAO/SchemaHandler.php b/civicrm/CRM/Core/BAO/SchemaHandler.php
index ccba643f80..5e116e96d5 100644
--- a/civicrm/CRM/Core/BAO/SchemaHandler.php
+++ b/civicrm/CRM/Core/BAO/SchemaHandler.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/Setting.php b/civicrm/CRM/Core/BAO/Setting.php
index 0794209bb8..f359e2985a 100644
--- a/civicrm/CRM/Core/BAO/Setting.php
+++ b/civicrm/CRM/Core/BAO/Setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/StatusPreference.php b/civicrm/CRM/Core/BAO/StatusPreference.php
index c416e831b3..b9bfd6b5ff 100644
--- a/civicrm/CRM/Core/BAO/StatusPreference.php
+++ b/civicrm/CRM/Core/BAO/StatusPreference.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/Tag.php b/civicrm/CRM/Core/BAO/Tag.php
index d50477c81b..72de3cb522 100644
--- a/civicrm/CRM/Core/BAO/Tag.php
+++ b/civicrm/CRM/Core/BAO/Tag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/UFField.php b/civicrm/CRM/Core/BAO/UFField.php
index 5d16a50819..ad86d2de9f 100644
--- a/civicrm/CRM/Core/BAO/UFField.php
+++ b/civicrm/CRM/Core/BAO/UFField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/UFGroup.php b/civicrm/CRM/Core/BAO/UFGroup.php
index 6ab0e76dd0..0ecd40dd17 100644
--- a/civicrm/CRM/Core/BAO/UFGroup.php
+++ b/civicrm/CRM/Core/BAO/UFGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -2702,7 +2702,16 @@ AND ( entity_id IS NULL OR entity_id <= 0 )
* @return \CRM_Core_DAO
*/
public static function copy($id) {
- $fieldsFix = array('prefix' => array('title' => ts('Copy of ')));
+ $maxId = CRM_Core_DAO::singleValueQuery("SELECT max(id) FROM civicrm_uf_group");
+
+ $title = ts('[Copy id %1]', array(1 => $maxId + 1));
+ $fieldsFix = array(
+ 'suffix' => array(
+ 'title' => ' ' . $title,
+ 'name' => '__Copy_id_' . ($maxId + 1) . '_',
+ ),
+ );
+
$copy = &CRM_Core_DAO::copyGeneric('CRM_Core_DAO_UFGroup',
array('id' => $id),
NULL,
diff --git a/civicrm/CRM/Core/BAO/UFJoin.php b/civicrm/CRM/Core/BAO/UFJoin.php
index 877db2524b..7b9b0e3532 100644
--- a/civicrm/CRM/Core/BAO/UFJoin.php
+++ b/civicrm/CRM/Core/BAO/UFJoin.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/BAO/UFMatch.php b/civicrm/CRM/Core/BAO/UFMatch.php
index b8b5901ef7..edad2f4906 100644
--- a/civicrm/CRM/Core/BAO/UFMatch.php
+++ b/civicrm/CRM/Core/BAO/UFMatch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/Website.php b/civicrm/CRM/Core/BAO/Website.php
index af12e416a6..29a235241d 100644
--- a/civicrm/CRM/Core/BAO/Website.php
+++ b/civicrm/CRM/Core/BAO/Website.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/BAO/WordReplacement.php b/civicrm/CRM/Core/BAO/WordReplacement.php
index bbe3da3d88..6f880fca6a 100644
--- a/civicrm/CRM/Core/BAO/WordReplacement.php
+++ b/civicrm/CRM/Core/BAO/WordReplacement.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/Base.php b/civicrm/CRM/Core/Base.php
index e755c2a49f..80627a0ef4 100644
--- a/civicrm/CRM/Core/Base.php
+++ b/civicrm/CRM/Core/Base.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* from this class. However it includes a few common files
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Block.php b/civicrm/CRM/Core/Block.php
index c5f168ae07..857698a3f7 100644
--- a/civicrm/CRM/Core/Block.php
+++ b/civicrm/CRM/Core/Block.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/ClassLoader.php b/civicrm/CRM/Core/ClassLoader.php
index 23117ef69e..29af6818ec 100644
--- a/civicrm/CRM/Core/ClassLoader.php
+++ b/civicrm/CRM/Core/ClassLoader.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/CodeGen/Config.php b/civicrm/CRM/Core/CodeGen/Config.php
index 74c7a59fb2..90cb4151fc 100644
--- a/civicrm/CRM/Core/CodeGen/Config.php
+++ b/civicrm/CRM/Core/CodeGen/Config.php
@@ -73,7 +73,6 @@ class CRM_Core_CodeGen_Config extends CRM_Core_CodeGen_BaseTask {
case 'wordpress':
$candidates[] = "../../civicrm.config.php.wordpress";
$candidates[] = "../WordPress/civicrm.config.php.wordpress";
- $candidates[] = "../drupal/civicrm.config.php.drupal";
break;
}
foreach ($candidates as $candidate) {
diff --git a/civicrm/CRM/Core/CommunityMessages.php b/civicrm/CRM/Core/CommunityMessages.php
index 0b2da95059..98c917a30e 100644
--- a/civicrm/CRM/Core/CommunityMessages.php
+++ b/civicrm/CRM/Core/CommunityMessages.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Component.php b/civicrm/CRM/Core/Component.php
index 685dee5400..0cd76fef74 100644
--- a/civicrm/CRM/Core/Component.php
+++ b/civicrm/CRM/Core/Component.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* CiviCRM components
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Component/Info.php b/civicrm/CRM/Core/Component/Info.php
index 05a0689eb2..41e4371aed 100644
--- a/civicrm/CRM/Core/Component/Info.php
+++ b/civicrm/CRM/Core/Component/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* for a component to introduce itself to the system.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Config.php b/civicrm/CRM/Core/Config.php
index 1c0844d306..3d4d587a8f 100644
--- a/civicrm/CRM/Core/Config.php
+++ b/civicrm/CRM/Core/Config.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -32,7 +32,7 @@
* The default values in general, should reflect production values (minimizes chances of screwing up)
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'Log.php';
diff --git a/civicrm/CRM/Core/Config/MagicMerge.php b/civicrm/CRM/Core/Config/MagicMerge.php
index e748cf299f..16923909c7 100644
--- a/civicrm/CRM/Core/Config/MagicMerge.php
+++ b/civicrm/CRM/Core/Config/MagicMerge.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Config/Runtime.php b/civicrm/CRM/Core/Config/Runtime.php
index b6e4ee13c6..babca61bc6 100644
--- a/civicrm/CRM/Core/Config/Runtime.php
+++ b/civicrm/CRM/Core/Config/Runtime.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Controller.php b/civicrm/CRM/Core/Controller.php
index 736406d1a2..73b08a5c48 100644
--- a/civicrm/CRM/Core/Controller.php
+++ b/civicrm/CRM/Core/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -38,7 +38,7 @@
* for other useful tips and suggestions
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'HTML/QuickForm/Controller.php';
diff --git a/civicrm/CRM/Core/Controller/Simple.php b/civicrm/CRM/Core/Controller/Simple.php
index e53b7d3efa..2c080769c1 100644
--- a/civicrm/CRM/Core/Controller/Simple.php
+++ b/civicrm/CRM/Core/Controller/Simple.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -32,7 +32,7 @@
* process
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
class CRM_Core_Controller_Simple extends CRM_Core_Controller {
diff --git a/civicrm/CRM/Core/DAO.php b/civicrm/CRM/Core/DAO.php
index c7a4013533..dc987eb6cd 100644
--- a/civicrm/CRM/Core/DAO.php
+++ b/civicrm/CRM/Core/DAO.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Our base DAO class. All DAO classes should inherit from this class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'PEAR.php';
@@ -2560,4 +2560,24 @@ SELECT contact_id
return $clauses;
}
+ /**
+ * function to check valid db name containing only characters in [0-9,a-z,A-Z_]
+ *
+ * @param $database
+ *
+ * @return bool
+ */
+ public static function requireValidDBName($database) {
+ $matches = array();
+ preg_match(
+ "/^[0-9]*[a-zA-Z_]+[a-zA-Z0-9_]*$/",
+ $database,
+ $matches
+ );
+ if (empty($matches)) {
+ return FALSE;
+ }
+ return TRUE;
+ }
+
}
diff --git a/civicrm/CRM/Core/DAO/ActionLog.php b/civicrm/CRM/Core/DAO/ActionLog.php
index 2c8584784f..f07066344c 100644
--- a/civicrm/CRM/Core/DAO/ActionLog.php
+++ b/civicrm/CRM/Core/DAO/ActionLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/ActionLog.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/ActionMapping.php b/civicrm/CRM/Core/DAO/ActionMapping.php
index 208122a4e2..ce7278e36a 100644
--- a/civicrm/CRM/Core/DAO/ActionMapping.php
+++ b/civicrm/CRM/Core/DAO/ActionMapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/ActionMapping.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/ActionSchedule.php b/civicrm/CRM/Core/DAO/ActionSchedule.php
index 16cf1f1125..c262712d10 100644
--- a/civicrm/CRM/Core/DAO/ActionSchedule.php
+++ b/civicrm/CRM/Core/DAO/ActionSchedule.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/ActionSchedule.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Address.php b/civicrm/CRM/Core/DAO/Address.php
index b45a657e9a..4a6e178c82 100644
--- a/civicrm/CRM/Core/DAO/Address.php
+++ b/civicrm/CRM/Core/DAO/Address.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Address.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/AddressFormat.php b/civicrm/CRM/Core/DAO/AddressFormat.php
index 90220b01ea..f8cd6e37b7 100644
--- a/civicrm/CRM/Core/DAO/AddressFormat.php
+++ b/civicrm/CRM/Core/DAO/AddressFormat.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/AddressFormat.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/AllCoreTables.php b/civicrm/CRM/Core/DAO/AllCoreTables.php
index 50afd0b510..d1afb1810d 100644
--- a/civicrm/CRM/Core/DAO/AllCoreTables.php
+++ b/civicrm/CRM/Core/DAO/AllCoreTables.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/DAO/Cache.php b/civicrm/CRM/Core/DAO/Cache.php
index 8b5254c1bb..7d4dbd1bca 100644
--- a/civicrm/CRM/Core/DAO/Cache.php
+++ b/civicrm/CRM/Core/DAO/Cache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Cache.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Component.php b/civicrm/CRM/Core/DAO/Component.php
index c4e5d50490..eb4afbc49d 100644
--- a/civicrm/CRM/Core/DAO/Component.php
+++ b/civicrm/CRM/Core/DAO/Component.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Component.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Country.php b/civicrm/CRM/Core/DAO/Country.php
index fa2ac1b85f..d891c0ebf1 100644
--- a/civicrm/CRM/Core/DAO/Country.php
+++ b/civicrm/CRM/Core/DAO/Country.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Country.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/County.php b/civicrm/CRM/Core/DAO/County.php
index 2a60ed4e4f..5d692bdac9 100644
--- a/civicrm/CRM/Core/DAO/County.php
+++ b/civicrm/CRM/Core/DAO/County.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/County.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/CustomField.php b/civicrm/CRM/Core/DAO/CustomField.php
index c9fd4d87be..af8be62030 100644
--- a/civicrm/CRM/Core/DAO/CustomField.php
+++ b/civicrm/CRM/Core/DAO/CustomField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/CustomField.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/CustomGroup.php b/civicrm/CRM/Core/DAO/CustomGroup.php
index e6cbf1ba2e..4b1398bea1 100644
--- a/civicrm/CRM/Core/DAO/CustomGroup.php
+++ b/civicrm/CRM/Core/DAO/CustomGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/CustomGroup.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Dashboard.php b/civicrm/CRM/Core/DAO/Dashboard.php
index 25d2250802..daca8cc6cd 100644
--- a/civicrm/CRM/Core/DAO/Dashboard.php
+++ b/civicrm/CRM/Core/DAO/Dashboard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Dashboard.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Discount.php b/civicrm/CRM/Core/DAO/Discount.php
index 7de3cb7edc..a3d3b5d0eb 100644
--- a/civicrm/CRM/Core/DAO/Discount.php
+++ b/civicrm/CRM/Core/DAO/Discount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Discount.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Domain.php b/civicrm/CRM/Core/DAO/Domain.php
index d3b1972866..59e07f4e2b 100644
--- a/civicrm/CRM/Core/DAO/Domain.php
+++ b/civicrm/CRM/Core/DAO/Domain.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Domain.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Email.php b/civicrm/CRM/Core/DAO/Email.php
index d0b20ac0c5..6950c18ada 100644
--- a/civicrm/CRM/Core/DAO/Email.php
+++ b/civicrm/CRM/Core/DAO/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Email.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/EntityFile.php b/civicrm/CRM/Core/DAO/EntityFile.php
index 541e5e89d8..a1cbd0d9ba 100644
--- a/civicrm/CRM/Core/DAO/EntityFile.php
+++ b/civicrm/CRM/Core/DAO/EntityFile.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/EntityFile.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/EntityTag.php b/civicrm/CRM/Core/DAO/EntityTag.php
index 8e40935720..7da39f36ba 100644
--- a/civicrm/CRM/Core/DAO/EntityTag.php
+++ b/civicrm/CRM/Core/DAO/EntityTag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/EntityTag.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Extension.php b/civicrm/CRM/Core/DAO/Extension.php
index 35eafdaec3..36c601b42a 100644
--- a/civicrm/CRM/Core/DAO/Extension.php
+++ b/civicrm/CRM/Core/DAO/Extension.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Extension.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/File.php b/civicrm/CRM/Core/DAO/File.php
index 7654902e4a..f68c48ffc6 100644
--- a/civicrm/CRM/Core/DAO/File.php
+++ b/civicrm/CRM/Core/DAO/File.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/File.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/IM.php b/civicrm/CRM/Core/DAO/IM.php
index a2fc153696..f43f8f40d4 100644
--- a/civicrm/CRM/Core/DAO/IM.php
+++ b/civicrm/CRM/Core/DAO/IM.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/IM.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Job.php b/civicrm/CRM/Core/DAO/Job.php
index 118dadd047..d989d195ff 100644
--- a/civicrm/CRM/Core/DAO/Job.php
+++ b/civicrm/CRM/Core/DAO/Job.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Job.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/JobLog.php b/civicrm/CRM/Core/DAO/JobLog.php
index 98ce9b9219..fb3b9d62f9 100644
--- a/civicrm/CRM/Core/DAO/JobLog.php
+++ b/civicrm/CRM/Core/DAO/JobLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/JobLog.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/LocBlock.php b/civicrm/CRM/Core/DAO/LocBlock.php
index d3209ce25f..09d3e0ce3a 100644
--- a/civicrm/CRM/Core/DAO/LocBlock.php
+++ b/civicrm/CRM/Core/DAO/LocBlock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/LocBlock.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/LocationType.php b/civicrm/CRM/Core/DAO/LocationType.php
index 6daf5d0db3..4f539079f4 100644
--- a/civicrm/CRM/Core/DAO/LocationType.php
+++ b/civicrm/CRM/Core/DAO/LocationType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/LocationType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Log.php b/civicrm/CRM/Core/DAO/Log.php
index 9d8db45bd7..73757453a4 100644
--- a/civicrm/CRM/Core/DAO/Log.php
+++ b/civicrm/CRM/Core/DAO/Log.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Log.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/MailSettings.php b/civicrm/CRM/Core/DAO/MailSettings.php
index 98027c55c1..4f9f26180f 100644
--- a/civicrm/CRM/Core/DAO/MailSettings.php
+++ b/civicrm/CRM/Core/DAO/MailSettings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/MailSettings.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Managed.php b/civicrm/CRM/Core/DAO/Managed.php
index 52a1df4be5..baacfd004b 100644
--- a/civicrm/CRM/Core/DAO/Managed.php
+++ b/civicrm/CRM/Core/DAO/Managed.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Managed.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Mapping.php b/civicrm/CRM/Core/DAO/Mapping.php
index 0a2745ad01..174e081ecb 100644
--- a/civicrm/CRM/Core/DAO/Mapping.php
+++ b/civicrm/CRM/Core/DAO/Mapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Mapping.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/MappingField.php b/civicrm/CRM/Core/DAO/MappingField.php
index 8e2c6c9b5d..852c8f9774 100644
--- a/civicrm/CRM/Core/DAO/MappingField.php
+++ b/civicrm/CRM/Core/DAO/MappingField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/MappingField.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Menu.php b/civicrm/CRM/Core/DAO/Menu.php
index 21a1c1bd10..a91db5586e 100644
--- a/civicrm/CRM/Core/DAO/Menu.php
+++ b/civicrm/CRM/Core/DAO/Menu.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Menu.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/MessageTemplate.php b/civicrm/CRM/Core/DAO/MessageTemplate.php
index 15da32c60a..260902e982 100644
--- a/civicrm/CRM/Core/DAO/MessageTemplate.php
+++ b/civicrm/CRM/Core/DAO/MessageTemplate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/MessageTemplate.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Navigation.php b/civicrm/CRM/Core/DAO/Navigation.php
index bfddc81600..25a67877f6 100644
--- a/civicrm/CRM/Core/DAO/Navigation.php
+++ b/civicrm/CRM/Core/DAO/Navigation.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Navigation.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Note.php b/civicrm/CRM/Core/DAO/Note.php
index b5ea44d824..300f051582 100644
--- a/civicrm/CRM/Core/DAO/Note.php
+++ b/civicrm/CRM/Core/DAO/Note.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Note.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/OpenID.php b/civicrm/CRM/Core/DAO/OpenID.php
index 334e35a701..833aac9e4d 100644
--- a/civicrm/CRM/Core/DAO/OpenID.php
+++ b/civicrm/CRM/Core/DAO/OpenID.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/OpenID.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/OptionGroup.php b/civicrm/CRM/Core/DAO/OptionGroup.php
index cdf2f22d13..6a7c936b65 100644
--- a/civicrm/CRM/Core/DAO/OptionGroup.php
+++ b/civicrm/CRM/Core/DAO/OptionGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/OptionGroup.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/OptionValue.php b/civicrm/CRM/Core/DAO/OptionValue.php
index 82d765cb67..6915875d11 100644
--- a/civicrm/CRM/Core/DAO/OptionValue.php
+++ b/civicrm/CRM/Core/DAO/OptionValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/OptionValue.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
@@ -239,7 +239,7 @@ class CRM_Core_DAO_OptionValue extends CRM_Core_DAO
'title' => ts('Option Label') ,
'description' => 'Option string as displayed to users - e.g. the label in an HTML OPTION tag.',
'required' => true,
- 'maxlength' => 255,
+ 'maxlength' => 512,
'size' => CRM_Utils_Type::HUGE,
) ,
'value' => array(
diff --git a/civicrm/CRM/Core/DAO/Persistent.php b/civicrm/CRM/Core/DAO/Persistent.php
index b51a20448a..dc12612bbf 100644
--- a/civicrm/CRM/Core/DAO/Persistent.php
+++ b/civicrm/CRM/Core/DAO/Persistent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Persistent.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Phone.php b/civicrm/CRM/Core/DAO/Phone.php
index 228fc2a79d..149d596f9e 100644
--- a/civicrm/CRM/Core/DAO/Phone.php
+++ b/civicrm/CRM/Core/DAO/Phone.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Phone.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/PreferencesDate.php b/civicrm/CRM/Core/DAO/PreferencesDate.php
index 8c5b18bfe0..236e8b895b 100644
--- a/civicrm/CRM/Core/DAO/PreferencesDate.php
+++ b/civicrm/CRM/Core/DAO/PreferencesDate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/PreferencesDate.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/PrevNextCache.php b/civicrm/CRM/Core/DAO/PrevNextCache.php
index be2a043a77..c5fd5a5719 100644
--- a/civicrm/CRM/Core/DAO/PrevNextCache.php
+++ b/civicrm/CRM/Core/DAO/PrevNextCache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/PrevNextCache.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/PrintLabel.php b/civicrm/CRM/Core/DAO/PrintLabel.php
index d02b1121bc..8ed6571f2e 100644
--- a/civicrm/CRM/Core/DAO/PrintLabel.php
+++ b/civicrm/CRM/Core/DAO/PrintLabel.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/PrintLabel.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/RecurringEntity.php b/civicrm/CRM/Core/DAO/RecurringEntity.php
index 4e37e9b3cf..df7d13e7e2 100644
--- a/civicrm/CRM/Core/DAO/RecurringEntity.php
+++ b/civicrm/CRM/Core/DAO/RecurringEntity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/RecurringEntity.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Setting.php b/civicrm/CRM/Core/DAO/Setting.php
index 95a1867711..431a4ebafa 100644
--- a/civicrm/CRM/Core/DAO/Setting.php
+++ b/civicrm/CRM/Core/DAO/Setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Setting.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/StateProvince.php b/civicrm/CRM/Core/DAO/StateProvince.php
index 4591032d62..e25e61a072 100644
--- a/civicrm/CRM/Core/DAO/StateProvince.php
+++ b/civicrm/CRM/Core/DAO/StateProvince.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/StateProvince.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/StatusPreference.php b/civicrm/CRM/Core/DAO/StatusPreference.php
index 59c5e9244b..09d9f9f549 100644
--- a/civicrm/CRM/Core/DAO/StatusPreference.php
+++ b/civicrm/CRM/Core/DAO/StatusPreference.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/StatusPreference.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/SystemLog.php b/civicrm/CRM/Core/DAO/SystemLog.php
index 42ccffea7d..2548b5c4dc 100644
--- a/civicrm/CRM/Core/DAO/SystemLog.php
+++ b/civicrm/CRM/Core/DAO/SystemLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/SystemLog.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Tag.php b/civicrm/CRM/Core/DAO/Tag.php
index eabcc356d2..3909c99f24 100644
--- a/civicrm/CRM/Core/DAO/Tag.php
+++ b/civicrm/CRM/Core/DAO/Tag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Tag.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Timezone.php b/civicrm/CRM/Core/DAO/Timezone.php
index 17e494cc50..74917fd2a2 100644
--- a/civicrm/CRM/Core/DAO/Timezone.php
+++ b/civicrm/CRM/Core/DAO/Timezone.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Timezone.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/UFField.php b/civicrm/CRM/Core/DAO/UFField.php
index 16e74be050..947cf22fd8 100644
--- a/civicrm/CRM/Core/DAO/UFField.php
+++ b/civicrm/CRM/Core/DAO/UFField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/UFField.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/UFGroup.php b/civicrm/CRM/Core/DAO/UFGroup.php
index 8689721a44..b7cc6af3ec 100644
--- a/civicrm/CRM/Core/DAO/UFGroup.php
+++ b/civicrm/CRM/Core/DAO/UFGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/UFGroup.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/UFJoin.php b/civicrm/CRM/Core/DAO/UFJoin.php
index de1502c361..24edafbf7e 100644
--- a/civicrm/CRM/Core/DAO/UFJoin.php
+++ b/civicrm/CRM/Core/DAO/UFJoin.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/UFJoin.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/UFMatch.php b/civicrm/CRM/Core/DAO/UFMatch.php
index 690e705beb..db39e82e5f 100644
--- a/civicrm/CRM/Core/DAO/UFMatch.php
+++ b/civicrm/CRM/Core/DAO/UFMatch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/UFMatch.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Website.php b/civicrm/CRM/Core/DAO/Website.php
index 48a6bbeeb8..6b5c6407c1 100644
--- a/civicrm/CRM/Core/DAO/Website.php
+++ b/civicrm/CRM/Core/DAO/Website.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Website.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/WordReplacement.php b/civicrm/CRM/Core/DAO/WordReplacement.php
index 413842da3b..5e47558ec8 100644
--- a/civicrm/CRM/Core/DAO/WordReplacement.php
+++ b/civicrm/CRM/Core/DAO/WordReplacement.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/WordReplacement.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/Worldregion.php b/civicrm/CRM/Core/DAO/Worldregion.php
index 23d4feac27..c4a7c0a8e3 100644
--- a/civicrm/CRM/Core/DAO/Worldregion.php
+++ b/civicrm/CRM/Core/DAO/Worldregion.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Core/Worldregion.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/DAO/permissions.php b/civicrm/CRM/Core/DAO/permissions.php
index 33ca4dc6b7..03e6c2f25f 100644
--- a/civicrm/CRM/Core/DAO/permissions.php
+++ b/civicrm/CRM/Core/DAO/permissions.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Error.php b/civicrm/CRM/Core/Error.php
index a2c0b4390b..7614a1b355 100644
--- a/civicrm/CRM/Core/Error.php
+++ b/civicrm/CRM/Core/Error.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* PEAR_ErrorStack and use that framework
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'PEAR/ErrorStack.php';
@@ -183,15 +183,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
}
// create the error array
- $error = array();
- $error['callback'] = $pearError->getCallback();
- $error['code'] = $pearError->getCode();
- $error['message'] = $pearError->getMessage();
- $error['mode'] = $pearError->getMode();
- $error['debug_info'] = $pearError->getDebugInfo();
- $error['type'] = $pearError->getType();
- $error['user_info'] = $pearError->getUserInfo();
- $error['to_string'] = $pearError->toString();
+ $error = self::getErrorDetails($pearError);
// We access connection info via _DB_DATAOBJECT instead
// of, e.g., calling getDatabaseConnection(), so that we
@@ -259,6 +251,26 @@ class CRM_Core_Error extends PEAR_ErrorStack {
*/
public static function simpleHandler($pearError) {
+ $error = self::getErrorDetails($pearError);
+
+ // ensure that debug does not check permissions since we are in bootstrap
+ // mode and need to print a decent message to help the user
+ CRM_Core_Error::debug('Initialization Error', $error, TRUE, TRUE, FALSE);
+
+ // always log the backtrace to a file
+ self::backtrace('backTrace', TRUE);
+
+ exit(0);
+ }
+
+ /**
+ * this function is used to return error details
+ *
+ * @param $pearError
+ *
+ * @return array $error
+ */
+ public static function getErrorDetails($pearError) {
// create the error array
$error = array();
$error['callback'] = $pearError->getCallback();
@@ -270,14 +282,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
$error['user_info'] = $pearError->getUserInfo();
$error['to_string'] = $pearError->toString();
- // ensure that debug does not check permissions since we are in bootstrap
- // mode and need to print a decent message to help the user
- CRM_Core_Error::debug('Initialization Error', $error, TRUE, TRUE, FALSE);
-
- // always log the backtrace to a file
- self::backtrace('backTrace', TRUE);
-
- exit(0);
+ return $error;
}
/**
@@ -891,6 +896,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
* @throws PEAR_Exception
*/
public static function exceptionHandler($pearError) {
+ CRM_Core_Error::debug_var('Fatal Error Details', self::getErrorDetails($pearError));
CRM_Core_Error::backtrace('backTrace', TRUE);
throw new PEAR_Exception($pearError->getMessage(), $pearError);
}
diff --git a/civicrm/CRM/Core/Error/Log.php b/civicrm/CRM/Core/Error/Log.php
index 8ad77bb59d..481b3c1255 100644
--- a/civicrm/CRM/Core/Error/Log.php
+++ b/civicrm/CRM/Core/Error/Log.php
@@ -4,7 +4,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Exception.php b/civicrm/CRM/Core/Exception.php
index b80536dc8d..a547b527c4 100644
--- a/civicrm/CRM/Core/Exception.php
+++ b/civicrm/CRM/Core/Exception.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Form.php b/civicrm/CRM/Core/Form.php
index 87542685e4..266f82ba53 100644
--- a/civicrm/CRM/Core/Form.php
+++ b/civicrm/CRM/Core/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* machine. Each form can also operate in various modes
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'HTML/QuickForm/Page.php';
diff --git a/civicrm/CRM/Core/Form/Date.php b/civicrm/CRM/Core/Form/Date.php
index 7ce9c362d1..78d9df288b 100644
--- a/civicrm/CRM/Core/Form/Date.php
+++ b/civicrm/CRM/Core/Form/Date.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_Form_Date {
diff --git a/civicrm/CRM/Core/Form/RecurringEntity.php b/civicrm/CRM/Core/Form/RecurringEntity.php
index 7ef0ea19a7..012b1c255a 100644
--- a/civicrm/CRM/Core/Form/RecurringEntity.php
+++ b/civicrm/CRM/Core/Form/RecurringEntity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/Form/Renderer.php b/civicrm/CRM/Core/Form/Renderer.php
index 6ea326b8c1..47ee1534c6 100644
--- a/civicrm/CRM/Core/Form/Renderer.php
+++ b/civicrm/CRM/Core/Form/Renderer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -125,8 +125,13 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
$date .= ($element->getAttribute('timeformat')) ? " $time" : '';
$el['html'] = $date . '<input type="hidden" value="' . $element->getValue() . '" name="' . $element->getAttribute('name') . '">';
}
-
- $el['html'] = '<span class="crm-frozen-field">' . $el['html'] . '</span>';
+ if ($el['name'] == 'details') {
+ $el['html'] = str_replace('<br />', '', $el['html']);
+ $el['html'] = '<span class="crm-frozen-field">' . html_entity_decode($el['html']) . '</span>';
+ }
+ else {
+ $el['html'] = '<span class="crm-frozen-field">' . $el['html'] . '</span>';
+ }
}
// Active form elements
else {
diff --git a/civicrm/CRM/Core/Form/Search.php b/civicrm/CRM/Core/Form/Search.php
index 74bbb33c45..9156abd7b2 100644
--- a/civicrm/CRM/Core/Form/Search.php
+++ b/civicrm/CRM/Core/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Form/ShortCode.php b/civicrm/CRM/Core/Form/ShortCode.php
index 1c4a8c5aa2..1b0de4bd55 100644
--- a/civicrm/CRM/Core/Form/ShortCode.php
+++ b/civicrm/CRM/Core/Form/ShortCode.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/Form/Tag.php b/civicrm/CRM/Core/Form/Tag.php
index ffc6e187db..2a0183e59c 100644
--- a/civicrm/CRM/Core/Form/Tag.php
+++ b/civicrm/CRM/Core/Form/Tag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/HTMLInputCoder.php b/civicrm/CRM/Core/HTMLInputCoder.php
index d9aa01d2c2..dd28a34b97 100644
--- a/civicrm/CRM/Core/HTMLInputCoder.php
+++ b/civicrm/CRM/Core/HTMLInputCoder.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/I18n.php b/civicrm/CRM/Core/I18n.php
index 61a932ef56..67960dff0c 100644
--- a/civicrm/CRM/Core/I18n.php
+++ b/civicrm/CRM/Core/I18n.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_I18n {
diff --git a/civicrm/CRM/Core/I18n/Form.php b/civicrm/CRM/Core/I18n/Form.php
index 5f19d632c4..6cbb7859ed 100644
--- a/civicrm/CRM/Core/I18n/Form.php
+++ b/civicrm/CRM/Core/I18n/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/NativeGettext.php b/civicrm/CRM/Core/I18n/NativeGettext.php
index f10050237e..c80b244cac 100644
--- a/civicrm/CRM/Core/I18n/NativeGettext.php
+++ b/civicrm/CRM/Core/I18n/NativeGettext.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
* Convenience class for PHP-Gettext compatibility.
diff --git a/civicrm/CRM/Core/I18n/PseudoConstant.php b/civicrm/CRM/Core/I18n/PseudoConstant.php
index 91d850fef0..e9a99f078f 100644
--- a/civicrm/CRM/Core/I18n/PseudoConstant.php
+++ b/civicrm/CRM/Core/I18n/PseudoConstant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/Schema.php b/civicrm/CRM/Core/I18n/Schema.php
index c77f0faf54..c51bcb07fe 100644
--- a/civicrm/CRM/Core/I18n/Schema.php
+++ b/civicrm/CRM/Core/I18n/Schema.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_I18n_Schema {
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure.php b/civicrm/CRM/Core/I18n/SchemaStructure.php
index 5dc30ba50d..c2e97f7ffd 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from schema_structure.tpl
* DO NOT EDIT. Generated by CRM_Core_CodeGen
@@ -98,7 +98,7 @@ class CRM_Core_I18n_SchemaStructure
'help_post' => "text",
) ,
'civicrm_option_value' => array(
- 'label' => "varchar(255)",
+ 'label' => "varchar(512)",
'description' => "text",
) ,
'civicrm_group' => array(
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_2_2_0.php b/civicrm/CRM/Core/I18n/SchemaStructure_2_2_0.php
index eef906bcb7..5213e2c3cf 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_2_2_0.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_2_2_0.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_0_alpha1.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_0_alpha1.php
index c3a23c0ef4..ad1f34d5c4 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_0_alpha1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_0_alpha1.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_0_beta1.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_0_beta1.php
index 9f03aa696a..ae6cafe86d 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_0_beta1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_0_beta1.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_0_beta4.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_0_beta4.php
index 53c3ec472d..bed38ed66d 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_0_beta4.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_0_beta4.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_1_alpha1.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_1_alpha1.php
index 63eafc746d..e88e501330 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_1_alpha1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_1_alpha1.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_1_beta2.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_1_beta2.php
index 24a188b7ba..87afed611e 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_1_beta2.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_1_beta2.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_2_beta4.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_2_beta4.php
index d1fb1c53e1..b5a21d9a79 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_2_beta4.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_2_beta4.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_3_beta1.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_3_beta1.php
index d76b4237f9..e3a3d14bcd 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_3_beta1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_3_beta1.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_4_0.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_4_0.php
index e20eb71a17..e301b46cbf 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_4_0.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_4_0.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_4_beta2.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_4_beta2.php
index 6e2affd907..c86c184ba3 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_4_beta2.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_4_beta2.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_3_4_beta3.php b/civicrm/CRM/Core/I18n/SchemaStructure_3_4_beta3.php
index 4829defb96..23dc69bc3c 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_3_4_beta3.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_3_4_beta3.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_1_0.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_1_0.php
index f849bed82e..b92715099e 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_1_0.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_1_0.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_1_alpha1.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_1_alpha1.php
index 942f3464c7..6d311e0e01 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_1_alpha1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_1_alpha1.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php
index 4e35059e04..73a972ca56 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php
index e5e9b80d6e..8b29ef928b 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php
index a1a50749a8..79b7e0789a 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from schema_structure.tpl
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php
index f1ceeea12f..8a95563d32 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from schema_structure.tpl
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php b/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php
index 1b48b1b473..f69a1951a5 100644
--- a/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php
+++ b/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from schema_structure.tpl
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Core/IDS.php b/civicrm/CRM/Core/IDS.php
index 85180ef6be..93c37e5db9 100644
--- a/civicrm/CRM/Core/IDS.php
+++ b/civicrm/CRM/Core/IDS.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_IDS {
@@ -58,7 +58,8 @@ class CRM_Core_IDS {
*/
public function check(&$args) {
// lets bypass a few civicrm urls from this check
- static $skip = array('civicrm/admin/setting/updateConfigBackend', 'civicrm/admin/messageTemplates');
+ $skip = array('civicrm/admin/setting/updateConfigBackend', 'civicrm/admin/messageTemplates');
+ CRM_Utils_Hook::idsException($skip);
$path = implode('/', $args);
if (in_array($path, $skip)) {
return NULL;
diff --git a/civicrm/CRM/Core/InnoDBIndexer.php b/civicrm/CRM/Core/InnoDBIndexer.php
index 12f5ecd914..88d9195ae0 100644
--- a/civicrm/CRM/Core/InnoDBIndexer.php
+++ b/civicrm/CRM/Core/InnoDBIndexer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Invoke.php b/civicrm/CRM/Core/Invoke.php
index 0c3dbd4233..35158067b8 100644
--- a/civicrm/CRM/Core/Invoke.php
+++ b/civicrm/CRM/Core/Invoke.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* Serves as a wrapper between the UserFrameWork and Core CRM
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/JobManager.php b/civicrm/CRM/Core/JobManager.php
index c6b0335715..c9853d5b19 100644
--- a/civicrm/CRM/Core/JobManager.php
+++ b/civicrm/CRM/Core/JobManager.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* by every scheduled job (cron task) in CiviCRM.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_JobManager {
diff --git a/civicrm/CRM/Core/Joomla.php b/civicrm/CRM/Core/Joomla.php
index 5d3330d7e4..3919a213f9 100644
--- a/civicrm/CRM/Core/Joomla.php
+++ b/civicrm/CRM/Core/Joomla.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/Key.php b/civicrm/CRM/Core/Key.php
index af82575886..1818dce1fe 100644
--- a/civicrm/CRM/Core/Key.php
+++ b/civicrm/CRM/Core/Key.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Lock.php b/civicrm/CRM/Core/Lock.php
index b594e0b0ef..9b4a418ac1 100644
--- a/civicrm/CRM/Core/Lock.php
+++ b/civicrm/CRM/Core/Lock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Menu.php b/civicrm/CRM/Core/Menu.php
index e45e737cfe..e100d996c9 100644
--- a/civicrm/CRM/Core/Menu.php
+++ b/civicrm/CRM/Core/Menu.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This file contains the various menus of the CiviCRM module
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'CRM/Core/I18n.php';
diff --git a/civicrm/CRM/Core/Module.php b/civicrm/CRM/Core/Module.php
index 861c41f7f3..9b824f8720 100644
--- a/civicrm/CRM/Core/Module.php
+++ b/civicrm/CRM/Core/Module.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* a Joomla Plugin.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/OptionGroup.php b/civicrm/CRM/Core/OptionGroup.php
index 55efe9cfd2..c286e9dfc6 100644
--- a/civicrm/CRM/Core/OptionGroup.php
+++ b/civicrm/CRM/Core/OptionGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_OptionGroup {
static $_values = array();
diff --git a/civicrm/CRM/Core/OptionValue.php b/civicrm/CRM/Core/OptionValue.php
index f0ea310aed..fc96a9b783 100644
--- a/civicrm/CRM/Core/OptionValue.php
+++ b/civicrm/CRM/Core/OptionValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_OptionValue {
diff --git a/civicrm/CRM/Core/Page.php b/civicrm/CRM/Core/Page.php
index 37979b198d..a60d276c51 100644
--- a/civicrm/CRM/Core/Page.php
+++ b/civicrm/CRM/Core/Page.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/Page/AJAX.php b/civicrm/CRM/Core/Page/AJAX.php
index 95fc8566de..09ca9d0cf1 100644
--- a/civicrm/CRM/Core/Page/AJAX.php
+++ b/civicrm/CRM/Core/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Page/AJAX/Attachment.php b/civicrm/CRM/Core/Page/AJAX/Attachment.php
index 743e977cee..169cb5159a 100644
--- a/civicrm/CRM/Core/Page/AJAX/Attachment.php
+++ b/civicrm/CRM/Core/Page/AJAX/Attachment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Page/AJAX/Location.php b/civicrm/CRM/Core/Page/AJAX/Location.php
index b0d13d58bc..403f1c4e91 100644
--- a/civicrm/CRM/Core/Page/AJAX/Location.php
+++ b/civicrm/CRM/Core/Page/AJAX/Location.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
*/
diff --git a/civicrm/CRM/Core/Page/Basic.php b/civicrm/CRM/Core/Page/Basic.php
index ab495448de..e3c0c4cd3b 100644
--- a/civicrm/CRM/Core/Page/Basic.php
+++ b/civicrm/CRM/Core/Page/Basic.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
abstract class CRM_Core_Page_Basic extends CRM_Core_Page {
diff --git a/civicrm/CRM/Core/Page/File.php b/civicrm/CRM/Core/Page/File.php
index 52aa2d12bc..b0632cf9be 100644
--- a/civicrm/CRM/Core/Page/File.php
+++ b/civicrm/CRM/Core/Page/File.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Page/Inline/Help.php b/civicrm/CRM/Core/Page/Inline/Help.php
index 908da4a77b..9c7d1ce212 100644
--- a/civicrm/CRM/Core/Page/Inline/Help.php
+++ b/civicrm/CRM/Core/Page/Inline/Help.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Page/RecurringEntityPreview.php b/civicrm/CRM/Core/Page/RecurringEntityPreview.php
index d4254459b6..d86ea35d71 100644
--- a/civicrm/CRM/Core/Page/RecurringEntityPreview.php
+++ b/civicrm/CRM/Core/Page/RecurringEntityPreview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_Page_RecurringEntityPreview extends CRM_Core_Page {
diff --git a/civicrm/CRM/Core/Payment.php b/civicrm/CRM/Core/Payment.php
index 2a94c7276d..69a831f620 100644
--- a/civicrm/CRM/Core/Payment.php
+++ b/civicrm/CRM/Core/Payment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
index 3ac7b77042..f8aa7340f0 100644
--- a/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/civicrm/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
diff --git a/civicrm/CRM/Core/Payment/BaseIPN.php b/civicrm/CRM/Core/Payment/BaseIPN.php
index b47cd68726..150c897e64 100644
--- a/civicrm/CRM/Core/Payment/BaseIPN.php
+++ b/civicrm/CRM/Core/Payment/BaseIPN.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Payment/Form.php b/civicrm/CRM/Core/Payment/Form.php
index 410e820b6f..bafe1ae2a6 100644
--- a/civicrm/CRM/Core/Payment/Form.php
+++ b/civicrm/CRM/Core/Payment/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Class for constructing the payment processor block.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_Payment_Form {
diff --git a/civicrm/CRM/Core/Payment/Manual.php b/civicrm/CRM/Core/Payment/Manual.php
index f72423bc1c..1072f34010 100644
--- a/civicrm/CRM/Core/Payment/Manual.php
+++ b/civicrm/CRM/Core/Payment/Manual.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_Payment_Manual extends CRM_Core_Payment {
diff --git a/civicrm/CRM/Core/Payment/PayPalIPN.php b/civicrm/CRM/Core/Payment/PayPalIPN.php
index 371ba571a3..c540473676 100644
--- a/civicrm/CRM/Core/Payment/PayPalIPN.php
+++ b/civicrm/CRM/Core/Payment/PayPalIPN.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -321,11 +321,17 @@ class CRM_Core_Payment_PayPalIPN extends CRM_Core_Payment_BaseIPN {
$ids['onbehalf_dupe_alert'] = self::retrieve('onBehalfDupeAlert', 'Integer', 'GET', FALSE);
}
- $paymentProcessorID = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_PaymentProcessorType',
- 'PayPal_Standard', 'id', 'name'
+ $processorParams = array(
+ 'user_name' => self::retrieve('receiver_email', 'String', 'POST', FALSE),
+ 'payment_processor_type_id' => CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_PaymentProcessorType', 'PayPal_Standard', 'id', 'name'),
+ 'is_test' => empty($input['is_test']) ? 0 : 1,
);
+ $processorInfo = array();
+ if (!CRM_Financial_BAO_PaymentProcessor::retrieve($processorParams, $processorInfo)) {
+ return FALSE;
+ }
- if (!$this->validateData($input, $ids, $objects, TRUE, $paymentProcessorID)) {
+ if (!$this->validateData($input, $ids, $objects, TRUE, $processorInfo['id'])) {
return FALSE;
}
diff --git a/civicrm/CRM/Core/Payment/PayPalImpl.php b/civicrm/CRM/Core/Payment/PayPalImpl.php
index c4d904927d..77b057ab69 100644
--- a/civicrm/CRM/Core/Payment/PayPalImpl.php
+++ b/civicrm/CRM/Core/Payment/PayPalImpl.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@ use Civi\Payment\Exception\PaymentProcessorException;
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/Payment/PayPalProIPN.php b/civicrm/CRM/Core/Payment/PayPalProIPN.php
index efde8f24db..28ffe41443 100644
--- a/civicrm/CRM/Core/Payment/PayPalProIPN.php
+++ b/civicrm/CRM/Core/Payment/PayPalProIPN.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN {
diff --git a/civicrm/CRM/Core/Payment/ProcessorForm.php b/civicrm/CRM/Core/Payment/ProcessorForm.php
index f33d98ae19..5e140c2457 100644
--- a/civicrm/CRM/Core/Payment/ProcessorForm.php
+++ b/civicrm/CRM/Core/Payment/ProcessorForm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@ use Civi\Payment\System;
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
diff --git a/civicrm/CRM/Core/Permission.php b/civicrm/CRM/Core/Permission.php
index 300efaec8e..a0210146e5 100644
--- a/civicrm/CRM/Core/Permission.php
+++ b/civicrm/CRM/Core/Permission.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/Backdrop.php b/civicrm/CRM/Core/Permission/Backdrop.php
index fdf979459d..0f126e8daf 100644
--- a/civicrm/CRM/Core/Permission/Backdrop.php
+++ b/civicrm/CRM/Core/Permission/Backdrop.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/Base.php b/civicrm/CRM/Core/Permission/Base.php
index c687962f2e..333e0d9d2c 100644
--- a/civicrm/CRM/Core/Permission/Base.php
+++ b/civicrm/CRM/Core/Permission/Base.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/Drupal.php b/civicrm/CRM/Core/Permission/Drupal.php
index 31b6d66ccc..6f2de9079d 100644
--- a/civicrm/CRM/Core/Permission/Drupal.php
+++ b/civicrm/CRM/Core/Permission/Drupal.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/Drupal6.php b/civicrm/CRM/Core/Permission/Drupal6.php
index 2189530235..dd70a79bbc 100644
--- a/civicrm/CRM/Core/Permission/Drupal6.php
+++ b/civicrm/CRM/Core/Permission/Drupal6.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/Drupal8.php b/civicrm/CRM/Core/Permission/Drupal8.php
index 58b9cae7ad..5d8da45f3f 100644
--- a/civicrm/CRM/Core/Permission/Drupal8.php
+++ b/civicrm/CRM/Core/Permission/Drupal8.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/DrupalBase.php b/civicrm/CRM/Core/Permission/DrupalBase.php
index 398b44a666..3221e869cd 100644
--- a/civicrm/CRM/Core/Permission/DrupalBase.php
+++ b/civicrm/CRM/Core/Permission/DrupalBase.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/Joomla.php b/civicrm/CRM/Core/Permission/Joomla.php
index 7af4562bac..0f24fc16c9 100644
--- a/civicrm/CRM/Core/Permission/Joomla.php
+++ b/civicrm/CRM/Core/Permission/Joomla.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/Soap.php b/civicrm/CRM/Core/Permission/Soap.php
index ccd78dc6e9..a8d79883a4 100644
--- a/civicrm/CRM/Core/Permission/Soap.php
+++ b/civicrm/CRM/Core/Permission/Soap.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/Temp.php b/civicrm/CRM/Core/Permission/Temp.php
index 319dd8bf97..2f710449d3 100644
--- a/civicrm/CRM/Core/Permission/Temp.php
+++ b/civicrm/CRM/Core/Permission/Temp.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/UnitTests.php b/civicrm/CRM/Core/Permission/UnitTests.php
index 2aeef5d22e..dafb7068db 100644
--- a/civicrm/CRM/Core/Permission/UnitTests.php
+++ b/civicrm/CRM/Core/Permission/UnitTests.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Permission/WordPress.php b/civicrm/CRM/Core/Permission/WordPress.php
index 4de5a0e539..2acf610136 100644
--- a/civicrm/CRM/Core/Permission/WordPress.php
+++ b/civicrm/CRM/Core/Permission/WordPress.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/PseudoConstant.php b/civicrm/CRM/Core/PseudoConstant.php
index 509a3ea29d..be78d7111f 100644
--- a/civicrm/CRM/Core/PseudoConstant.php
+++ b/civicrm/CRM/Core/PseudoConstant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -43,7 +43,7 @@
* This provides greater consistency/predictability after flushing.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_PseudoConstant {
@@ -252,7 +252,10 @@ class CRM_Core_PseudoConstant {
// if callback is specified..
if (!empty($pseudoconstant['callback'])) {
- return call_user_func(Civi\Core\Resolver::singleton()->get($pseudoconstant['callback']));
+ $fieldOptions = call_user_func(Civi\Core\Resolver::singleton()->get($pseudoconstant['callback']));
+ //CRM-18223: Allow additions to field options via hook.
+ CRM_Utils_Hook::fieldOptions($entity, $fieldName, $fieldOptions, $params);
+ return $fieldOptions;
}
// Merge params with schema defaults
diff --git a/civicrm/CRM/Core/QuickForm/Action.php b/civicrm/CRM/Core/QuickForm/Action.php
index 7a89506e80..5a666e58d8 100644
--- a/civicrm/CRM/Core/QuickForm/Action.php
+++ b/civicrm/CRM/Core/QuickForm/Action.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* integrated with the StateMachine, Controller and State objects
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'HTML/QuickForm/Action.php';
diff --git a/civicrm/CRM/Core/QuickForm/Action/Back.php b/civicrm/CRM/Core/QuickForm/Action/Back.php
index 9efddba2ab..faa08df2cf 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Back.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Back.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the back action.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_QuickForm_Action_Back extends CRM_Core_QuickForm_Action {
diff --git a/civicrm/CRM/Core/QuickForm/Action/Cancel.php b/civicrm/CRM/Core/QuickForm/Action/Cancel.php
index 5b1729c5fa..a897a382e4 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Cancel.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Cancel.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the cancel action
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_QuickForm_Action_Cancel extends CRM_Core_QuickForm_Action {
diff --git a/civicrm/CRM/Core/QuickForm/Action/Display.php b/civicrm/CRM/Core/QuickForm/Action/Display.php
index 3d1fb00782..88a2c34d14 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Display.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Display.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the display action.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_QuickForm_Action_Display extends CRM_Core_QuickForm_Action {
diff --git a/civicrm/CRM/Core/QuickForm/Action/Done.php b/civicrm/CRM/Core/QuickForm/Action/Done.php
index f7ce6cc43a..b532a74bd2 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Done.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Done.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the back action.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_QuickForm_Action_Done extends CRM_Core_QuickForm_Action {
diff --git a/civicrm/CRM/Core/QuickForm/Action/Jump.php b/civicrm/CRM/Core/QuickForm/Action/Jump.php
index 96bff1e5e7..9848e45271 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Jump.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Jump.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the jump action.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/QuickForm/Action/Next.php b/civicrm/CRM/Core/QuickForm/Action/Next.php
index bb07625fbb..031a68f677 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Next.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Next.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the next action.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/QuickForm/Action/Process.php b/civicrm/CRM/Core/QuickForm/Action/Process.php
index 8c84865d11..a53fab884a 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Process.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Process.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the process action.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/QuickForm/Action/Refresh.php b/civicrm/CRM/Core/QuickForm/Action/Refresh.php
index f21b222ff3..24ceb2e23a 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Refresh.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Refresh.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the refresh action.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/QuickForm/Action/Reload.php b/civicrm/CRM/Core/QuickForm/Action/Reload.php
index 413e69a2a3..e5ae23c4f3 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Reload.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Reload.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -32,7 +32,7 @@
* module integration.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_QuickForm_Action_Reload extends CRM_Core_QuickForm_Action {
diff --git a/civicrm/CRM/Core/QuickForm/Action/Submit.php b/civicrm/CRM/Core/QuickForm/Action/Submit.php
index 4f913401a6..090614cda5 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Submit.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Submit.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the submit action.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/QuickForm/Action/Upload.php b/civicrm/CRM/Core/QuickForm/Action/Upload.php
index 61770ea208..f4fe6105bd 100644
--- a/civicrm/CRM/Core/QuickForm/Action/Upload.php
+++ b/civicrm/CRM/Core/QuickForm/Action/Upload.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Redefine the upload action.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
class CRM_Core_QuickForm_Action_Upload extends CRM_Core_QuickForm_Action {
diff --git a/civicrm/CRM/Core/Report/Excel.php b/civicrm/CRM/Core/Report/Excel.php
index d92b42539c..36a94089be 100644
--- a/civicrm/CRM/Core/Report/Excel.php
+++ b/civicrm/CRM/Core/Report/Excel.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Resources.php b/civicrm/CRM/Core/Resources.php
index e835324de0..83cb73686e 100644
--- a/civicrm/CRM/Core/Resources.php
+++ b/civicrm/CRM/Core/Resources.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -37,7 +37,7 @@
* should incorporte services for aggregation, minimization, etc.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Resources/Strings.php b/civicrm/CRM/Core/Resources/Strings.php
index 3f1e8bf198..22bd8b915b 100644
--- a/civicrm/CRM/Core/Resources/Strings.php
+++ b/civicrm/CRM/Core/Resources/Strings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -23,13 +23,13 @@
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
-*/
+ */
/**
* Manage translatable strings on behalf of resource files.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
class CRM_Core_Resources_Strings {
@@ -107,4 +107,5 @@ class CRM_Core_Resources_Strings {
throw new Exception("Cannot extract strings: Unrecognized file type.");
}
}
+
}
diff --git a/civicrm/CRM/Core/ScheduledJob.php b/civicrm/CRM/Core/ScheduledJob.php
index a90d0dabc8..502a08bdef 100644
--- a/civicrm/CRM/Core/ScheduledJob.php
+++ b/civicrm/CRM/Core/ScheduledJob.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* by every scheduled job (cron task) in CiviCRM.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/SelectValues.php b/civicrm/CRM/Core/SelectValues.php
index fd89fae817..dc37e86cc2 100644
--- a/civicrm/CRM/Core/SelectValues.php
+++ b/civicrm/CRM/Core/SelectValues.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* smart caching scheme on a per domain basis
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Selector/API.php b/civicrm/CRM/Core/Selector/API.php
index 382236e82a..30d8fda7c9 100644
--- a/civicrm/CRM/Core/Selector/API.php
+++ b/civicrm/CRM/Core/Selector/API.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -34,7 +34,7 @@
* supported right now, XML support will be added as and when needed
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
interface CRM_Core_Selector_API {
diff --git a/civicrm/CRM/Core/Selector/Base.php b/civicrm/CRM/Core/Selector/Base.php
index 0800e57626..625261f23e 100644
--- a/civicrm/CRM/Core/Selector/Base.php
+++ b/civicrm/CRM/Core/Selector/Base.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -32,7 +32,7 @@
* and display names
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Selector/Controller.php b/civicrm/CRM/Core/Selector/Controller.php
index f73673f948..fd7f3f0261 100644
--- a/civicrm/CRM/Core/Selector/Controller.php
+++ b/civicrm/CRM/Core/Selector/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -35,7 +35,7 @@
* implement the Selector/Api.interface.php class
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Session.php b/civicrm/CRM/Core/Session.php
index dfb0f219e7..8919654be3 100644
--- a/civicrm/CRM/Core/Session.php
+++ b/civicrm/CRM/Core/Session.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/ShowHideBlocks.php b/civicrm/CRM/Core/ShowHideBlocks.php
index e1a14a4682..1f4819cdae 100644
--- a/civicrm/CRM/Core/ShowHideBlocks.php
+++ b/civicrm/CRM/Core/ShowHideBlocks.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_ShowHideBlocks {
diff --git a/civicrm/CRM/Core/Smarty.php b/civicrm/CRM/Core/Smarty.php
index edc321d6d2..40b2a91e85 100644
--- a/civicrm/CRM/Core/Smarty.php
+++ b/civicrm/CRM/Core/Smarty.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.crmButton.php b/civicrm/CRM/Core/Smarty/plugins/block.crmButton.php
index df14d23b24..45ed29b734 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.crmButton.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.crmButton.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.edit.php b/civicrm/CRM/Core/Smarty/plugins/block.edit.php
index 69c382d707..2b6d9ffad5 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.edit.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.edit.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -34,7 +34,7 @@
* @package CRM
* @author Piotr Szotkowski <shot@caltha.pl>
* @author Michal Mach <mover@artnet.org>
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.htxt.php b/civicrm/CRM/Core/Smarty/plugins/block.htxt.php
index b618d80d58..efb52622f2 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.htxt.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.htxt.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* CiviCRM's Smarty gettext plugin
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.localize.php b/civicrm/CRM/Core/Smarty/plugins/block.localize.php
index 07e15ae939..b132191335 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.localize.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.localize.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.serialize.php b/civicrm/CRM/Core/Smarty/plugins/block.serialize.php
index 60f2435ee7..f470d7b220 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.serialize.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.serialize.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
*
* @package CRM
* @author Donald Lobo <lobo@civicrm.org>
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/block.ts.php b/civicrm/CRM/Core/Smarty/plugins/block.ts.php
index d5460eee40..aaf4be2f6a 100644
--- a/civicrm/CRM/Core/Smarty/plugins/block.ts.php
+++ b/civicrm/CRM/Core/Smarty/plugins/block.ts.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* @package CRM
* @author Piotr Szotkowski <shot@caltha.pl>
* @author Michal Mach <mover@artnet.org>
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php b/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php
index c259b15717..bbbd57cda5 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmAttributes.php b/civicrm/CRM/Core/Smarty/plugins/function.crmAttributes.php
index b40a19c391..a1a975756b 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmAttributes.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmAttributes.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -23,7 +23,7 @@
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
-*/
+ */
/**
*
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmCrudLink.php b/civicrm/CRM/Core/Smarty/plugins/function.crmCrudLink.php
index c7282f30b6..3b1867ef7f 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmCrudLink.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmCrudLink.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmDBTpl.php b/civicrm/CRM/Core/Smarty/plugins/function.crmDBTpl.php
index cbfed5a6e6..155a12c161 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmDBTpl.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmDBTpl.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmGetAttribute.php b/civicrm/CRM/Core/Smarty/plugins/function.crmGetAttribute.php
index 2bad59954a..96fb5c2d0f 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmGetAttribute.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmGetAttribute.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmKey.php b/civicrm/CRM/Core/Smarty/plugins/function.crmKey.php
index bcd7253f71..4de3ff8b21 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmKey.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmKey.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmNavigationMenu.php b/civicrm/CRM/Core/Smarty/plugins/function.crmNavigationMenu.php
index 1e0b84f9ff..32da5f8efd 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmNavigationMenu.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmNavigationMenu.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmResPath.php b/civicrm/CRM/Core/Smarty/plugins/function.crmResPath.php
index 257797ab23..12c5d93b96 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmResPath.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmResPath.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmResURL.php b/civicrm/CRM/Core/Smarty/plugins/function.crmResURL.php
index ca956df29a..7a5d37a356 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmResURL.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmResURL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmScript.php b/civicrm/CRM/Core/Smarty/plugins/function.crmScript.php
index 716a8a941d..8874aade5f 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmScript.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmScript.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmSetting.php b/civicrm/CRM/Core/Smarty/plugins/function.crmSetting.php
index 7af91a9485..75c2ca29a0 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmSetting.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmSetting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmSigner.php b/civicrm/CRM/Core/Smarty/plugins/function.crmSigner.php
index 15ee224ea7..3563cda798 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmSigner.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmSigner.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php b/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php
index 483f88b9f4..6485f2ec04 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmStyle.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.crmVersion.php b/civicrm/CRM/Core/Smarty/plugins/function.crmVersion.php
index 5e170b3fff..2b7be3526a 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.crmVersion.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.crmVersion.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.docURL.php b/civicrm/CRM/Core/Smarty/plugins/function.docURL.php
index 5b4870f413..f217afce86 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.docURL.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.docURL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.help.php b/civicrm/CRM/Core/Smarty/plugins/function.help.php
index ea063037ca..7ed288c676 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.help.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.help.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.isValueChange.php b/civicrm/CRM/Core/Smarty/plugins/function.isValueChange.php
index d3a7141475..33fd1d8876 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.isValueChange.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.isValueChange.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -32,7 +32,7 @@
*
* @package CRM
* @author Allen Shaw <allen@nswebsolutions.com>
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/function.sectionTotal.php b/civicrm/CRM/Core/Smarty/plugins/function.sectionTotal.php
index aa96b812ed..51d3297fe7 100644
--- a/civicrm/CRM/Core/Smarty/plugins/function.sectionTotal.php
+++ b/civicrm/CRM/Core/Smarty/plugins/function.sectionTotal.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -32,7 +32,7 @@
*
* @package CRM
* @author Allen Shaw <allen@nswebsolutions.com>
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmAddClass.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmAddClass.php
index c750e64c17..372fbb4476 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmAddClass.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmAddClass.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmBtnType.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmBtnType.php
index 4b5fabb77f..ef0c9fcc7c 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmBtnType.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmBtnType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php
index e16ba4cd01..9ac25f29fe 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDelete.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDelete.php
index a2ca4ff8d5..9d96d63363 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmDelete.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmDelete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmFirstWord.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmFirstWord.php
index 462b29fb39..604da23e84 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmFirstWord.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmFirstWord.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalDate.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalDate.php
index 7f3126a7fb..076a4e7385 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalDate.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalDate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: modifier.crmICalDate.php 45499 2013-02-08 12:31:05Z kurund $
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalText.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalText.php
index ecbd8c6e82..ba233cc9e6 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalText.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmICalText.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: modifier.crmICalText.php 45499 2013-02-08 12:31:05Z kurund $
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmInsert.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmInsert.php
index e45178d409..89cc010e75 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmInsert.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmInsert.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmMoney.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmMoney.php
index 11d30f5a6f..5ceb1a245d 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmMoney.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmMoney.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php
index 74e5a74247..5734a5958e 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmReplace.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmReplace.php
index 615907b005..fa9d125b10 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmReplace.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmReplace.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.crmStripAlternatives.php b/civicrm/CRM/Core/Smarty/plugins/modifier.crmStripAlternatives.php
index 9201294417..668a48354a 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.crmStripAlternatives.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.crmStripAlternatives.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.htmlize.php b/civicrm/CRM/Core/Smarty/plugins/modifier.htmlize.php
index 786884773f..5c32e0d570 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.htmlize.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.htmlize.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.json.php b/civicrm/CRM/Core/Smarty/plugins/modifier.json.php
index 3f7e60228e..c8a7291c6b 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.json.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.json.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.mb_truncate.php b/civicrm/CRM/Core/Smarty/plugins/modifier.mb_truncate.php
index 9cbd11cda0..400336b3a8 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.mb_truncate.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.mb_truncate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/plugins/modifier.substring.php b/civicrm/CRM/Core/Smarty/plugins/modifier.substring.php
index 97730af507..e84a7b6f08 100644
--- a/civicrm/CRM/Core/Smarty/plugins/modifier.substring.php
+++ b/civicrm/CRM/Core/Smarty/plugins/modifier.substring.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Smarty/resources/String.php b/civicrm/CRM/Core/Smarty/resources/String.php
index e6c9a959a4..2447832781 100644
--- a/civicrm/CRM/Core/Smarty/resources/String.php
+++ b/civicrm/CRM/Core/Smarty/resources/String.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
* @param $tpl_name
diff --git a/civicrm/CRM/Core/State.php b/civicrm/CRM/Core/State.php
index 78a5de4917..2f1d0635dd 100644
--- a/civicrm/CRM/Core/State.php
+++ b/civicrm/CRM/Core/State.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -32,7 +32,7 @@
* things like going back / stepping forward / process etc
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Core_State {
diff --git a/civicrm/CRM/Core/StateMachine.php b/civicrm/CRM/Core/StateMachine.php
index 73850cf078..84eef8255b 100644
--- a/civicrm/CRM/Core/StateMachine.php
+++ b/civicrm/CRM/Core/StateMachine.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Core/TableHierarchy.php b/civicrm/CRM/Core/TableHierarchy.php
index 167f51e29f..94c6abe5b6 100644
--- a/civicrm/CRM/Core/TableHierarchy.php
+++ b/civicrm/CRM/Core/TableHierarchy.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Class representing the table relationships
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Core/Transaction.php b/civicrm/CRM/Core/Transaction.php
index 753e25edb5..912190e5c9 100644
--- a/civicrm/CRM/Core/Transaction.php
+++ b/civicrm/CRM/Core/Transaction.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* @copyright David Strauss <david@fourkitchens.com> (c) 2007
* $Id$
*
diff --git a/civicrm/CRM/Custom/Form/ChangeFieldType.php b/civicrm/CRM/Custom/Form/ChangeFieldType.php
index 92ffa09343..148198b795 100644
--- a/civicrm/CRM/Custom/Form/ChangeFieldType.php
+++ b/civicrm/CRM/Custom/Form/ChangeFieldType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Form/CustomData.php b/civicrm/CRM/Custom/Form/CustomData.php
index 350941e6d8..be7338081a 100644
--- a/civicrm/CRM/Custom/Form/CustomData.php
+++ b/civicrm/CRM/Custom/Form/CustomData.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Form/CustomDataByType.php b/civicrm/CRM/Custom/Form/CustomDataByType.php
index 82f27b6889..ac2aa737cc 100644
--- a/civicrm/CRM/Custom/Form/CustomDataByType.php
+++ b/civicrm/CRM/Custom/Form/CustomDataByType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Custom/Form/DeleteField.php b/civicrm/CRM/Custom/Form/DeleteField.php
index 6da20cea43..c28cc914ab 100644
--- a/civicrm/CRM/Custom/Form/DeleteField.php
+++ b/civicrm/CRM/Custom/Form/DeleteField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Form/DeleteGroup.php b/civicrm/CRM/Custom/Form/DeleteGroup.php
index 611a9cde0f..001ed23ed1 100644
--- a/civicrm/CRM/Custom/Form/DeleteGroup.php
+++ b/civicrm/CRM/Custom/Form/DeleteGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Form/Field.php b/civicrm/CRM/Custom/Form/Field.php
index d8ab07ce51..9550971ba5 100644
--- a/civicrm/CRM/Custom/Form/Field.php
+++ b/civicrm/CRM/Custom/Form/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Form/Group.php b/civicrm/CRM/Custom/Form/Group.php
index 9e9b5b7731..547ca51fbd 100644
--- a/civicrm/CRM/Custom/Form/Group.php
+++ b/civicrm/CRM/Custom/Form/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Form/MoveField.php b/civicrm/CRM/Custom/Form/MoveField.php
index 4f8ec08b6b..399d682e07 100644
--- a/civicrm/CRM/Custom/Form/MoveField.php
+++ b/civicrm/CRM/Custom/Form/MoveField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Form/Option.php b/civicrm/CRM/Custom/Form/Option.php
index c12912e5e5..379639a53e 100644
--- a/civicrm/CRM/Custom/Form/Option.php
+++ b/civicrm/CRM/Custom/Form/Option.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Form/Preview.php b/civicrm/CRM/Custom/Form/Preview.php
index 80565596fd..c81accb6e4 100644
--- a/civicrm/CRM/Custom/Form/Preview.php
+++ b/civicrm/CRM/Custom/Form/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Import/Field.php b/civicrm/CRM/Custom/Import/Field.php
index d7f269e4a8..aad61a3813 100644
--- a/civicrm/CRM/Custom/Import/Field.php
+++ b/civicrm/CRM/Custom/Import/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Custom/Import/Form/DataSource.php b/civicrm/CRM/Custom/Import/Form/DataSource.php
index 26ac374463..7ff3e13c8f 100644
--- a/civicrm/CRM/Custom/Import/Form/DataSource.php
+++ b/civicrm/CRM/Custom/Import/Form/DataSource.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Import/Parser.php b/civicrm/CRM/Custom/Import/Parser.php
index 01f17cbd7c..55d1b48326 100644
--- a/civicrm/CRM/Custom/Import/Parser.php
+++ b/civicrm/CRM/Custom/Import/Parser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Page/AJAX.php b/civicrm/CRM/Custom/Page/AJAX.php
index 6af0badfa2..59b5cf28e0 100644
--- a/civicrm/CRM/Custom/Page/AJAX.php
+++ b/civicrm/CRM/Custom/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
*/
diff --git a/civicrm/CRM/Custom/Page/Field.php b/civicrm/CRM/Custom/Page/Field.php
index 99ab9b11c5..a37389def0 100644
--- a/civicrm/CRM/Custom/Page/Field.php
+++ b/civicrm/CRM/Custom/Page/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Page/Group.php b/civicrm/CRM/Custom/Page/Group.php
index 12b7555b90..71870ba23d 100644
--- a/civicrm/CRM/Custom/Page/Group.php
+++ b/civicrm/CRM/Custom/Page/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Custom/Page/Option.php b/civicrm/CRM/Custom/Page/Option.php
index c62552676a..7a6c79dccb 100644
--- a/civicrm/CRM/Custom/Page/Option.php
+++ b/civicrm/CRM/Custom/Page/Option.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Cxn/ApiRouter.php b/civicrm/CRM/Cxn/ApiRouter.php
index c53ade7bd4..af6c0ada41 100644
--- a/civicrm/CRM/Cxn/ApiRouter.php
+++ b/civicrm/CRM/Cxn/ApiRouter.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Cxn/BAO/Cxn.php b/civicrm/CRM/Cxn/BAO/Cxn.php
index 9e855ef712..33e9df1998 100644
--- a/civicrm/CRM/Cxn/BAO/Cxn.php
+++ b/civicrm/CRM/Cxn/BAO/Cxn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@ use Civi\Cxn\Rpc\DefaultCertificateValidator;
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Cxn/DAO/Cxn.php b/civicrm/CRM/Cxn/DAO/Cxn.php
index b826cee8a5..a69b4e692d 100644
--- a/civicrm/CRM/Cxn/DAO/Cxn.php
+++ b/civicrm/CRM/Cxn/DAO/Cxn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Cxn/Cxn.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Dashlet/Page/Activity.php b/civicrm/CRM/Dashlet/Page/Activity.php
index 6649487718..6aa1dff735 100644
--- a/civicrm/CRM/Dashlet/Page/Activity.php
+++ b/civicrm/CRM/Dashlet/Page/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Dashlet/Page/AllCases.php b/civicrm/CRM/Dashlet/Page/AllCases.php
index c62abea104..43330db899 100644
--- a/civicrm/CRM/Dashlet/Page/AllCases.php
+++ b/civicrm/CRM/Dashlet/Page/AllCases.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Dashlet/Page/Blog.php b/civicrm/CRM/Dashlet/Page/Blog.php
index 0b019f6b6d..31462f81f1 100644
--- a/civicrm/CRM/Dashlet/Page/Blog.php
+++ b/civicrm/CRM/Dashlet/Page/Blog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Dashlet/Page/CaseDashboard.php b/civicrm/CRM/Dashlet/Page/CaseDashboard.php
index 652f6b08f2..2dd9312f41 100644
--- a/civicrm/CRM/Dashlet/Page/CaseDashboard.php
+++ b/civicrm/CRM/Dashlet/Page/CaseDashboard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Dashlet/Page/GettingStarted.php b/civicrm/CRM/Dashlet/Page/GettingStarted.php
index 6b82460708..7d9bf1a1b5 100644
--- a/civicrm/CRM/Dashlet/Page/GettingStarted.php
+++ b/civicrm/CRM/Dashlet/Page/GettingStarted.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Dashlet/Page/MyCases.php b/civicrm/CRM/Dashlet/Page/MyCases.php
index eb4ba71ada..6e48ae0f12 100644
--- a/civicrm/CRM/Dashlet/Page/MyCases.php
+++ b/civicrm/CRM/Dashlet/Page/MyCases.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php b/civicrm/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php
index 839f03510a..1ae3af9e35 100644
--- a/civicrm/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php
+++ b/civicrm/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Dedupe/BAO/Rule.php b/civicrm/CRM/Dedupe/BAO/Rule.php
index e8d0b21a5b..552dc2b19b 100644
--- a/civicrm/CRM/Dedupe/BAO/Rule.php
+++ b/civicrm/CRM/Dedupe/BAO/Rule.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Dedupe/BAO/RuleGroup.php b/civicrm/CRM/Dedupe/BAO/RuleGroup.php
index aaca7d84d0..de7463b297 100644
--- a/civicrm/CRM/Dedupe/BAO/RuleGroup.php
+++ b/civicrm/CRM/Dedupe/BAO/RuleGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Dedupe/DAO/Exception.php b/civicrm/CRM/Dedupe/DAO/Exception.php
index 9b6dc1323d..78b15535a7 100644
--- a/civicrm/CRM/Dedupe/DAO/Exception.php
+++ b/civicrm/CRM/Dedupe/DAO/Exception.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Dedupe/Exception.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Dedupe/DAO/Rule.php b/civicrm/CRM/Dedupe/DAO/Rule.php
index 6d3a6863d0..9f8f14fc8b 100644
--- a/civicrm/CRM/Dedupe/DAO/Rule.php
+++ b/civicrm/CRM/Dedupe/DAO/Rule.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Dedupe/Rule.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Dedupe/DAO/RuleGroup.php b/civicrm/CRM/Dedupe/DAO/RuleGroup.php
index 975deb43cd..e3a5674289 100644
--- a/civicrm/CRM/Dedupe/DAO/RuleGroup.php
+++ b/civicrm/CRM/Dedupe/DAO/RuleGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Dedupe/RuleGroup.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Dedupe/Finder.php b/civicrm/CRM/Dedupe/Finder.php
index 18d59de52d..cb0bc2668b 100644
--- a/civicrm/CRM/Dedupe/Finder.php
+++ b/civicrm/CRM/Dedupe/Finder.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Dedupe/Merger.php b/civicrm/CRM/Dedupe/Merger.php
index 74bea9e8b3..06a545efe5 100644
--- a/civicrm/CRM/Dedupe/Merger.php
+++ b/civicrm/CRM/Dedupe/Merger.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Dedupe_Merger {
@@ -1486,7 +1486,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
// @todo Tidy this up
$operation = 0;
if ($fieldName != 'website') {
- $operation = CRM_Utils_Array::value('operation', $migrationInfo['location_blocks'][$fieldName][$fieldCount]);
+ $operation = CRM_Utils_Array::value('operation', $migrationInfo['location'][$fieldName][$fieldCount]);
}
// default operation is overwrite.
if (!$operation) {
@@ -1540,16 +1540,16 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
// Add/update location and type information from the form, if applicable
if ($locationBlocks[$name]['hasLocation']) {
- $locTypeId = CRM_Utils_Array::value('locTypeId', $migrationInfo['location_blocks'][$name][$blkCount]);
+ $locTypeId = CRM_Utils_Array::value('locTypeId', $migrationInfo['location'][$name][$blkCount]);
$otherBlockDAO->location_type_id = $locTypeId;
}
if ($locationBlocks[$name]['hasType']) {
- $typeTypeId = CRM_Utils_Array::value('typeTypeId', $migrationInfo['location_blocks'][$name][$blkCount]);
+ $typeTypeId = CRM_Utils_Array::value('typeTypeId', $migrationInfo['location'][$name][$blkCount]);
$otherBlockDAO->{$locationBlocks[$name]['hasType']} = $typeTypeId;
}
// Get main block ID
- $mainBlockId = CRM_Utils_Array::value('mainContactBlockId', $migrationInfo['location_blocks'][$name][$blkCount], 0);
+ $mainBlockId = CRM_Utils_Array::value('mainContactBlockId', $migrationInfo['location'][$name][$blkCount], 0);
// if main contact already has primary & billing, set the flags to 0.
if ($primaryDAOId) {
@@ -1936,13 +1936,15 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
'activity_type_id' => 'Contact Merged',
'status_id' => 'Completed',
));
- civicrm_api3('activity', 'create', array(
- 'subject' => ts('Contact ID %1 has been merged into Contact ID %2 and deleted.', $params),
- 'target_contact_id' => $otherId,
- 'activity_type_id' => 'Contact Deleted by Merge',
- 'parent_id' => $activity['id'],
- 'status_id' => 'Completed',
- ));
+ if (civicrm_api3('Setting', 'getvalue', array('name' => 'contact_undelete', 'group' => 'CiviCRM Preferences'))) {
+ civicrm_api3('activity', 'create', array(
+ 'subject' => ts('Contact ID %1 has been merged into Contact ID %2 and deleted.', $params),
+ 'target_contact_id' => $otherId,
+ 'activity_type_id' => 'Contact Deleted by Merge',
+ 'parent_id' => $activity['id'],
+ 'status_id' => 'Completed',
+ ));
+ }
}
}
diff --git a/civicrm/CRM/Event/ActionMapping.php b/civicrm/CRM/Event/ActionMapping.php
index fc4d9d8dad..7707038e31 100644
--- a/civicrm/CRM/Event/ActionMapping.php
+++ b/civicrm/CRM/Event/ActionMapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Event/BAO/Event.php b/civicrm/CRM/Event/BAO/Event.php
index af57ba5966..b630a3d5d8 100644
--- a/civicrm/CRM/Event/BAO/Event.php
+++ b/civicrm/CRM/Event/BAO/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Event_BAO_Event extends CRM_Event_DAO_Event {
diff --git a/civicrm/CRM/Event/BAO/Participant.php b/civicrm/CRM/Event/BAO/Participant.php
index 60d8b7d560..60ccb75cd7 100644
--- a/civicrm/CRM/Event/BAO/Participant.php
+++ b/civicrm/CRM/Event/BAO/Participant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Event_BAO_Participant extends CRM_Event_DAO_Participant {
diff --git a/civicrm/CRM/Event/BAO/ParticipantPayment.php b/civicrm/CRM/Event/BAO/ParticipantPayment.php
index 2dbcd7033d..e9f1e5c2ca 100644
--- a/civicrm/CRM/Event/BAO/ParticipantPayment.php
+++ b/civicrm/CRM/Event/BAO/ParticipantPayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/BAO/ParticipantStatusType.php b/civicrm/CRM/Event/BAO/ParticipantStatusType.php
index 67c2a8d23e..802c7363d3 100644
--- a/civicrm/CRM/Event/BAO/ParticipantStatusType.php
+++ b/civicrm/CRM/Event/BAO/ParticipantStatusType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/BAO/Query.php b/civicrm/CRM/Event/BAO/Query.php
index 4905cf56e4..1b929ae29e 100644
--- a/civicrm/CRM/Event/BAO/Query.php
+++ b/civicrm/CRM/Event/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Badge.php b/civicrm/CRM/Event/Badge.php
index e0ab8d5f14..e0b9b3542a 100644
--- a/civicrm/CRM/Event/Badge.php
+++ b/civicrm/CRM/Event/Badge.php
@@ -32,7 +32,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Badge/NameTent.php b/civicrm/CRM/Event/Badge/NameTent.php
index f5402817f4..98c1398a0d 100644
--- a/civicrm/CRM/Event/Badge/NameTent.php
+++ b/civicrm/CRM/Event/Badge/NameTent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Event/Badge/Simple.php b/civicrm/CRM/Event/Badge/Simple.php
index 05b84b5421..e3cd206c65 100644
--- a/civicrm/CRM/Event/Badge/Simple.php
+++ b/civicrm/CRM/Event/Badge/Simple.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Event/Cart/BAO/MerParticipant.php b/civicrm/CRM/Event/Cart/BAO/MerParticipant.php
index bb7db2a801..3ddf6a4c84 100644
--- a/civicrm/CRM/Event/Cart/BAO/MerParticipant.php
+++ b/civicrm/CRM/Event/Cart/BAO/MerParticipant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Event/Cart/DAO/Cart.php b/civicrm/CRM/Event/Cart/DAO/Cart.php
index b625cd69ac..39daf3b9c0 100644
--- a/civicrm/CRM/Event/Cart/DAO/Cart.php
+++ b/civicrm/CRM/Event/Cart/DAO/Cart.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Event/Cart/Cart.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Event/Cart/DAO/EventInCart.php b/civicrm/CRM/Event/Cart/DAO/EventInCart.php
index 5840211f85..bd35fbfefb 100644
--- a/civicrm/CRM/Event/Cart/DAO/EventInCart.php
+++ b/civicrm/CRM/Event/Cart/DAO/EventInCart.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Event/Cart/EventInCart.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Event/Controller/Registration.php b/civicrm/CRM/Event/Controller/Registration.php
index ed9543d425..6695c8a473 100644
--- a/civicrm/CRM/Event/Controller/Registration.php
+++ b/civicrm/CRM/Event/Controller/Registration.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Controller/Search.php b/civicrm/CRM/Event/Controller/Search.php
index bd2c5e0c06..1766ca46bb 100644
--- a/civicrm/CRM/Event/Controller/Search.php
+++ b/civicrm/CRM/Event/Controller/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/DAO/Event.php b/civicrm/CRM/Event/DAO/Event.php
index d9386d5393..a9625af5a1 100644
--- a/civicrm/CRM/Event/DAO/Event.php
+++ b/civicrm/CRM/Event/DAO/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Event/Event.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Event/DAO/Participant.php b/civicrm/CRM/Event/DAO/Participant.php
index 087cbd614e..54c1c61be3 100644
--- a/civicrm/CRM/Event/DAO/Participant.php
+++ b/civicrm/CRM/Event/DAO/Participant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Event/Participant.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Event/DAO/ParticipantPayment.php b/civicrm/CRM/Event/DAO/ParticipantPayment.php
index ce81ffda76..6c42f16272 100644
--- a/civicrm/CRM/Event/DAO/ParticipantPayment.php
+++ b/civicrm/CRM/Event/DAO/ParticipantPayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Event/ParticipantPayment.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Event/DAO/ParticipantStatusType.php b/civicrm/CRM/Event/DAO/ParticipantStatusType.php
index 89dc803eac..5e885eec42 100644
--- a/civicrm/CRM/Event/DAO/ParticipantStatusType.php
+++ b/civicrm/CRM/Event/DAO/ParticipantStatusType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Event/ParticipantStatusType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Event/Form/EventFees.php b/civicrm/CRM/Event/Form/EventFees.php
index 54c4ca7756..db8b38ffd4 100644
--- a/civicrm/CRM/Event/Form/EventFees.php
+++ b/civicrm/CRM/Event/Form/EventFees.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/ManageEvent.php b/civicrm/CRM/Event/Form/ManageEvent.php
index d759c0f4a1..882e0f1d9c 100644
--- a/civicrm/CRM/Event/Form/ManageEvent.php
+++ b/civicrm/CRM/Event/Form/ManageEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Conference.php b/civicrm/CRM/Event/Form/ManageEvent/Conference.php
index 3547739399..1b10cae99a 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Conference.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Conference.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Delete.php b/civicrm/CRM/Event/Form/ManageEvent/Delete.php
index bfd8d416c7..8ff294c043 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Delete.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php b/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php
index c1283fab55..d10dfb6b57 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Fee.php b/civicrm/CRM/Event/Form/ManageEvent/Fee.php
index 55123f9f81..adef3c6ca8 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Fee.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Fee.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Location.php b/civicrm/CRM/Event/Form/ManageEvent/Location.php
index 04cc5b0945..ce64515b52 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Location.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Location.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/ManageEvent/Registration.php b/civicrm/CRM/Event/Form/ManageEvent/Registration.php
index 8ad22bdc3c..b114488f3b 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/Registration.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/Registration.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/ManageEvent/ScheduleReminders.php b/civicrm/CRM/Event/Form/ManageEvent/ScheduleReminders.php
index f26a8fd300..5f74c2cdce 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/ScheduleReminders.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/ScheduleReminders.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php b/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php
index 49ea6670ae..07ccfc82f9 100644
--- a/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php
+++ b/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Participant.php b/civicrm/CRM/Event/Form/Participant.php
index 415249d785..10a7db09ed 100644
--- a/civicrm/CRM/Event/Form/Participant.php
+++ b/civicrm/CRM/Event/Form/Participant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/ParticipantFeeSelection.php b/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
index 380ddcc47d..d1a0a84e7e 100644
--- a/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
+++ b/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/ParticipantView.php b/civicrm/CRM/Event/Form/ParticipantView.php
index 90a0c19cb5..34ead01720 100644
--- a/civicrm/CRM/Event/Form/ParticipantView.php
+++ b/civicrm/CRM/Event/Form/ParticipantView.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Registration.php b/civicrm/CRM/Event/Form/Registration.php
index 2d7136a9c0..933cd49999 100644
--- a/civicrm/CRM/Event/Form/Registration.php
+++ b/civicrm/CRM/Event/Form/Registration.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php b/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php
index d8429d6691..771f2ad1aa 100644
--- a/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php
+++ b/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/Registration/Confirm.php b/civicrm/CRM/Event/Form/Registration/Confirm.php
index bc835801d0..0485d4c6a1 100644
--- a/civicrm/CRM/Event/Form/Registration/Confirm.php
+++ b/civicrm/CRM/Event/Form/Registration/Confirm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/Registration/ParticipantConfirm.php b/civicrm/CRM/Event/Form/Registration/ParticipantConfirm.php
index ddb7cba276..2daf0d8cd2 100644
--- a/civicrm/CRM/Event/Form/Registration/ParticipantConfirm.php
+++ b/civicrm/CRM/Event/Form/Registration/ParticipantConfirm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Registration/Register.php b/civicrm/CRM/Event/Form/Registration/Register.php
index d1cef8f286..ac1728933e 100644
--- a/civicrm/CRM/Event/Form/Registration/Register.php
+++ b/civicrm/CRM/Event/Form/Registration/Register.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Form/Registration/ThankYou.php b/civicrm/CRM/Event/Form/Registration/ThankYou.php
index c12d6c6a57..e1f9863537 100644
--- a/civicrm/CRM/Event/Form/Registration/ThankYou.php
+++ b/civicrm/CRM/Event/Form/Registration/ThankYou.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Search.php b/civicrm/CRM/Event/Form/Search.php
index b1ba0ac0ad..eb9c17a780 100644
--- a/civicrm/CRM/Event/Form/Search.php
+++ b/civicrm/CRM/Event/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/SearchEvent.php b/civicrm/CRM/Event/Form/SearchEvent.php
index 565f0152e7..2a1232ce4a 100644
--- a/civicrm/CRM/Event/Form/SearchEvent.php
+++ b/civicrm/CRM/Event/Form/SearchEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/SelfSvcTransfer.php b/civicrm/CRM/Event/Form/SelfSvcTransfer.php
index 3246c45dc1..ff1456b28a 100644
--- a/civicrm/CRM/Event/Form/SelfSvcTransfer.php
+++ b/civicrm/CRM/Event/Form/SelfSvcTransfer.php
@@ -4,7 +4,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/SelfSvcUpdate.php b/civicrm/CRM/Event/Form/SelfSvcUpdate.php
index ca602d32dc..5be5746a28 100644
--- a/civicrm/CRM/Event/Form/SelfSvcUpdate.php
+++ b/civicrm/CRM/Event/Form/SelfSvcUpdate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task.php b/civicrm/CRM/Event/Form/Task.php
index d0cd431dba..5aa34ce0f0 100644
--- a/civicrm/CRM/Event/Form/Task.php
+++ b/civicrm/CRM/Event/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/AddToGroup.php b/civicrm/CRM/Event/Form/Task/AddToGroup.php
index a9ae83a186..cc678a9d8a 100644
--- a/civicrm/CRM/Event/Form/Task/AddToGroup.php
+++ b/civicrm/CRM/Event/Form/Task/AddToGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/Badge.php b/civicrm/CRM/Event/Form/Task/Badge.php
index 00f683f5eb..b78c17e10b 100644
--- a/civicrm/CRM/Event/Form/Task/Badge.php
+++ b/civicrm/CRM/Event/Form/Task/Badge.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/Batch.php b/civicrm/CRM/Event/Form/Task/Batch.php
index 8ec5b87497..cc7b702e62 100644
--- a/civicrm/CRM/Event/Form/Task/Batch.php
+++ b/civicrm/CRM/Event/Form/Task/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/Cancel.php b/civicrm/CRM/Event/Form/Task/Cancel.php
index 69e60a33c0..5113035631 100644
--- a/civicrm/CRM/Event/Form/Task/Cancel.php
+++ b/civicrm/CRM/Event/Form/Task/Cancel.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/Delete.php b/civicrm/CRM/Event/Form/Task/Delete.php
index 9120005a7c..80c964d8a0 100644
--- a/civicrm/CRM/Event/Form/Task/Delete.php
+++ b/civicrm/CRM/Event/Form/Task/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/Email.php b/civicrm/CRM/Event/Form/Task/Email.php
index 9b044beb32..4e50b515d8 100644
--- a/civicrm/CRM/Event/Form/Task/Email.php
+++ b/civicrm/CRM/Event/Form/Task/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: Email.php 45499 2013-02-08 12:31:05Z kurund $
*/
diff --git a/civicrm/CRM/Event/Form/Task/PDF.php b/civicrm/CRM/Event/Form/Task/PDF.php
index 49019cd3a7..1632374e7a 100644
--- a/civicrm/CRM/Event/Form/Task/PDF.php
+++ b/civicrm/CRM/Event/Form/Task/PDF.php
@@ -4,7 +4,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: PDF.php 45499 2013-02-08 12:31:05Z kurund $
*/
diff --git a/civicrm/CRM/Event/Form/Task/ParticipantStatus.php b/civicrm/CRM/Event/Form/Task/ParticipantStatus.php
index d142cc5c54..fc9182c911 100644
--- a/civicrm/CRM/Event/Form/Task/ParticipantStatus.php
+++ b/civicrm/CRM/Event/Form/Task/ParticipantStatus.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/PickProfile.php b/civicrm/CRM/Event/Form/Task/PickProfile.php
index 57b7fea045..59daf4afba 100644
--- a/civicrm/CRM/Event/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Event/Form/Task/PickProfile.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/Print.php b/civicrm/CRM/Event/Form/Task/Print.php
index 5912d2a71f..f7e0d0917a 100644
--- a/civicrm/CRM/Event/Form/Task/Print.php
+++ b/civicrm/CRM/Event/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/Result.php b/civicrm/CRM/Event/Form/Task/Result.php
index dcdf6e0e87..1e8047af62 100644
--- a/civicrm/CRM/Event/Form/Task/Result.php
+++ b/civicrm/CRM/Event/Form/Task/Result.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/SaveSearch.php b/civicrm/CRM/Event/Form/Task/SaveSearch.php
index dd0a4aa647..3675d5210f 100644
--- a/civicrm/CRM/Event/Form/Task/SaveSearch.php
+++ b/civicrm/CRM/Event/Form/Task/SaveSearch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/SaveSearch/Update.php b/civicrm/CRM/Event/Form/Task/SaveSearch/Update.php
index 33fb4e53c8..1e18d7fdb6 100644
--- a/civicrm/CRM/Event/Form/Task/SaveSearch/Update.php
+++ b/civicrm/CRM/Event/Form/Task/SaveSearch/Update.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Event/Form/Task/SearchTaskHookSample.php
index ed9e7135cf..ac04f5b33a 100644
--- a/civicrm/CRM/Event/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Event/Form/Task/SearchTaskHookSample.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Import/Controller.php b/civicrm/CRM/Event/Import/Controller.php
index 7621b56253..6cd2268fba 100644
--- a/civicrm/CRM/Event/Import/Controller.php
+++ b/civicrm/CRM/Event/Import/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Import/Field.php b/civicrm/CRM/Event/Import/Field.php
index d22095108b..2ff08f17b6 100644
--- a/civicrm/CRM/Event/Import/Field.php
+++ b/civicrm/CRM/Event/Import/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Event/Import/Form/DataSource.php b/civicrm/CRM/Event/Import/Form/DataSource.php
index 29af1a7989..39228957da 100644
--- a/civicrm/CRM/Event/Import/Form/DataSource.php
+++ b/civicrm/CRM/Event/Import/Form/DataSource.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Import/Form/MapField.php b/civicrm/CRM/Event/Import/Form/MapField.php
index b0ac85cce1..9b8257f667 100644
--- a/civicrm/CRM/Event/Import/Form/MapField.php
+++ b/civicrm/CRM/Event/Import/Form/MapField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Import/Form/Preview.php b/civicrm/CRM/Event/Import/Form/Preview.php
index e759c17076..98cfa592d4 100644
--- a/civicrm/CRM/Event/Import/Form/Preview.php
+++ b/civicrm/CRM/Event/Import/Form/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Import/Form/Summary.php b/civicrm/CRM/Event/Import/Form/Summary.php
index 75d813c81d..e2d6c1b760 100644
--- a/civicrm/CRM/Event/Import/Form/Summary.php
+++ b/civicrm/CRM/Event/Import/Form/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Import/Parser.php b/civicrm/CRM/Event/Import/Parser.php
index 93f9ae2e7a..4ac571b88f 100644
--- a/civicrm/CRM/Event/Import/Parser.php
+++ b/civicrm/CRM/Event/Import/Parser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Import/Parser/Participant.php b/civicrm/CRM/Event/Import/Parser/Participant.php
index 6ce58cadb3..181472f38f 100644
--- a/civicrm/CRM/Event/Import/Parser/Participant.php
+++ b/civicrm/CRM/Event/Import/Parser/Participant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Info.php b/civicrm/CRM/Event/Info.php
index 9c3a4de68d..a92c949338 100644
--- a/civicrm/CRM/Event/Info.php
+++ b/civicrm/CRM/Event/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* abstract class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/AJAX.php b/civicrm/CRM/Event/Page/AJAX.php
index 260afeb7f2..60718f37a5 100644
--- a/civicrm/CRM/Event/Page/AJAX.php
+++ b/civicrm/CRM/Event/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/DashBoard.php b/civicrm/CRM/Event/Page/DashBoard.php
index bcba40c66f..b035f8a06a 100644
--- a/civicrm/CRM/Event/Page/DashBoard.php
+++ b/civicrm/CRM/Event/Page/DashBoard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/EventInfo.php b/civicrm/CRM/Event/Page/EventInfo.php
index f4d1eefa69..5eaa6d33e4 100644
--- a/civicrm/CRM/Event/Page/EventInfo.php
+++ b/civicrm/CRM/Event/Page/EventInfo.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Event/Page/ICalendar.php b/civicrm/CRM/Event/Page/ICalendar.php
index a6a3268f75..f49ad3296c 100644
--- a/civicrm/CRM/Event/Page/ICalendar.php
+++ b/civicrm/CRM/Event/Page/ICalendar.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/ManageEvent.php b/civicrm/CRM/Event/Page/ManageEvent.php
index 3c58fd5e62..ed741659ac 100644
--- a/civicrm/CRM/Event/Page/ManageEvent.php
+++ b/civicrm/CRM/Event/Page/ManageEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -470,13 +470,13 @@ ORDER BY start_date desc
$from = $this->get('start_date');
if (!CRM_Utils_System::isNull($from)) {
- $clauses[] = '( start_date >= %3 OR start_date IS NULL )';
+ $clauses[] = '( end_date >= %3 OR end_date IS NULL )';
$params[3] = array($from, 'String');
}
$to = $this->get('end_date');
if (!CRM_Utils_System::isNull($to)) {
- $clauses[] = '( end_date <= %4 OR end_date IS NULL )';
+ $clauses[] = '( start_date <= %4 OR start_date IS NULL )';
$params[4] = array($to, 'String');
}
}
diff --git a/civicrm/CRM/Event/Page/ParticipantListing.php b/civicrm/CRM/Event/Page/ParticipantListing.php
index e2619d552c..d798d6307c 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/ParticipantListing/Name.php b/civicrm/CRM/Event/Page/ParticipantListing/Name.php
index a4114827f4..c8e8c3f274 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing/Name.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing/Name.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/ParticipantListing/NameAndEmail.php b/civicrm/CRM/Event/Page/ParticipantListing/NameAndEmail.php
index aa8eed90b2..f994a6bb80 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing/NameAndEmail.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing/NameAndEmail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php b/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
index 0cdcd31fd3..a660e58834 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/ParticipantListing/Simple.php b/civicrm/CRM/Event/Page/ParticipantListing/Simple.php
index a45f9f83ca..838e1da2c7 100644
--- a/civicrm/CRM/Event/Page/ParticipantListing/Simple.php
+++ b/civicrm/CRM/Event/Page/ParticipantListing/Simple.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/Tab.php b/civicrm/CRM/Event/Page/Tab.php
index cd7fe05ded..6e6cd47ab5 100644
--- a/civicrm/CRM/Event/Page/Tab.php
+++ b/civicrm/CRM/Event/Page/Tab.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Page/UserDashboard.php b/civicrm/CRM/Event/Page/UserDashboard.php
index 25580cad53..4f0a1a172c 100644
--- a/civicrm/CRM/Event/Page/UserDashboard.php
+++ b/civicrm/CRM/Event/Page/UserDashboard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/PseudoConstant.php b/civicrm/CRM/Event/PseudoConstant.php
index d040826561..b855beefa2 100644
--- a/civicrm/CRM/Event/PseudoConstant.php
+++ b/civicrm/CRM/Event/PseudoConstant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Selector/Search.php b/civicrm/CRM/Event/Selector/Search.php
index bfa2eb5a13..c92482bd24 100644
--- a/civicrm/CRM/Event/Selector/Search.php
+++ b/civicrm/CRM/Event/Selector/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/StateMachine/Registration.php b/civicrm/CRM/Event/StateMachine/Registration.php
index d8e396e501..91ef1fa4b4 100644
--- a/civicrm/CRM/Event/StateMachine/Registration.php
+++ b/civicrm/CRM/Event/StateMachine/Registration.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/StateMachine/Search.php b/civicrm/CRM/Event/StateMachine/Search.php
index 4299edd8b4..33072d0ee6 100644
--- a/civicrm/CRM/Event/StateMachine/Search.php
+++ b/civicrm/CRM/Event/StateMachine/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Task.php b/civicrm/CRM/Event/Task.php
index bd308e36b9..683bd46039 100644
--- a/civicrm/CRM/Event/Task.php
+++ b/civicrm/CRM/Event/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Event/Tokens.php b/civicrm/CRM/Event/Tokens.php
index 48949e7be0..4be77944cc 100644
--- a/civicrm/CRM/Event/Tokens.php
+++ b/civicrm/CRM/Event/Tokens.php
@@ -4,7 +4,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Export/BAO/Export.php b/civicrm/CRM/Export/BAO/Export.php
index c17e424ee9..20df643417 100644
--- a/civicrm/CRM/Export/BAO/Export.php
+++ b/civicrm/CRM/Export/BAO/Export.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -41,7 +41,7 @@ class CRM_Export_BAO_Export {
// increase this number a lot to avoid making too many queries
// LIMIT is not much faster than a no LIMIT query
// CRM-7675
- const EXPORT_ROW_COUNT = 10000;
+ const EXPORT_ROW_COUNT = 100000;
/**
* Get Querymode based on ExportMode
@@ -432,8 +432,9 @@ class CRM_Export_BAO_Export {
}
}
}
- if (!empty(self::defaultReturnProperty($exportMode))) {
- $returnProperties[self::defaultReturnProperty($exportMode)] = 1;
+ $defaultExportMode = self::defaultReturnProperty($exportMode);
+ if ($defaultExportMode) {
+ $returnProperties[$defaultExportMode] = 1;
}
}
else {
@@ -757,17 +758,20 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c
// for CRM-3157 purposes
$i18n = CRM_Core_I18n::singleton();
+
list($outputColumns, $headerRows, $sqlColumns, $metadata) = self::getExportStructureArrays($returnProperties, $query, $phoneTypes, $imProviders, $contactRelationshipTypes, $relationQuery, $selectedPaymentFields);
- while (1) {
+ $limitReached = FALSE;
+ while (!$limitReached) {
$limitQuery = "{$queryString} LIMIT {$offset}, {$rowCount}";
- $dao = CRM_Core_DAO::executeQuery($limitQuery);
- if ($dao->N <= 0) {
- break;
- }
+ $dao = CRM_Core_DAO::executeUnbufferedQuery($limitQuery);
+ // If this is less than our limit by the end of the iteration we do not need to run the query again to
+ // check if some remain.
+ $rowsThisIteration = 0;
while ($dao->fetch()) {
$count++;
+ $rowsThisIteration++;
$row = array();
//convert the pseudo constants
@@ -1084,6 +1088,9 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c
}
}
$dao->free();
+ if ($rowsThisIteration < self::EXPORT_ROW_COUNT) {
+ $limitReached = TRUE;
+ }
$offset += $rowCount;
}
diff --git a/civicrm/CRM/Export/Form/Map.php b/civicrm/CRM/Export/Form/Map.php
index b33bfe1f6c..0c08fbbc7e 100644
--- a/civicrm/CRM/Export/Form/Map.php
+++ b/civicrm/CRM/Export/Form/Map.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Export/Form/Select.php b/civicrm/CRM/Export/Form/Select.php
index 4349d3427a..4aa2835943 100644
--- a/civicrm/CRM/Export/Form/Select.php
+++ b/civicrm/CRM/Export/Form/Select.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Extension/Browser.php b/civicrm/CRM/Extension/Browser.php
index 3ba2f1d263..3a58366433 100644
--- a/civicrm/CRM/Extension/Browser.php
+++ b/civicrm/CRM/Extension/Browser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* system.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Browser {
diff --git a/civicrm/CRM/Extension/ClassLoader.php b/civicrm/CRM/Extension/ClassLoader.php
index 2485cae3cb..ea3db339b3 100644
--- a/civicrm/CRM/Extension/ClassLoader.php
+++ b/civicrm/CRM/Extension/ClassLoader.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
*
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Extension/Container/Basic.php b/civicrm/CRM/Extension/Container/Basic.php
index d4941b8905..bcb741d4b2 100644
--- a/civicrm/CRM/Extension/Container/Basic.php
+++ b/civicrm/CRM/Extension/Container/Basic.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Extension/Container/Collection.php b/civicrm/CRM/Extension/Container/Collection.php
index d6460d8f80..065a6955da 100644
--- a/civicrm/CRM/Extension/Container/Collection.php
+++ b/civicrm/CRM/Extension/Container/Collection.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Extension/Container/Default.php b/civicrm/CRM/Extension/Container/Default.php
index 8003ac7503..9672db9ab9 100644
--- a/civicrm/CRM/Extension/Container/Default.php
+++ b/civicrm/CRM/Extension/Container/Default.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Extension/Container/Interface.php b/civicrm/CRM/Extension/Container/Interface.php
index ec64df3d55..9cccb3dfbf 100644
--- a/civicrm/CRM/Extension/Container/Interface.php
+++ b/civicrm/CRM/Extension/Container/Interface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Extension/Container/Static.php b/civicrm/CRM/Extension/Container/Static.php
index b27c0a4d75..4a91975bca 100644
--- a/civicrm/CRM/Extension/Container/Static.php
+++ b/civicrm/CRM/Extension/Container/Static.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Extension/Downloader.php b/civicrm/CRM/Extension/Downloader.php
index 2d361ad772..b5257a2e8e 100644
--- a/civicrm/CRM/Extension/Downloader.php
+++ b/civicrm/CRM/Extension/Downloader.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This class handles downloads of remotely-provided extensions
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Downloader {
/**
diff --git a/civicrm/CRM/Extension/Exception.php b/civicrm/CRM/Extension/Exception.php
index 5b8a0ccd2c..345c89c0b1 100644
--- a/civicrm/CRM/Extension/Exception.php
+++ b/civicrm/CRM/Extension/Exception.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Class CRM_Extension_Exception
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Exception extends CRM_Core_Exception {
}
diff --git a/civicrm/CRM/Extension/Exception/DependencyException.php b/civicrm/CRM/Extension/Exception/DependencyException.php
index fba49ac141..9bda1a201d 100644
--- a/civicrm/CRM/Extension/Exception/DependencyException.php
+++ b/civicrm/CRM/Extension/Exception/DependencyException.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Extension/Exception/MissingException.php b/civicrm/CRM/Extension/Exception/MissingException.php
index 2383523f7d..adc5948e35 100644
--- a/civicrm/CRM/Extension/Exception/MissingException.php
+++ b/civicrm/CRM/Extension/Exception/MissingException.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Extension/Exception/ParseException.php b/civicrm/CRM/Extension/Exception/ParseException.php
index 425a8f04cb..04c2371ec8 100644
--- a/civicrm/CRM/Extension/Exception/ParseException.php
+++ b/civicrm/CRM/Extension/Exception/ParseException.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Extension/Info.php b/civicrm/CRM/Extension/Info.php
index d0d8c94c05..e45c2587e9 100644
--- a/civicrm/CRM/Extension/Info.php
+++ b/civicrm/CRM/Extension/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Metadata for an extension (e.g. the extension's "info.xml" file)
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Info {
diff --git a/civicrm/CRM/Extension/Manager.php b/civicrm/CRM/Extension/Manager.php
index bc7a518bce..e2de1c72ea 100644
--- a/civicrm/CRM/Extension/Manager.php
+++ b/civicrm/CRM/Extension/Manager.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* uninstalling extensions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Manager {
/**
diff --git a/civicrm/CRM/Extension/Manager/Base.php b/civicrm/CRM/Extension/Manager/Base.php
index 97d9f37381..9cd223d26d 100644
--- a/civicrm/CRM/Extension/Manager/Base.php
+++ b/civicrm/CRM/Extension/Manager/Base.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* uninstalling extensions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Manager_Base implements CRM_Extension_Manager_Interface {
diff --git a/civicrm/CRM/Extension/Manager/Interface.php b/civicrm/CRM/Extension/Manager/Interface.php
index 882ad35922..a35999ddce 100644
--- a/civicrm/CRM/Extension/Manager/Interface.php
+++ b/civicrm/CRM/Extension/Manager/Interface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* uninstalling extensions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
interface CRM_Extension_Manager_Interface {
/**
diff --git a/civicrm/CRM/Extension/Manager/Module.php b/civicrm/CRM/Extension/Manager/Module.php
index dff26c2dc7..38be42f517 100644
--- a/civicrm/CRM/Extension/Manager/Module.php
+++ b/civicrm/CRM/Extension/Manager/Module.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This class stores logic for managing CiviCRM extensions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Manager_Module extends CRM_Extension_Manager_Base {
diff --git a/civicrm/CRM/Extension/Manager/Payment.php b/civicrm/CRM/Extension/Manager/Payment.php
index 1758b3a806..d8211fa645 100644
--- a/civicrm/CRM/Extension/Manager/Payment.php
+++ b/civicrm/CRM/Extension/Manager/Payment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This class stores logic for managing CiviCRM extensions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Manager_Payment extends CRM_Extension_Manager_Base {
diff --git a/civicrm/CRM/Extension/Manager/Report.php b/civicrm/CRM/Extension/Manager/Report.php
index 893ac40803..f2f5e6eb52 100644
--- a/civicrm/CRM/Extension/Manager/Report.php
+++ b/civicrm/CRM/Extension/Manager/Report.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This class stores logic for managing CiviCRM extensions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Manager_Report extends CRM_Extension_Manager_Base {
diff --git a/civicrm/CRM/Extension/Manager/Search.php b/civicrm/CRM/Extension/Manager/Search.php
index 3d3fa13ba6..9c4e4c6df6 100644
--- a/civicrm/CRM/Extension/Manager/Search.php
+++ b/civicrm/CRM/Extension/Manager/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This class stores logic for managing CiviCRM extensions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Manager_Search extends CRM_Extension_Manager_Base {
diff --git a/civicrm/CRM/Extension/Mapper.php b/civicrm/CRM/Extension/Mapper.php
index b08c6f636c..729bb009ec 100644
--- a/civicrm/CRM/Extension/Mapper.php
+++ b/civicrm/CRM/Extension/Mapper.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -42,7 +42,7 @@
* module-extensions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Mapper {
diff --git a/civicrm/CRM/Extension/System.php b/civicrm/CRM/Extension/System.php
index 92e5c36e7c..98937ff274 100644
--- a/civicrm/CRM/Extension/System.php
+++ b/civicrm/CRM/Extension/System.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* system.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_System {
private static $singleton;
diff --git a/civicrm/CRM/Extension/Upgrades.php b/civicrm/CRM/Extension/Upgrades.php
index 7c2afb3248..6bcf470bd9 100644
--- a/civicrm/CRM/Extension/Upgrades.php
+++ b/civicrm/CRM/Extension/Upgrades.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This class stores logic for managing schema upgrades in CiviCRM extensions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Extension_Upgrades {
diff --git a/civicrm/CRM/Financial/BAO/ExportFormat.php b/civicrm/CRM/Financial/BAO/ExportFormat.php
index 5b89b27502..f404700b39 100644
--- a/civicrm/CRM/Financial/BAO/ExportFormat.php
+++ b/civicrm/CRM/Financial/BAO/ExportFormat.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/BAO/ExportFormat/CSV.php b/civicrm/CRM/Financial/BAO/ExportFormat/CSV.php
index e2c03c5c3d..4a5330ea33 100644
--- a/civicrm/CRM/Financial/BAO/ExportFormat/CSV.php
+++ b/civicrm/CRM/Financial/BAO/ExportFormat/CSV.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/BAO/ExportFormat/IIF.php b/civicrm/CRM/Financial/BAO/ExportFormat/IIF.php
index 46b6c9b980..e2f0c65d14 100644
--- a/civicrm/CRM/Financial/BAO/ExportFormat/IIF.php
+++ b/civicrm/CRM/Financial/BAO/ExportFormat/IIF.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/BAO/FinancialAccount.php b/civicrm/CRM/Financial/BAO/FinancialAccount.php
index 80ef79e2bd..24516f1330 100644
--- a/civicrm/CRM/Financial/BAO/FinancialAccount.php
+++ b/civicrm/CRM/Financial/BAO/FinancialAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAccount {
diff --git a/civicrm/CRM/Financial/BAO/FinancialItem.php b/civicrm/CRM/Financial/BAO/FinancialItem.php
index 5a62341b3c..60786b6b42 100644
--- a/civicrm/CRM/Financial/BAO/FinancialItem.php
+++ b/civicrm/CRM/Financial/BAO/FinancialItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem {
diff --git a/civicrm/CRM/Financial/BAO/FinancialType.php b/civicrm/CRM/Financial/BAO/FinancialType.php
index 1b248bfa92..1122981648 100644
--- a/civicrm/CRM/Financial/BAO/FinancialType.php
+++ b/civicrm/CRM/Financial/BAO/FinancialType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType {
diff --git a/civicrm/CRM/Financial/BAO/FinancialTypeAccount.php b/civicrm/CRM/Financial/BAO/FinancialTypeAccount.php
index 3775d16d80..c34235e6e2 100644
--- a/civicrm/CRM/Financial/BAO/FinancialTypeAccount.php
+++ b/civicrm/CRM/Financial/BAO/FinancialTypeAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFinancialAccount {
diff --git a/civicrm/CRM/Financial/BAO/PaymentProcessor.php b/civicrm/CRM/Financial/BAO/PaymentProcessor.php
index cc5c804421..b2e13d985d 100644
--- a/civicrm/CRM/Financial/BAO/PaymentProcessor.php
+++ b/civicrm/CRM/Financial/BAO/PaymentProcessor.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/BAO/PaymentProcessorType.php b/civicrm/CRM/Financial/BAO/PaymentProcessorType.php
index b6f548f5f8..5431461e18 100644
--- a/civicrm/CRM/Financial/BAO/PaymentProcessorType.php
+++ b/civicrm/CRM/Financial/BAO/PaymentProcessorType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Financial_BAO_PaymentProcessorType extends CRM_Financial_DAO_PaymentProcessorType {
diff --git a/civicrm/CRM/Financial/DAO/Currency.php b/civicrm/CRM/Financial/DAO/Currency.php
index ffc63b8645..5cd99c1302 100644
--- a/civicrm/CRM/Financial/DAO/Currency.php
+++ b/civicrm/CRM/Financial/DAO/Currency.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/Currency.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/DAO/EntityFinancialAccount.php b/civicrm/CRM/Financial/DAO/EntityFinancialAccount.php
index 6eaac4c927..5d2a1503e4 100644
--- a/civicrm/CRM/Financial/DAO/EntityFinancialAccount.php
+++ b/civicrm/CRM/Financial/DAO/EntityFinancialAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/EntityFinancialAccount.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/DAO/EntityFinancialTrxn.php b/civicrm/CRM/Financial/DAO/EntityFinancialTrxn.php
index 8dd2f0109e..56548c3af7 100644
--- a/civicrm/CRM/Financial/DAO/EntityFinancialTrxn.php
+++ b/civicrm/CRM/Financial/DAO/EntityFinancialTrxn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/EntityFinancialTrxn.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/DAO/FinancialAccount.php b/civicrm/CRM/Financial/DAO/FinancialAccount.php
index 5d54625052..eaa1bf5706 100644
--- a/civicrm/CRM/Financial/DAO/FinancialAccount.php
+++ b/civicrm/CRM/Financial/DAO/FinancialAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/FinancialAccount.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/DAO/FinancialItem.php b/civicrm/CRM/Financial/DAO/FinancialItem.php
index d00740cd78..175802d791 100644
--- a/civicrm/CRM/Financial/DAO/FinancialItem.php
+++ b/civicrm/CRM/Financial/DAO/FinancialItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/FinancialItem.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/DAO/FinancialTrxn.php b/civicrm/CRM/Financial/DAO/FinancialTrxn.php
index 5b32a7005f..8ed359b8f5 100644
--- a/civicrm/CRM/Financial/DAO/FinancialTrxn.php
+++ b/civicrm/CRM/Financial/DAO/FinancialTrxn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/FinancialTrxn.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/DAO/FinancialType.php b/civicrm/CRM/Financial/DAO/FinancialType.php
index c594edc93d..95f461bf4d 100644
--- a/civicrm/CRM/Financial/DAO/FinancialType.php
+++ b/civicrm/CRM/Financial/DAO/FinancialType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/FinancialType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/DAO/PaymentProcessor.php b/civicrm/CRM/Financial/DAO/PaymentProcessor.php
index bcbfd3647e..f8eee5ba13 100644
--- a/civicrm/CRM/Financial/DAO/PaymentProcessor.php
+++ b/civicrm/CRM/Financial/DAO/PaymentProcessor.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/PaymentProcessor.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/DAO/PaymentProcessorType.php b/civicrm/CRM/Financial/DAO/PaymentProcessorType.php
index d16fe3ae41..c3f1b389c3 100644
--- a/civicrm/CRM/Financial/DAO/PaymentProcessorType.php
+++ b/civicrm/CRM/Financial/DAO/PaymentProcessorType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/PaymentProcessorType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/DAO/PaymentToken.php b/civicrm/CRM/Financial/DAO/PaymentToken.php
index 6ef8f4bd1e..dc59b54713 100644
--- a/civicrm/CRM/Financial/DAO/PaymentToken.php
+++ b/civicrm/CRM/Financial/DAO/PaymentToken.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Financial/PaymentToken.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Financial/Form/BatchTransaction.php b/civicrm/CRM/Financial/Form/BatchTransaction.php
index 5c6da49a60..e3e35a2391 100644
--- a/civicrm/CRM/Financial/Form/BatchTransaction.php
+++ b/civicrm/CRM/Financial/Form/BatchTransaction.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Form/Export.php b/civicrm/CRM/Financial/Form/Export.php
index 507eb7af03..c5d2059ea3 100644
--- a/civicrm/CRM/Financial/Form/Export.php
+++ b/civicrm/CRM/Financial/Form/Export.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Form/FinancialAccount.php b/civicrm/CRM/Financial/Form/FinancialAccount.php
index cdda52dc92..7e59ffb694 100644
--- a/civicrm/CRM/Financial/Form/FinancialAccount.php
+++ b/civicrm/CRM/Financial/Form/FinancialAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Form/FinancialBatch.php b/civicrm/CRM/Financial/Form/FinancialBatch.php
index cadef1f9c3..24694be0a2 100644
--- a/civicrm/CRM/Financial/Form/FinancialBatch.php
+++ b/civicrm/CRM/Financial/Form/FinancialBatch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Form/FinancialType.php b/civicrm/CRM/Financial/Form/FinancialType.php
index c8069885ad..e811895ab0 100644
--- a/civicrm/CRM/Financial/Form/FinancialType.php
+++ b/civicrm/CRM/Financial/Form/FinancialType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Form/FinancialTypeAccount.php b/civicrm/CRM/Financial/Form/FinancialTypeAccount.php
index c9c9a2a0d9..281193f586 100644
--- a/civicrm/CRM/Financial/Form/FinancialTypeAccount.php
+++ b/civicrm/CRM/Financial/Form/FinancialTypeAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Form/Payment.php b/civicrm/CRM/Financial/Form/Payment.php
index 33958a4c86..122c656b75 100644
--- a/civicrm/CRM/Financial/Form/Payment.php
+++ b/civicrm/CRM/Financial/Form/Payment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Financial_Form_Payment extends CRM_Core_Form {
diff --git a/civicrm/CRM/Financial/Form/Search.php b/civicrm/CRM/Financial/Form/Search.php
index 58951b3f4a..ce4438ea21 100644
--- a/civicrm/CRM/Financial/Form/Search.php
+++ b/civicrm/CRM/Financial/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Page/AJAX.php b/civicrm/CRM/Financial/Page/AJAX.php
index 51468b9559..ac133abba8 100644
--- a/civicrm/CRM/Financial/Page/AJAX.php
+++ b/civicrm/CRM/Financial/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Page/Batch.php b/civicrm/CRM/Financial/Page/Batch.php
index a89d59aa6c..1c656baef6 100644
--- a/civicrm/CRM/Financial/Page/Batch.php
+++ b/civicrm/CRM/Financial/Page/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Page/BatchTransaction.php b/civicrm/CRM/Financial/Page/BatchTransaction.php
index 1ede605618..738b29ae68 100644
--- a/civicrm/CRM/Financial/Page/BatchTransaction.php
+++ b/civicrm/CRM/Financial/Page/BatchTransaction.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
diff --git a/civicrm/CRM/Financial/Page/FinancialAccount.php b/civicrm/CRM/Financial/Page/FinancialAccount.php
index af18959995..7db65b0edc 100644
--- a/civicrm/CRM/Financial/Page/FinancialAccount.php
+++ b/civicrm/CRM/Financial/Page/FinancialAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Page/FinancialBatch.php b/civicrm/CRM/Financial/Page/FinancialBatch.php
index bbe47be138..4e60cac172 100644
--- a/civicrm/CRM/Financial/Page/FinancialBatch.php
+++ b/civicrm/CRM/Financial/Page/FinancialBatch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Page/FinancialType.php b/civicrm/CRM/Financial/Page/FinancialType.php
index 8dfb71aa8d..1bb6a33195 100644
--- a/civicrm/CRM/Financial/Page/FinancialType.php
+++ b/civicrm/CRM/Financial/Page/FinancialType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Financial/Page/FinancialTypeAccount.php b/civicrm/CRM/Financial/Page/FinancialTypeAccount.php
index debb367b59..1a2f76f4f3 100644
--- a/civicrm/CRM/Financial/Page/FinancialTypeAccount.php
+++ b/civicrm/CRM/Financial/Page/FinancialTypeAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Friend/BAO/Friend.php b/civicrm/CRM/Friend/BAO/Friend.php
index 670a7a364b..9e2fe87634 100644
--- a/civicrm/CRM/Friend/BAO/Friend.php
+++ b/civicrm/CRM/Friend/BAO/Friend.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Friend/DAO/Friend.php b/civicrm/CRM/Friend/DAO/Friend.php
index 988ee90b58..118e138cb5 100644
--- a/civicrm/CRM/Friend/DAO/Friend.php
+++ b/civicrm/CRM/Friend/DAO/Friend.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Friend/Friend.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Friend/Form.php b/civicrm/CRM/Friend/Form.php
index 5c0278aecd..ff7322e6b0 100644
--- a/civicrm/CRM/Friend/Form.php
+++ b/civicrm/CRM/Friend/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Friend/Form/Contribute.php b/civicrm/CRM/Friend/Form/Contribute.php
index ffe2f7fe9f..99ee54f9b7 100644
--- a/civicrm/CRM/Friend/Form/Contribute.php
+++ b/civicrm/CRM/Friend/Form/Contribute.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Friend/Form/Event.php b/civicrm/CRM/Friend/Form/Event.php
index 7bd5e6e687..e90d855414 100644
--- a/civicrm/CRM/Friend/Form/Event.php
+++ b/civicrm/CRM/Friend/Form/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/BAO/Grant.php b/civicrm/CRM/Grant/BAO/Grant.php
index 045eab127d..a4c30adb8d 100644
--- a/civicrm/CRM/Grant/BAO/Grant.php
+++ b/civicrm/CRM/Grant/BAO/Grant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/BAO/Query.php b/civicrm/CRM/Grant/BAO/Query.php
index fbd7ba972d..b03b65c25d 100644
--- a/civicrm/CRM/Grant/BAO/Query.php
+++ b/civicrm/CRM/Grant/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Controller/Search.php b/civicrm/CRM/Grant/Controller/Search.php
index bfa65dad3f..7514a7d6a3 100644
--- a/civicrm/CRM/Grant/Controller/Search.php
+++ b/civicrm/CRM/Grant/Controller/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/DAO/Grant.php b/civicrm/CRM/Grant/DAO/Grant.php
index 946ad4322a..5dfc84af76 100644
--- a/civicrm/CRM/Grant/DAO/Grant.php
+++ b/civicrm/CRM/Grant/DAO/Grant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Grant/Grant.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Grant/Form/Grant.php b/civicrm/CRM/Grant/Form/Grant.php
index bb43dd433f..927543463f 100644
--- a/civicrm/CRM/Grant/Form/Grant.php
+++ b/civicrm/CRM/Grant/Form/Grant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Form/GrantView.php b/civicrm/CRM/Grant/Form/GrantView.php
index 3c1b63dadd..fecced4a2a 100644
--- a/civicrm/CRM/Grant/Form/GrantView.php
+++ b/civicrm/CRM/Grant/Form/GrantView.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Form/Search.php b/civicrm/CRM/Grant/Form/Search.php
index 8b6b82c6bd..5e58a6df11 100644
--- a/civicrm/CRM/Grant/Form/Search.php
+++ b/civicrm/CRM/Grant/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Form/Task.php b/civicrm/CRM/Grant/Form/Task.php
index 6b805ab25d..3f5bf626ea 100644
--- a/civicrm/CRM/Grant/Form/Task.php
+++ b/civicrm/CRM/Grant/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Form/Task/Delete.php b/civicrm/CRM/Grant/Form/Task/Delete.php
index f0a6e51aa0..c07d2da8d6 100644
--- a/civicrm/CRM/Grant/Form/Task/Delete.php
+++ b/civicrm/CRM/Grant/Form/Task/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Form/Task/Print.php b/civicrm/CRM/Grant/Form/Task/Print.php
index bd98cbe94e..b606bf5a30 100644
--- a/civicrm/CRM/Grant/Form/Task/Print.php
+++ b/civicrm/CRM/Grant/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Form/Task/Result.php b/civicrm/CRM/Grant/Form/Task/Result.php
index 723cd58a54..aded9b163d 100644
--- a/civicrm/CRM/Grant/Form/Task/Result.php
+++ b/civicrm/CRM/Grant/Form/Task/Result.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Grant/Form/Task/SearchTaskHookSample.php
index d84d5a9ac4..7305c2a70c 100644
--- a/civicrm/CRM/Grant/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Grant/Form/Task/SearchTaskHookSample.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Form/Task/Update.php b/civicrm/CRM/Grant/Form/Task/Update.php
index 68cfc70900..ecd8ddddb0 100644
--- a/civicrm/CRM/Grant/Form/Task/Update.php
+++ b/civicrm/CRM/Grant/Form/Task/Update.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Info.php b/civicrm/CRM/Grant/Info.php
index 595d2614d5..ff42c27a8e 100644
--- a/civicrm/CRM/Grant/Info.php
+++ b/civicrm/CRM/Grant/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* abstract class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Page/DashBoard.php b/civicrm/CRM/Grant/Page/DashBoard.php
index fa8ab66453..f0ec274124 100644
--- a/civicrm/CRM/Grant/Page/DashBoard.php
+++ b/civicrm/CRM/Grant/Page/DashBoard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Page/Tab.php b/civicrm/CRM/Grant/Page/Tab.php
index 8293da8917..2a446f18b4 100644
--- a/civicrm/CRM/Grant/Page/Tab.php
+++ b/civicrm/CRM/Grant/Page/Tab.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Selector/Search.php b/civicrm/CRM/Grant/Selector/Search.php
index c973e061d2..92a42f52db 100644
--- a/civicrm/CRM/Grant/Selector/Search.php
+++ b/civicrm/CRM/Grant/Selector/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/StateMachine/Search.php b/civicrm/CRM/Grant/StateMachine/Search.php
index df1cf9f7f6..c38316fada 100644
--- a/civicrm/CRM/Grant/StateMachine/Search.php
+++ b/civicrm/CRM/Grant/StateMachine/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Grant/Task.php b/civicrm/CRM/Grant/Task.php
index 23ba438617..8a8f50b68a 100644
--- a/civicrm/CRM/Grant/Task.php
+++ b/civicrm/CRM/Grant/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Group/Controller.php b/civicrm/CRM/Group/Controller.php
index b70a096aaf..debc2e7857 100644
--- a/civicrm/CRM/Group/Controller.php
+++ b/civicrm/CRM/Group/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Group/Form/Edit.php b/civicrm/CRM/Group/Form/Edit.php
index ad97550ff8..ab615f9958 100644
--- a/civicrm/CRM/Group/Form/Edit.php
+++ b/civicrm/CRM/Group/Form/Edit.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Group/Form/Search.php b/civicrm/CRM/Group/Form/Search.php
index 9d2404d8a1..7e07ae9916 100644
--- a/civicrm/CRM/Group/Form/Search.php
+++ b/civicrm/CRM/Group/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Group/Page/AJAX.php b/civicrm/CRM/Group/Page/AJAX.php
index 96894203ef..57d57b0318 100644
--- a/civicrm/CRM/Group/Page/AJAX.php
+++ b/civicrm/CRM/Group/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
*/
@@ -43,7 +43,6 @@ class CRM_Group_Page_AJAX {
*/
public static function getGroupList() {
$params = $_GET;
-
if (isset($params['parent_id'])) {
// requesting child groups for a given parent
$params['page'] = 1;
@@ -55,7 +54,8 @@ class CRM_Group_Page_AJAX {
else {
$sortMapper = array();
- foreach ($_GET['columns'] as $key => $value) {
+ $columns = CRM_Utils_Array::value('columns', $params, array());
+ foreach ($columns as $key => $value) {
$sortMapper[$key] = $value['data'];
};
@@ -90,7 +90,7 @@ class CRM_Group_Page_AJAX {
//@todo - ideally the portion of this that retrieves the groups should be extracted into a function separate
// from the one which deals with web inputs & outputs so we have a properly testable & re-usable function
if (!empty($params['is_unit_test'])) {
- return array($groups, $iFilteredTotal);
+ return array($groups['data'], $params['total']);
}
CRM_Utils_JSON::output($groups);
}
diff --git a/civicrm/CRM/Group/Page/Group.php b/civicrm/CRM/Group/Page/Group.php
index d1d825290a..6d64276319 100644
--- a/civicrm/CRM/Group/Page/Group.php
+++ b/civicrm/CRM/Group/Page/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Group_Page_Group extends CRM_Core_Page_Basic {
protected $_sortByCharacter;
diff --git a/civicrm/CRM/Group/StateMachine.php b/civicrm/CRM/Group/StateMachine.php
index 09e850d91f..c9a9bd52c7 100644
--- a/civicrm/CRM/Group/StateMachine.php
+++ b/civicrm/CRM/Group/StateMachine.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Import/DataSource.php b/civicrm/CRM/Import/DataSource.php
index 4fc206855f..3e33ee8c7c 100644
--- a/civicrm/CRM/Import/DataSource.php
+++ b/civicrm/CRM/Import/DataSource.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Import/DataSource/CSV.php b/civicrm/CRM/Import/DataSource/CSV.php
index 488a0dd57a..6d7d6dd033 100644
--- a/civicrm/CRM/Import/DataSource/CSV.php
+++ b/civicrm/CRM/Import/DataSource/CSV.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Import_DataSource_CSV extends CRM_Import_DataSource {
const
diff --git a/civicrm/CRM/Import/DataSource/SQL.php b/civicrm/CRM/Import/DataSource/SQL.php
index 9b91bac7ff..16418c55f8 100644
--- a/civicrm/CRM/Import/DataSource/SQL.php
+++ b/civicrm/CRM/Import/DataSource/SQL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Import/Form/DataSource.php b/civicrm/CRM/Import/Form/DataSource.php
index 6bb5bb125a..ba2d1c6c24 100644
--- a/civicrm/CRM/Import/Form/DataSource.php
+++ b/civicrm/CRM/Import/Form/DataSource.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Import/Form/MapField.php b/civicrm/CRM/Import/Form/MapField.php
index 0d7f99d754..cb2a9c4c8b 100644
--- a/civicrm/CRM/Import/Form/MapField.php
+++ b/civicrm/CRM/Import/Form/MapField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Import/Form/Preview.php b/civicrm/CRM/Import/Form/Preview.php
index fab8a99ea8..1d9e11da91 100644
--- a/civicrm/CRM/Import/Form/Preview.php
+++ b/civicrm/CRM/Import/Form/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Import/Form/Summary.php b/civicrm/CRM/Import/Form/Summary.php
index c8a564085a..7dd9ddc0e0 100644
--- a/civicrm/CRM/Import/Form/Summary.php
+++ b/civicrm/CRM/Import/Form/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Import/Parser.php b/civicrm/CRM/Import/Parser.php
index d0946b2665..295a839f7c 100644
--- a/civicrm/CRM/Import/Parser.php
+++ b/civicrm/CRM/Import/Parser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
abstract class CRM_Import_Parser {
/**
diff --git a/civicrm/CRM/Import/StateMachine.php b/civicrm/CRM/Import/StateMachine.php
index a418e10af3..abb749861e 100644
--- a/civicrm/CRM/Import/StateMachine.php
+++ b/civicrm/CRM/Import/StateMachine.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Logging/Differ.php b/civicrm/CRM/Logging/Differ.php
index 77d2caf1c1..29af786f29 100644
--- a/civicrm/CRM/Logging/Differ.php
+++ b/civicrm/CRM/Logging/Differ.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Logging/ReportDetail.php b/civicrm/CRM/Logging/ReportDetail.php
index 88a5336c11..d3dc85cf32 100644
--- a/civicrm/CRM/Logging/ReportDetail.php
+++ b/civicrm/CRM/Logging/ReportDetail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Logging/ReportSummary.php b/civicrm/CRM/Logging/ReportSummary.php
index 45c8759cc3..8fab3028d4 100644
--- a/civicrm/CRM/Logging/ReportSummary.php
+++ b/civicrm/CRM/Logging/ReportSummary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
class CRM_Logging_ReportSummary extends CRM_Report_Form {
@@ -38,6 +38,13 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
protected $loggingDB;
+ /**
+ * The log table currently being processed.
+ *
+ * @var string
+ */
+ protected $currentLogTable;
+
/**
* Class constructor.
*/
@@ -49,12 +56,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
$this->loggingDB = $dsn['database'];
// used for redirect back to contact summary
- $this->cid = CRM_Utils_Request::retrieve('cid', 'Integer', CRM_Core_DAO::$_nullObject);
-
- $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name');
- $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
- $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts);
- $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
+ $this->cid = CRM_Utils_Request::retrieve('cid', 'Integer');
$this->_logTables = array(
'log_civicrm_contact' => array(
@@ -120,44 +122,17 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
'column' => 'label_a_b',
),
),
- 'log_civicrm_activity_for_target' => array(
- 'fk' => 'contact_id',
- 'table_name' => 'log_civicrm_activity',
- 'joins' => array(
- 'table' => 'log_civicrm_activity_contact',
- 'join' => "(entity_log_civireport.id = fk_table.activity_id AND fk_table.record_type_id = {$targetID})",
- ),
- 'bracket_info' => array(
- 'entity_column' => 'activity_type_id',
- 'options' => CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE),
- ),
- 'log_type' => 'Activity',
- ),
- 'log_civicrm_activity_for_assignee' => array(
+ 'log_civicrm_activity_contact' => array(
'fk' => 'contact_id',
- 'table_name' => 'log_civicrm_activity',
- 'joins' => array(
- 'table' => 'log_civicrm_activity_contact',
- 'join' => "entity_log_civireport.id = fk_table.activity_id AND fk_table.record_type_id = {$assigneeID}",
- ),
- 'bracket_info' => array(
- 'entity_column' => 'activity_type_id',
- 'options' => CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE),
- ),
+ 'table_name' => 'log_civicrm_activity_contact',
'log_type' => 'Activity',
- ),
- 'log_civicrm_activity_for_source' => array(
- 'fk' => 'contact_id',
- 'table_name' => 'log_civicrm_activity',
- 'joins' => array(
- 'table' => 'log_civicrm_activity_contact',
- 'join' => "entity_log_civireport.id = fk_table.activity_id AND fk_table.record_type_id = {$sourceID}",
- ),
+ 'field' => 'activity_id',
+
'bracket_info' => array(
'entity_column' => 'activity_type_id',
'options' => CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE),
+ 'lookup_table' => 'log_civicrm_activity',
),
- 'log_type' => 'Activity',
),
'log_civicrm_case' => array(
'fk' => 'contact_id',
@@ -208,24 +183,25 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
$this->_groupBy = 'GROUP BY entity_log_civireport.log_conn_id, entity_log_civireport.log_user_id, EXTRACT(DAY_MICROSECOND FROM entity_log_civireport.log_date), entity_log_civireport.id';
}
- 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 (CRM_Utils_Array::value('required', $field) or
- CRM_Utils_Array::value($fieldName, $this->_params['fields'])
- ) {
- $select[] = "{$field['dbAlias']} as {$tableName}_{$fieldName}";
- $this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] = CRM_Utils_Array::value('type', $field);
- $this->_columnHeaders["{$tableName}_{$fieldName}"]['no_display'] = CRM_Utils_Array::value('no_display', $field);
- $this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = CRM_Utils_Array::value('title', $field);
- }
- }
- }
+ /**
+ * Adjust query for the activity_contact table.
+ *
+ * As this is just a join table the ID we REALLY care about is the activity id.
+ *
+ * @param string $tableName
+ * @param string $tableKey
+ * @param string $fieldName
+ * @param string $field
+ *
+ * @return string
+ */
+ public function selectClause(&$tableName, $tableKey, &$fieldName, &$field) {
+ if ($this->currentLogTable == 'log_civicrm_activity_contact' && $fieldName == 'id') {
+ $alias = "{$tableName}_{$fieldName}";
+ $select[] = "{$tableName}.activity_id as $alias";
+ $this->_selectAliases[] = $alias;
+ return "activity_id";
}
- $this->_select = 'SELECT ' . implode(', ', $select) . ' ';
}
public function where() {
@@ -257,15 +233,6 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
$sql = "CREATE TEMPORARY TABLE civicrm_temp_civireport_logsummary ( {$tempColumns} ) ENGINE=HEAP";
CRM_Core_DAO::executeQuery($sql);
- $logDateClause = $this->dateClause('log_date',
- CRM_Utils_Array::value("log_date_relative", $this->_params),
- CRM_Utils_Array::value("log_date_from", $this->_params),
- CRM_Utils_Array::value("log_date_to", $this->_params),
- CRM_Utils_Type::T_DATE,
- CRM_Utils_Array::value("log_date_from_time", $this->_params),
- CRM_Utils_Array::value("log_date_to_time", $this->_params));
- $logDateClause = $logDateClause ? "AND {$logDateClause}" : NULL;
-
$logTypes = CRM_Utils_Array::value('log_type_value', $this->_params);
unset($this->_params['log_type_value']);
if (empty($logTypes)) {
@@ -288,7 +255,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
(!in_array($this->getLogType($entity), $logTypes) &&
CRM_Utils_Array::value('log_type_op', $this->_params) == 'notin')
) {
- $this->from($entity);
+ $this->currentLogTable = $entity;
$sql = $this->buildQuery(FALSE);
$sql = str_replace("entity_log_civireport.log_type as", "'{$entity}' as", $sql);
$sql = "INSERT IGNORE INTO civicrm_temp_civireport_logsummary {$sql}";
@@ -296,6 +263,8 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form {
}
}
+ $this->currentLogTable = '';
+
// add computed log_type column so that we can do a group by after that, which will help
// alterDisplay() counts sync with pager counts
$sql = "SELECT DISTINCT log_type FROM civicrm_temp_civireport_logsummary";
@@ -374,10 +343,14 @@ ORDER BY log_civicrm_entity_log_date DESC {$this->_limit}";
if (!empty($this->_logTables[$entity]['bracket_info'])) {
if (!empty($this->_logTables[$entity]['bracket_info']['entity_column'])) {
$logTable = !empty($this->_logTables[$entity]['table_name']) ? $this->_logTables[$entity]['table_name'] : $entity;
+ if (!empty($this->_logTables[$entity]['bracket_info']['lookup_table'])) {
+ $logTable = $this->_logTables[$entity]['bracket_info']['lookup_table'];
+ }
$sql = "
SELECT {$this->_logTables[$entity]['bracket_info']['entity_column']}
FROM `{$this->loggingDB}`.{$logTable}
WHERE log_date <= %1 AND id = %2 ORDER BY log_date DESC LIMIT 1";
+
$entityID = CRM_Core_DAO::singleValueQuery($sql, array(
1 => array(
CRM_Utils_Date::isoToMysql($logDate),
diff --git a/civicrm/CRM/Logging/Reverter.php b/civicrm/CRM/Logging/Reverter.php
index ed04ddb4b2..d16bb7d10e 100644
--- a/civicrm/CRM/Logging/Reverter.php
+++ b/civicrm/CRM/Logging/Reverter.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Logging/Schema.php b/civicrm/CRM/Logging/Schema.php
index 98e6ed562e..959b1a1326 100644
--- a/civicrm/CRM/Logging/Schema.php
+++ b/civicrm/CRM/Logging/Schema.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Logging_Schema {
private $logs = array();
diff --git a/civicrm/CRM/Mailing/BAO/BouncePattern.php b/civicrm/CRM/Mailing/BAO/BouncePattern.php
index bc1afee78b..b307acb8a6 100644
--- a/civicrm/CRM/Mailing/BAO/BouncePattern.php
+++ b/civicrm/CRM/Mailing/BAO/BouncePattern.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_BAO_BouncePattern extends CRM_Mailing_DAO_BouncePattern {
diff --git a/civicrm/CRM/Mailing/BAO/Component.php b/civicrm/CRM/Mailing/BAO/Component.php
index 0aa771faac..53d58eb1df 100644
--- a/civicrm/CRM/Mailing/BAO/Component.php
+++ b/civicrm/CRM/Mailing/BAO/Component.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_BAO_Component extends CRM_Mailing_DAO_Component {
diff --git a/civicrm/CRM/Mailing/BAO/Mailing.php b/civicrm/CRM/Mailing/BAO/Mailing.php
index 58d4f00de2..a863b10ff1 100644
--- a/civicrm/CRM/Mailing/BAO/Mailing.php
+++ b/civicrm/CRM/Mailing/BAO/Mailing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'Mail/mime.php';
@@ -615,7 +615,7 @@ ORDER BY i.contact_id, i.{$tempColumn}
$patterns = array();
- $protos = '(https?|ftp)';
+ $protos = '(https?|ftp|mailto)';
$letters = '\w';
$gunk = '\{\}/#~:.?+=&;%@!\,\-\|\(\)\*';
$punc = '.:?\-';
@@ -2454,6 +2454,19 @@ LEFT JOIN civicrm_mailing_group g ON g.mailing_id = m.id
while ($dao->fetch()) {
$mailingIDs[] = $dao->id;
}
+ //CRM-18181 Get all mailings that use the mailings found earlier as receipients
+ if (!empty($mailingIDs)) {
+ $mailings = implode(',', $mailingIDs);
+ $mailingQuery = "
+ SELECT DISTINCT ( m.id ) as id
+ FROM civicrm_mailing m
+ LEFT JOIN civicrm_mailing_group g ON g.mailing_id = m.id
+ WHERE g.entity_table like 'civicrm_mailing%' AND g.entity_id IN ($mailings)";
+ $mailingDao = CRM_Core_DAO::executeQuery($mailingQuery);
+ while ($mailingDao->fetch()) {
+ $mailingIDs[] = $mailingDao->id;
+ }
+ }
}
return $mailingIDs;
diff --git a/civicrm/CRM/Mailing/BAO/MailingAB.php b/civicrm/CRM/Mailing/BAO/MailingAB.php
index ddaa5247c1..570a3c168e 100644
--- a/civicrm/CRM/Mailing/BAO/MailingAB.php
+++ b/civicrm/CRM/Mailing/BAO/MailingAB.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/BAO/MailingJob.php b/civicrm/CRM/Mailing/BAO/MailingJob.php
index 21fd3c9d55..de0ec021f1 100644
--- a/civicrm/CRM/Mailing/BAO/MailingJob.php
+++ b/civicrm/CRM/Mailing/BAO/MailingJob.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'Mail.php';
diff --git a/civicrm/CRM/Mailing/BAO/Query.php b/civicrm/CRM/Mailing/BAO/Query.php
index 56e1df0f62..5e563472e2 100644
--- a/civicrm/CRM/Mailing/BAO/Query.php
+++ b/civicrm/CRM/Mailing/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_BAO_Query {
diff --git a/civicrm/CRM/Mailing/BAO/Recipients.php b/civicrm/CRM/Mailing/BAO/Recipients.php
index 971e4727ef..80fb7f8425 100644
--- a/civicrm/CRM/Mailing/BAO/Recipients.php
+++ b/civicrm/CRM/Mailing/BAO/Recipients.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_BAO_Recipients extends CRM_Mailing_DAO_Recipients {
diff --git a/civicrm/CRM/Mailing/BAO/Spool.php b/civicrm/CRM/Mailing/BAO/Spool.php
index 708ca0e3b6..513270d94c 100644
--- a/civicrm/CRM/Mailing/BAO/Spool.php
+++ b/civicrm/CRM/Mailing/BAO/Spool.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_BAO_Spool extends CRM_Mailing_DAO_Spool {
diff --git a/civicrm/CRM/Mailing/BAO/TrackableURL.php b/civicrm/CRM/Mailing/BAO/TrackableURL.php
index a7e6b4b841..398c7dbe77 100644
--- a/civicrm/CRM/Mailing/BAO/TrackableURL.php
+++ b/civicrm/CRM/Mailing/BAO/TrackableURL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_BAO_TrackableURL extends CRM_Mailing_DAO_TrackableURL {
@@ -123,33 +123,4 @@ class CRM_Mailing_BAO_TrackableURL extends CRM_Mailing_DAO_TrackableURL {
return NULL;
}
- /**
- * @param $msg
- * @param int $mailing_id
- * @param int $queue_id
- * @param bool $onlyHrefs
- */
- public static function scan_and_replace(&$msg, $mailing_id, $queue_id, $onlyHrefs = FALSE) {
- if (!$mailing_id) {
- return;
- }
-
- $protos = '(https?|ftp)';
- $letters = '\w';
- $gunk = '/#~:.?+=&%@!\-';
- $punc = '.:?\-';
- $any = "{$letters}{$gunk}{$punc}";
- if ($onlyHrefs) {
- $pattern = "{\\b(href=([\"'])?($protos:[$any]+?(?=[$punc]*[^$any]|$))([\"'])?)}im";
- }
- else {
- $pattern = "{\\b($protos:[$any]+?(?=[$punc]*[^$any]|$))}eim";
- }
-
- $trackURL = CRM_Mailing_BAO_TrackableURL::getTrackerURL('\\1', $mailing_id, $queue_id);
- $replacement = $onlyHrefs ? ("href=\"{$trackURL}\"") : ("\"{$trackURL}\"");
-
- $msg = preg_replace($pattern, $replacement, $msg);
- }
-
}
diff --git a/civicrm/CRM/Mailing/Config.php b/civicrm/CRM/Mailing/Config.php
index 191a37740e..9924aa7d8e 100644
--- a/civicrm/CRM/Mailing/Config.php
+++ b/civicrm/CRM/Mailing/Config.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Config {
diff --git a/civicrm/CRM/Mailing/Controller/Send.php b/civicrm/CRM/Mailing/Controller/Send.php
index 73ba40b9e2..9bc643fbf1 100644
--- a/civicrm/CRM/Mailing/Controller/Send.php
+++ b/civicrm/CRM/Mailing/Controller/Send.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Controller_Send extends CRM_Core_Controller {
diff --git a/civicrm/CRM/Mailing/DAO/BouncePattern.php b/civicrm/CRM/Mailing/DAO/BouncePattern.php
index 5e1687e70c..f6384a82a2 100644
--- a/civicrm/CRM/Mailing/DAO/BouncePattern.php
+++ b/civicrm/CRM/Mailing/DAO/BouncePattern.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/BouncePattern.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/DAO/BounceType.php b/civicrm/CRM/Mailing/DAO/BounceType.php
index 00515ecc63..ca5217fb2e 100644
--- a/civicrm/CRM/Mailing/DAO/BounceType.php
+++ b/civicrm/CRM/Mailing/DAO/BounceType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/BounceType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/DAO/Component.php b/civicrm/CRM/Mailing/DAO/Component.php
index 34e7220a13..e78f595f80 100644
--- a/civicrm/CRM/Mailing/DAO/Component.php
+++ b/civicrm/CRM/Mailing/DAO/Component.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Component.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/DAO/Mailing.php b/civicrm/CRM/Mailing/DAO/Mailing.php
index ceaeb0851d..356a2b7223 100644
--- a/civicrm/CRM/Mailing/DAO/Mailing.php
+++ b/civicrm/CRM/Mailing/DAO/Mailing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Mailing.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/DAO/MailingAB.php b/civicrm/CRM/Mailing/DAO/MailingAB.php
index 188ee8c408..ac711737c5 100644
--- a/civicrm/CRM/Mailing/DAO/MailingAB.php
+++ b/civicrm/CRM/Mailing/DAO/MailingAB.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/MailingAB.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/DAO/MailingGroup.php b/civicrm/CRM/Mailing/DAO/MailingGroup.php
index cd6111184f..7bdf4ad90f 100644
--- a/civicrm/CRM/Mailing/DAO/MailingGroup.php
+++ b/civicrm/CRM/Mailing/DAO/MailingGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/MailingGroup.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/DAO/MailingJob.php b/civicrm/CRM/Mailing/DAO/MailingJob.php
index 33693345ef..a8b45658dc 100644
--- a/civicrm/CRM/Mailing/DAO/MailingJob.php
+++ b/civicrm/CRM/Mailing/DAO/MailingJob.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/MailingJob.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/DAO/Recipients.php b/civicrm/CRM/Mailing/DAO/Recipients.php
index 6c1fdd25cc..853b0adb71 100644
--- a/civicrm/CRM/Mailing/DAO/Recipients.php
+++ b/civicrm/CRM/Mailing/DAO/Recipients.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Recipients.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/DAO/Spool.php b/civicrm/CRM/Mailing/DAO/Spool.php
index 246ff046ae..042ccc275a 100644
--- a/civicrm/CRM/Mailing/DAO/Spool.php
+++ b/civicrm/CRM/Mailing/DAO/Spool.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Spool.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/DAO/TrackableURL.php b/civicrm/CRM/Mailing/DAO/TrackableURL.php
index f1a6e03fab..c6d8fb63b2 100644
--- a/civicrm/CRM/Mailing/DAO/TrackableURL.php
+++ b/civicrm/CRM/Mailing/DAO/TrackableURL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/TrackableURL.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/BAO/Bounce.php b/civicrm/CRM/Mailing/Event/BAO/Bounce.php
index ab51735211..fc050f48ce 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Bounce.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Bounce.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Event_BAO_Bounce extends CRM_Mailing_Event_DAO_Bounce {
diff --git a/civicrm/CRM/Mailing/Event/BAO/Confirm.php b/civicrm/CRM/Mailing/Event/BAO/Confirm.php
index e45762abb7..b190586ead 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Confirm.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Confirm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'Mail/mime.php';
diff --git a/civicrm/CRM/Mailing/Event/BAO/Delivered.php b/civicrm/CRM/Mailing/Event/BAO/Delivered.php
index 8aed89cdaa..4b43cd5fa2 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Delivered.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Delivered.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered {
diff --git a/civicrm/CRM/Mailing/Event/BAO/Forward.php b/civicrm/CRM/Mailing/Event/BAO/Forward.php
index 133cb61a5f..ea3faed8e5 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Forward.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Forward.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Event_BAO_Forward extends CRM_Mailing_Event_DAO_Forward {
diff --git a/civicrm/CRM/Mailing/Event/BAO/Opened.php b/civicrm/CRM/Mailing/Event/BAO/Opened.php
index 3ebbaa72f3..451e8b9b90 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Opened.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Opened.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Event_BAO_Opened extends CRM_Mailing_Event_DAO_Opened {
diff --git a/civicrm/CRM/Mailing/Event/BAO/Queue.php b/civicrm/CRM/Mailing/Event/BAO/Queue.php
index 7e0a6db2c0..cd34b73ea5 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Queue.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Queue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Event_BAO_Queue extends CRM_Mailing_Event_DAO_Queue {
diff --git a/civicrm/CRM/Mailing/Event/BAO/Reply.php b/civicrm/CRM/Mailing/Event/BAO/Reply.php
index a533938641..6a8e7a8c16 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Reply.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Reply.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'Mail/mime.php';
diff --git a/civicrm/CRM/Mailing/Event/BAO/Resubscribe.php b/civicrm/CRM/Mailing/Event/BAO/Resubscribe.php
index 6ad69fb87d..16e81ff0be 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Resubscribe.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Resubscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'Mail/mime.php';
diff --git a/civicrm/CRM/Mailing/Event/BAO/Subscribe.php b/civicrm/CRM/Mailing/Event/BAO/Subscribe.php
index 9b53cceb66..01681cc94e 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Subscribe.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Subscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
diff --git a/civicrm/CRM/Mailing/Event/BAO/TrackableURLOpen.php b/civicrm/CRM/Mailing/Event/BAO/TrackableURLOpen.php
index 8eecbd668d..18e3284bbd 100644
--- a/civicrm/CRM/Mailing/Event/BAO/TrackableURLOpen.php
+++ b/civicrm/CRM/Mailing/Event/BAO/TrackableURLOpen.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_TrackableURLOpen {
diff --git a/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php b/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php
index ae97c496d2..5e3fb52df1 100644
--- a/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php
+++ b/civicrm/CRM/Mailing/Event/BAO/Unsubscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'Mail/mime.php';
diff --git a/civicrm/CRM/Mailing/Event/DAO/Bounce.php b/civicrm/CRM/Mailing/Event/DAO/Bounce.php
index 585d7d6219..210a000e63 100644
--- a/civicrm/CRM/Mailing/Event/DAO/Bounce.php
+++ b/civicrm/CRM/Mailing/Event/DAO/Bounce.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/Bounce.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/DAO/Confirm.php b/civicrm/CRM/Mailing/Event/DAO/Confirm.php
index e4d0818856..b8bec029ea 100644
--- a/civicrm/CRM/Mailing/Event/DAO/Confirm.php
+++ b/civicrm/CRM/Mailing/Event/DAO/Confirm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/Confirm.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/DAO/Delivered.php b/civicrm/CRM/Mailing/Event/DAO/Delivered.php
index 7be168bc44..ccfc232a89 100644
--- a/civicrm/CRM/Mailing/Event/DAO/Delivered.php
+++ b/civicrm/CRM/Mailing/Event/DAO/Delivered.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/Delivered.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/DAO/Forward.php b/civicrm/CRM/Mailing/Event/DAO/Forward.php
index 9059f29b05..26b782e90f 100644
--- a/civicrm/CRM/Mailing/Event/DAO/Forward.php
+++ b/civicrm/CRM/Mailing/Event/DAO/Forward.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/Forward.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/DAO/Opened.php b/civicrm/CRM/Mailing/Event/DAO/Opened.php
index cac07d6496..772d88c4d1 100644
--- a/civicrm/CRM/Mailing/Event/DAO/Opened.php
+++ b/civicrm/CRM/Mailing/Event/DAO/Opened.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/Opened.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/DAO/Queue.php b/civicrm/CRM/Mailing/Event/DAO/Queue.php
index 0b3af09d8d..a8e43b66e3 100644
--- a/civicrm/CRM/Mailing/Event/DAO/Queue.php
+++ b/civicrm/CRM/Mailing/Event/DAO/Queue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/Queue.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/DAO/Reply.php b/civicrm/CRM/Mailing/Event/DAO/Reply.php
index 86239955da..6f4c2aac34 100644
--- a/civicrm/CRM/Mailing/Event/DAO/Reply.php
+++ b/civicrm/CRM/Mailing/Event/DAO/Reply.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/Reply.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/DAO/Subscribe.php b/civicrm/CRM/Mailing/Event/DAO/Subscribe.php
index 6c6113cdae..5a32fe6424 100644
--- a/civicrm/CRM/Mailing/Event/DAO/Subscribe.php
+++ b/civicrm/CRM/Mailing/Event/DAO/Subscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/Subscribe.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/DAO/TrackableURLOpen.php b/civicrm/CRM/Mailing/Event/DAO/TrackableURLOpen.php
index 5239dfa87d..968eeb452e 100644
--- a/civicrm/CRM/Mailing/Event/DAO/TrackableURLOpen.php
+++ b/civicrm/CRM/Mailing/Event/DAO/TrackableURLOpen.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/TrackableURLOpen.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Event/DAO/Unsubscribe.php b/civicrm/CRM/Mailing/Event/DAO/Unsubscribe.php
index 9f840ececa..1b62384def 100644
--- a/civicrm/CRM/Mailing/Event/DAO/Unsubscribe.php
+++ b/civicrm/CRM/Mailing/Event/DAO/Unsubscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Mailing/Event/Unsubscribe.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Mailing/Form/Approve.php b/civicrm/CRM/Mailing/Form/Approve.php
index 764810ca9e..63bfc35eb5 100644
--- a/civicrm/CRM/Mailing/Form/Approve.php
+++ b/civicrm/CRM/Mailing/Form/Approve.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Form_Approve extends CRM_Core_Form {
diff --git a/civicrm/CRM/Mailing/Form/Browse.php b/civicrm/CRM/Mailing/Form/Browse.php
index 9be619f973..17be971f9f 100644
--- a/civicrm/CRM/Mailing/Form/Browse.php
+++ b/civicrm/CRM/Mailing/Form/Browse.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Form/Component.php b/civicrm/CRM/Mailing/Form/Component.php
index 7ac3c88f5e..f6d0a83df2 100644
--- a/civicrm/CRM/Mailing/Form/Component.php
+++ b/civicrm/CRM/Mailing/Form/Component.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Form/ForwardMailing.php b/civicrm/CRM/Mailing/Form/ForwardMailing.php
index cf667c0fac..42ba73ceef 100644
--- a/civicrm/CRM/Mailing/Form/ForwardMailing.php
+++ b/civicrm/CRM/Mailing/Form/ForwardMailing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Form_ForwardMailing extends CRM_Core_Form {
public function preProcess() {
diff --git a/civicrm/CRM/Mailing/Form/Optout.php b/civicrm/CRM/Mailing/Form/Optout.php
index 3785b8f5f5..8e2d79b5e4 100644
--- a/civicrm/CRM/Mailing/Form/Optout.php
+++ b/civicrm/CRM/Mailing/Form/Optout.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Form_Optout extends CRM_Core_Form {
diff --git a/civicrm/CRM/Mailing/Form/Search.php b/civicrm/CRM/Mailing/Form/Search.php
index 085e3c1a5a..ad434b966a 100644
--- a/civicrm/CRM/Mailing/Form/Search.php
+++ b/civicrm/CRM/Mailing/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Form_Search extends CRM_Core_Form {
diff --git a/civicrm/CRM/Mailing/Form/Subscribe.php b/civicrm/CRM/Mailing/Form/Subscribe.php
index 8bc3bbda75..28672cba7e 100644
--- a/civicrm/CRM/Mailing/Form/Subscribe.php
+++ b/civicrm/CRM/Mailing/Form/Subscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Form_Subscribe extends CRM_Core_Form {
protected $_groupID = NULL;
diff --git a/civicrm/CRM/Mailing/Form/Task.php b/civicrm/CRM/Mailing/Form/Task.php
index 0b4802247f..4d53fd3cd6 100644
--- a/civicrm/CRM/Mailing/Form/Task.php
+++ b/civicrm/CRM/Mailing/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Form/Task/AdhocMailing.php b/civicrm/CRM/Mailing/Form/Task/AdhocMailing.php
index 2361c9af33..454cad702a 100644
--- a/civicrm/CRM/Mailing/Form/Task/AdhocMailing.php
+++ b/civicrm/CRM/Mailing/Form/Task/AdhocMailing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Form/Task/Print.php b/civicrm/CRM/Mailing/Form/Task/Print.php
index 1e341f5a4d..c21fa2e145 100644
--- a/civicrm/CRM/Mailing/Form/Task/Print.php
+++ b/civicrm/CRM/Mailing/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Form/Unsubscribe.php b/civicrm/CRM/Mailing/Form/Unsubscribe.php
index 84b0a0d7e6..21ee4e7342 100644
--- a/civicrm/CRM/Mailing/Form/Unsubscribe.php
+++ b/civicrm/CRM/Mailing/Form/Unsubscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Form_Unsubscribe extends CRM_Core_Form {
diff --git a/civicrm/CRM/Mailing/Info.php b/civicrm/CRM/Mailing/Info.php
index a4dd73c6d0..a913567be0 100644
--- a/civicrm/CRM/Mailing/Info.php
+++ b/civicrm/CRM/Mailing/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* abstract class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Info extends CRM_Core_Component_Info {
diff --git a/civicrm/CRM/Mailing/MailStore.php b/civicrm/CRM/Mailing/MailStore.php
index 10cb7d6ba2..1d9361fa19 100644
--- a/civicrm/CRM/Mailing/MailStore.php
+++ b/civicrm/CRM/Mailing/MailStore.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_MailStore {
// flag to decide whether to print debug messages
diff --git a/civicrm/CRM/Mailing/MailStore/Imap.php b/civicrm/CRM/Mailing/MailStore/Imap.php
index b07ea2b1ea..129ca04e52 100644
--- a/civicrm/CRM/Mailing/MailStore/Imap.php
+++ b/civicrm/CRM/Mailing/MailStore/Imap.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/MailStore/Localdir.php b/civicrm/CRM/Mailing/MailStore/Localdir.php
index 42bd18bb66..fc5b69a78a 100644
--- a/civicrm/CRM/Mailing/MailStore/Localdir.php
+++ b/civicrm/CRM/Mailing/MailStore/Localdir.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/MailStore/Maildir.php b/civicrm/CRM/Mailing/MailStore/Maildir.php
index c8fc360e1f..9e62c511b8 100644
--- a/civicrm/CRM/Mailing/MailStore/Maildir.php
+++ b/civicrm/CRM/Mailing/MailStore/Maildir.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/MailStore/Mbox.php b/civicrm/CRM/Mailing/MailStore/Mbox.php
index d7dd47b0f5..28124766f1 100644
--- a/civicrm/CRM/Mailing/MailStore/Mbox.php
+++ b/civicrm/CRM/Mailing/MailStore/Mbox.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/MailStore/Pop3.php b/civicrm/CRM/Mailing/MailStore/Pop3.php
index 68d40e9ede..df5a9d8940 100644
--- a/civicrm/CRM/Mailing/MailStore/Pop3.php
+++ b/civicrm/CRM/Mailing/MailStore/Pop3.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Page/AJAX.php b/civicrm/CRM/Mailing/Page/AJAX.php
index fb93d523fa..3ef15548b5 100644
--- a/civicrm/CRM/Mailing/Page/AJAX.php
+++ b/civicrm/CRM/Mailing/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Page/Browse.php b/civicrm/CRM/Mailing/Page/Browse.php
index 33c7e81a14..14dc2c1350 100644
--- a/civicrm/CRM/Mailing/Page/Browse.php
+++ b/civicrm/CRM/Mailing/Page/Browse.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Page/Common.php b/civicrm/CRM/Mailing/Page/Common.php
index 812d15c451..4260ad501d 100644
--- a/civicrm/CRM/Mailing/Page/Common.php
+++ b/civicrm/CRM/Mailing/Page/Common.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Page_Common extends CRM_Core_Page {
protected $_type = NULL;
diff --git a/civicrm/CRM/Mailing/Page/Component.php b/civicrm/CRM/Mailing/Page/Component.php
index e930782ded..c1f13fff2b 100644
--- a/civicrm/CRM/Mailing/Page/Component.php
+++ b/civicrm/CRM/Mailing/Page/Component.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Page/Confirm.php b/civicrm/CRM/Mailing/Page/Confirm.php
index 82a695ed7d..e0b29749fd 100644
--- a/civicrm/CRM/Mailing/Page/Confirm.php
+++ b/civicrm/CRM/Mailing/Page/Confirm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Page_Confirm extends CRM_Core_Page {
/**
diff --git a/civicrm/CRM/Mailing/Page/Event.php b/civicrm/CRM/Mailing/Page/Event.php
index 04af532830..8bc84bb94b 100644
--- a/civicrm/CRM/Mailing/Page/Event.php
+++ b/civicrm/CRM/Mailing/Page/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Page/Optout.php b/civicrm/CRM/Mailing/Page/Optout.php
index 2292b289ca..ea83a43f4d 100644
--- a/civicrm/CRM/Mailing/Page/Optout.php
+++ b/civicrm/CRM/Mailing/Page/Optout.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Page_Optout extends CRM_Mailing_Page_Common {
/**
diff --git a/civicrm/CRM/Mailing/Page/Preview.php b/civicrm/CRM/Mailing/Page/Preview.php
index f7aaaf6eee..a170684241 100644
--- a/civicrm/CRM/Mailing/Page/Preview.php
+++ b/civicrm/CRM/Mailing/Page/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Page/Report.php b/civicrm/CRM/Mailing/Page/Report.php
index c1879ac89c..5b467a9e37 100644
--- a/civicrm/CRM/Mailing/Page/Report.php
+++ b/civicrm/CRM/Mailing/Page/Report.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Page/Resubscribe.php b/civicrm/CRM/Mailing/Page/Resubscribe.php
index 41e7d93717..83be7a1bd4 100644
--- a/civicrm/CRM/Mailing/Page/Resubscribe.php
+++ b/civicrm/CRM/Mailing/Page/Resubscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Page_Resubscribe extends CRM_Mailing_Page_Common {
/**
diff --git a/civicrm/CRM/Mailing/Page/Tab.php b/civicrm/CRM/Mailing/Page/Tab.php
index 4c0ea40a45..0e82362d43 100644
--- a/civicrm/CRM/Mailing/Page/Tab.php
+++ b/civicrm/CRM/Mailing/Page/Tab.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Page/Unsubscribe.php b/civicrm/CRM/Mailing/Page/Unsubscribe.php
index f16594a66c..890595eddb 100644
--- a/civicrm/CRM/Mailing/Page/Unsubscribe.php
+++ b/civicrm/CRM/Mailing/Page/Unsubscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Mailing_Page_Unsubscribe extends CRM_Mailing_Page_Common {
diff --git a/civicrm/CRM/Mailing/Page/View.php b/civicrm/CRM/Mailing/Page/View.php
index 411cbd0c0f..aed2998a85 100644
--- a/civicrm/CRM/Mailing/Page/View.php
+++ b/civicrm/CRM/Mailing/Page/View.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/PseudoConstant.php b/civicrm/CRM/Mailing/PseudoConstant.php
index b7ddcd9666..e92e46e869 100644
--- a/civicrm/CRM/Mailing/PseudoConstant.php
+++ b/civicrm/CRM/Mailing/PseudoConstant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Selector/Browse.php b/civicrm/CRM/Mailing/Selector/Browse.php
index db6cf033b0..850db5458d 100644
--- a/civicrm/CRM/Mailing/Selector/Browse.php
+++ b/civicrm/CRM/Mailing/Selector/Browse.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Selector/Event.php b/civicrm/CRM/Mailing/Selector/Event.php
index a193cae610..5a3966f2a9 100644
--- a/civicrm/CRM/Mailing/Selector/Event.php
+++ b/civicrm/CRM/Mailing/Selector/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Selector/Search.php b/civicrm/CRM/Mailing/Selector/Search.php
index f1de4478ac..8b634527d1 100644
--- a/civicrm/CRM/Mailing/Selector/Search.php
+++ b/civicrm/CRM/Mailing/Selector/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Mailing/Task.php b/civicrm/CRM/Mailing/Task.php
index 6a418ef257..3a5be21000 100644
--- a/civicrm/CRM/Mailing/Task.php
+++ b/civicrm/CRM/Mailing/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Member/ActionMapping.php b/civicrm/CRM/Member/ActionMapping.php
index c089105dbe..6f9708ca9a 100644
--- a/civicrm/CRM/Member/ActionMapping.php
+++ b/civicrm/CRM/Member/ActionMapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Member/BAO/Membership.php b/civicrm/CRM/Member/BAO/Membership.php
index 93052afcea..13bc37ddfd 100644
--- a/civicrm/CRM/Member/BAO/Membership.php
+++ b/civicrm/CRM/Member/BAO/Membership.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
diff --git a/civicrm/CRM/Member/BAO/MembershipBlock.php b/civicrm/CRM/Member/BAO/MembershipBlock.php
index f21a239d0d..37bb95cfa0 100644
--- a/civicrm/CRM/Member/BAO/MembershipBlock.php
+++ b/civicrm/CRM/Member/BAO/MembershipBlock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/BAO/MembershipLog.php b/civicrm/CRM/Member/BAO/MembershipLog.php
index 90d3d44924..e0566926fe 100644
--- a/civicrm/CRM/Member/BAO/MembershipLog.php
+++ b/civicrm/CRM/Member/BAO/MembershipLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/BAO/MembershipPayment.php b/civicrm/CRM/Member/BAO/MembershipPayment.php
index 8f718b1cb6..2018f6a4c7 100644
--- a/civicrm/CRM/Member/BAO/MembershipPayment.php
+++ b/civicrm/CRM/Member/BAO/MembershipPayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/BAO/MembershipStatus.php b/civicrm/CRM/Member/BAO/MembershipStatus.php
index d7bc30d30a..ddb458b7d0 100644
--- a/civicrm/CRM/Member/BAO/MembershipStatus.php
+++ b/civicrm/CRM/Member/BAO/MembershipStatus.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/BAO/MembershipType.php b/civicrm/CRM/Member/BAO/MembershipType.php
index 6bfe56ce43..5b26ab77f4 100644
--- a/civicrm/CRM/Member/BAO/MembershipType.php
+++ b/civicrm/CRM/Member/BAO/MembershipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/BAO/Query.php b/civicrm/CRM/Member/BAO/Query.php
index 985d731026..b226fa8539 100644
--- a/civicrm/CRM/Member/BAO/Query.php
+++ b/civicrm/CRM/Member/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Member_BAO_Query {
diff --git a/civicrm/CRM/Member/Controller/Search.php b/civicrm/CRM/Member/Controller/Search.php
index f3aabba510..46b46a4f6d 100644
--- a/civicrm/CRM/Member/Controller/Search.php
+++ b/civicrm/CRM/Member/Controller/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/DAO/Membership.php b/civicrm/CRM/Member/DAO/Membership.php
index c67e59c9cb..355930b9b3 100644
--- a/civicrm/CRM/Member/DAO/Membership.php
+++ b/civicrm/CRM/Member/DAO/Membership.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Member/Membership.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Member/DAO/MembershipBlock.php b/civicrm/CRM/Member/DAO/MembershipBlock.php
index 0582a9b520..c13ecaf526 100644
--- a/civicrm/CRM/Member/DAO/MembershipBlock.php
+++ b/civicrm/CRM/Member/DAO/MembershipBlock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Member/MembershipBlock.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Member/DAO/MembershipLog.php b/civicrm/CRM/Member/DAO/MembershipLog.php
index 251ade9343..99a136848f 100644
--- a/civicrm/CRM/Member/DAO/MembershipLog.php
+++ b/civicrm/CRM/Member/DAO/MembershipLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Member/MembershipLog.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Member/DAO/MembershipPayment.php b/civicrm/CRM/Member/DAO/MembershipPayment.php
index cd1b764074..7d26352589 100644
--- a/civicrm/CRM/Member/DAO/MembershipPayment.php
+++ b/civicrm/CRM/Member/DAO/MembershipPayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Member/MembershipPayment.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Member/DAO/MembershipStatus.php b/civicrm/CRM/Member/DAO/MembershipStatus.php
index 5e17298804..fd58df008f 100644
--- a/civicrm/CRM/Member/DAO/MembershipStatus.php
+++ b/civicrm/CRM/Member/DAO/MembershipStatus.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Member/MembershipStatus.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Member/DAO/MembershipType.php b/civicrm/CRM/Member/DAO/MembershipType.php
index 2bde124e76..9f34c05050 100644
--- a/civicrm/CRM/Member/DAO/MembershipType.php
+++ b/civicrm/CRM/Member/DAO/MembershipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Member/MembershipType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Member/Form.php b/civicrm/CRM/Member/Form.php
index 6c1223923a..6c0e5eddf6 100644
--- a/civicrm/CRM/Member/Form.php
+++ b/civicrm/CRM/Member/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Member/Form/Membership.php b/civicrm/CRM/Member/Form/Membership.php
index 37f26d5b3c..652bc5be0d 100644
--- a/civicrm/CRM/Member/Form/Membership.php
+++ b/civicrm/CRM/Member/Form/Membership.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Member/Form/MembershipBlock.php b/civicrm/CRM/Member/Form/MembershipBlock.php
index 2dcecf49bf..d29cc9b7da 100644
--- a/civicrm/CRM/Member/Form/MembershipBlock.php
+++ b/civicrm/CRM/Member/Form/MembershipBlock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/MembershipConfig.php b/civicrm/CRM/Member/Form/MembershipConfig.php
index e3e4f09dc7..ff2d804c13 100644
--- a/civicrm/CRM/Member/Form/MembershipConfig.php
+++ b/civicrm/CRM/Member/Form/MembershipConfig.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/MembershipRenewal.php b/civicrm/CRM/Member/Form/MembershipRenewal.php
index b55ca2628d..2e9f0e6321 100644
--- a/civicrm/CRM/Member/Form/MembershipRenewal.php
+++ b/civicrm/CRM/Member/Form/MembershipRenewal.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Member/Form/MembershipStatus.php b/civicrm/CRM/Member/Form/MembershipStatus.php
index 45fbdab8fd..909a637ab7 100644
--- a/civicrm/CRM/Member/Form/MembershipStatus.php
+++ b/civicrm/CRM/Member/Form/MembershipStatus.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/MembershipType.php b/civicrm/CRM/Member/Form/MembershipType.php
index e326ff813f..b695c8b6db 100644
--- a/civicrm/CRM/Member/Form/MembershipType.php
+++ b/civicrm/CRM/Member/Form/MembershipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/MembershipView.php b/civicrm/CRM/Member/Form/MembershipView.php
index 27bb15ae7a..2c1f935f95 100644
--- a/civicrm/CRM/Member/Form/MembershipView.php
+++ b/civicrm/CRM/Member/Form/MembershipView.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/Search.php b/civicrm/CRM/Member/Form/Search.php
index fa3321fb54..a338f2213d 100644
--- a/civicrm/CRM/Member/Form/Search.php
+++ b/civicrm/CRM/Member/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Member/Form/Task.php b/civicrm/CRM/Member/Form/Task.php
index 9267b117a0..d8917a61db 100644
--- a/civicrm/CRM/Member/Form/Task.php
+++ b/civicrm/CRM/Member/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/Task/Batch.php b/civicrm/CRM/Member/Form/Task/Batch.php
index e14212eb8c..d7ffb0409f 100644
--- a/civicrm/CRM/Member/Form/Task/Batch.php
+++ b/civicrm/CRM/Member/Form/Task/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/Task/Delete.php b/civicrm/CRM/Member/Form/Task/Delete.php
index a193495a2e..64fb88b21b 100644
--- a/civicrm/CRM/Member/Form/Task/Delete.php
+++ b/civicrm/CRM/Member/Form/Task/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/Task/Email.php b/civicrm/CRM/Member/Form/Task/Email.php
index 71dae97ad8..ed2197d2e7 100644
--- a/civicrm/CRM/Member/Form/Task/Email.php
+++ b/civicrm/CRM/Member/Form/Task/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id: Email.php 45499 2013-02-08 12:31:05Z kurund $
*
*/
diff --git a/civicrm/CRM/Member/Form/Task/Label.php b/civicrm/CRM/Member/Form/Task/Label.php
index 7a5a5a635b..0ee9e7cf73 100644
--- a/civicrm/CRM/Member/Form/Task/Label.php
+++ b/civicrm/CRM/Member/Form/Task/Label.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/Task/PDFLetter.php b/civicrm/CRM/Member/Form/Task/PDFLetter.php
index 137fdfef44..65051f8ad3 100644
--- a/civicrm/CRM/Member/Form/Task/PDFLetter.php
+++ b/civicrm/CRM/Member/Form/Task/PDFLetter.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/Task/PickProfile.php b/civicrm/CRM/Member/Form/Task/PickProfile.php
index 6f4c3231ca..14976f9d21 100644
--- a/civicrm/CRM/Member/Form/Task/PickProfile.php
+++ b/civicrm/CRM/Member/Form/Task/PickProfile.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/Task/Print.php b/civicrm/CRM/Member/Form/Task/Print.php
index 1b85dca26b..a0d6e2a463 100644
--- a/civicrm/CRM/Member/Form/Task/Print.php
+++ b/civicrm/CRM/Member/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/Task/Result.php b/civicrm/CRM/Member/Form/Task/Result.php
index cfe7a39258..655fef1578 100644
--- a/civicrm/CRM/Member/Form/Task/Result.php
+++ b/civicrm/CRM/Member/Form/Task/Result.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Member/Form/Task/SearchTaskHookSample.php
index c9beaa82c5..abb05b9d86 100644
--- a/civicrm/CRM/Member/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Member/Form/Task/SearchTaskHookSample.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Import/Controller.php b/civicrm/CRM/Member/Import/Controller.php
index 4a8790d0ae..74cdddea7f 100644
--- a/civicrm/CRM/Member/Import/Controller.php
+++ b/civicrm/CRM/Member/Import/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Import/Field.php b/civicrm/CRM/Member/Import/Field.php
index 93a43e77a8..45bd206b27 100644
--- a/civicrm/CRM/Member/Import/Field.php
+++ b/civicrm/CRM/Member/Import/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Import/Form/DataSource.php b/civicrm/CRM/Member/Import/Form/DataSource.php
index e52eff0668..3e5c371c46 100644
--- a/civicrm/CRM/Member/Import/Form/DataSource.php
+++ b/civicrm/CRM/Member/Import/Form/DataSource.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Import/Form/MapField.php b/civicrm/CRM/Member/Import/Form/MapField.php
index 24e48ec986..c8d4fe983c 100644
--- a/civicrm/CRM/Member/Import/Form/MapField.php
+++ b/civicrm/CRM/Member/Import/Form/MapField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Import/Form/Preview.php b/civicrm/CRM/Member/Import/Form/Preview.php
index c34451e0c6..8a41e9e5b5 100644
--- a/civicrm/CRM/Member/Import/Form/Preview.php
+++ b/civicrm/CRM/Member/Import/Form/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Import/Form/Summary.php b/civicrm/CRM/Member/Import/Form/Summary.php
index 9e95d70102..d751d6b3e7 100644
--- a/civicrm/CRM/Member/Import/Form/Summary.php
+++ b/civicrm/CRM/Member/Import/Form/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Import/Parser.php b/civicrm/CRM/Member/Import/Parser.php
index 920ce53592..77ec1821e2 100644
--- a/civicrm/CRM/Member/Import/Parser.php
+++ b/civicrm/CRM/Member/Import/Parser.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Import/Parser/Membership.php b/civicrm/CRM/Member/Import/Parser/Membership.php
index 5bef01d667..17dbf1c6b1 100644
--- a/civicrm/CRM/Member/Import/Parser/Membership.php
+++ b/civicrm/CRM/Member/Import/Parser/Membership.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Info.php b/civicrm/CRM/Member/Info.php
index a0324a5884..cafeeb0d29 100644
--- a/civicrm/CRM/Member/Info.php
+++ b/civicrm/CRM/Member/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* abstract class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Page/AJAX.php b/civicrm/CRM/Member/Page/AJAX.php
index a4842b01fd..d6bff50bd3 100644
--- a/civicrm/CRM/Member/Page/AJAX.php
+++ b/civicrm/CRM/Member/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Page/DashBoard.php b/civicrm/CRM/Member/Page/DashBoard.php
index 0cd6c4fda2..23b622e502 100644
--- a/civicrm/CRM/Member/Page/DashBoard.php
+++ b/civicrm/CRM/Member/Page/DashBoard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Page/MembershipStatus.php b/civicrm/CRM/Member/Page/MembershipStatus.php
index 2956830dc0..7bfe1b1337 100644
--- a/civicrm/CRM/Member/Page/MembershipStatus.php
+++ b/civicrm/CRM/Member/Page/MembershipStatus.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Page/MembershipType.php b/civicrm/CRM/Member/Page/MembershipType.php
index 61417d04f9..08771d8134 100644
--- a/civicrm/CRM/Member/Page/MembershipType.php
+++ b/civicrm/CRM/Member/Page/MembershipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Page/Tab.php b/civicrm/CRM/Member/Page/Tab.php
index 91b3397ea7..de990fe970 100644
--- a/civicrm/CRM/Member/Page/Tab.php
+++ b/civicrm/CRM/Member/Page/Tab.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Page/UserDashboard.php b/civicrm/CRM/Member/Page/UserDashboard.php
index f2bf0faa0c..005f2f4f36 100644
--- a/civicrm/CRM/Member/Page/UserDashboard.php
+++ b/civicrm/CRM/Member/Page/UserDashboard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/PseudoConstant.php b/civicrm/CRM/Member/PseudoConstant.php
index d16e0c7cae..10ecd2efe5 100644
--- a/civicrm/CRM/Member/PseudoConstant.php
+++ b/civicrm/CRM/Member/PseudoConstant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Selector/Search.php b/civicrm/CRM/Member/Selector/Search.php
index bcbc30b2b4..39692de938 100644
--- a/civicrm/CRM/Member/Selector/Search.php
+++ b/civicrm/CRM/Member/Selector/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Member/StateMachine/Search.php b/civicrm/CRM/Member/StateMachine/Search.php
index 4d5ea45190..eef87174c6 100644
--- a/civicrm/CRM/Member/StateMachine/Search.php
+++ b/civicrm/CRM/Member/StateMachine/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Task.php b/civicrm/CRM/Member/Task.php
index 62d91ce1fc..9598fc10d6 100644
--- a/civicrm/CRM/Member/Task.php
+++ b/civicrm/CRM/Member/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Member/Tokens.php b/civicrm/CRM/Member/Tokens.php
index 2c60e85a3e..d9e1662ad7 100644
--- a/civicrm/CRM/Member/Tokens.php
+++ b/civicrm/CRM/Member/Tokens.php
@@ -4,7 +4,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Note/Form/Note.php b/civicrm/CRM/Note/Form/Note.php
index 94e0aa4b7b..b81ea64fbf 100644
--- a/civicrm/CRM/Note/Form/Note.php
+++ b/civicrm/CRM/Note/Form/Note.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/PCP/BAO/PCP.php b/civicrm/CRM/PCP/BAO/PCP.php
index 13a37c5581..417aa27936 100644
--- a/civicrm/CRM/PCP/BAO/PCP.php
+++ b/civicrm/CRM/PCP/BAO/PCP.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_PCP_BAO_PCP extends CRM_PCP_DAO_PCP {
@@ -118,6 +118,7 @@ WHERE civicrm_pcp.contact_id = civicrm_contact.id
$query = "
SELECT * FROM civicrm_pcp pcp
+LEFT JOIN civicrm_pcp_block block ON block.id = pcp.pcp_block_id
WHERE pcp.is_active = 1
AND pcp.contact_id = %1
ORDER BY page_type, page_id";
@@ -149,7 +150,7 @@ ORDER BY page_type, page_id";
if ($pcpInfoDao->status_id != $approved || $pcpInfoDao->is_active != 1) {
$class = 'disabled';
- if (!$pcpInfoDao->tellfriend) {
+ if (!$pcpInfoDao->is_tellfriend_enabled) {
$mask -= CRM_Core_Action::DETACH;
}
}
diff --git a/civicrm/CRM/PCP/Controller/PCP.php b/civicrm/CRM/PCP/Controller/PCP.php
index 8fa89ffd36..4561c90e5b 100644
--- a/civicrm/CRM/PCP/Controller/PCP.php
+++ b/civicrm/CRM/PCP/Controller/PCP.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/PCP/DAO/PCP.php b/civicrm/CRM/PCP/DAO/PCP.php
index 054d7584b4..a03e70b0c4 100644
--- a/civicrm/CRM/PCP/DAO/PCP.php
+++ b/civicrm/CRM/PCP/DAO/PCP.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/PCP/PCP.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/PCP/DAO/PCPBlock.php b/civicrm/CRM/PCP/DAO/PCPBlock.php
index 559a9ed7d6..ccd0a8f09e 100644
--- a/civicrm/CRM/PCP/DAO/PCPBlock.php
+++ b/civicrm/CRM/PCP/DAO/PCPBlock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/PCP/PCPBlock.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/PCP/Form/Campaign.php b/civicrm/CRM/PCP/Form/Campaign.php
index 20da877008..8754d02517 100644
--- a/civicrm/CRM/PCP/Form/Campaign.php
+++ b/civicrm/CRM/PCP/Form/Campaign.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/PCP/Form/Contribute.php b/civicrm/CRM/PCP/Form/Contribute.php
index fb39795157..fbae456f0c 100644
--- a/civicrm/CRM/PCP/Form/Contribute.php
+++ b/civicrm/CRM/PCP/Form/Contribute.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/PCP/Form/Event.php b/civicrm/CRM/PCP/Form/Event.php
index df6ec0ecab..0c93711d32 100644
--- a/civicrm/CRM/PCP/Form/Event.php
+++ b/civicrm/CRM/PCP/Form/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/PCP/Form/PCP.php b/civicrm/CRM/PCP/Form/PCP.php
index e9feef3d19..641f1d40c2 100644
--- a/civicrm/CRM/PCP/Form/PCP.php
+++ b/civicrm/CRM/PCP/Form/PCP.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/PCP/Form/PCPAccount.php b/civicrm/CRM/PCP/Form/PCPAccount.php
index 4962fe05b6..ebdd3de756 100644
--- a/civicrm/CRM/PCP/Form/PCPAccount.php
+++ b/civicrm/CRM/PCP/Form/PCPAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/PCP/Page/PCP.php b/civicrm/CRM/PCP/Page/PCP.php
index def19a3701..2a643a42fa 100644
--- a/civicrm/CRM/PCP/Page/PCP.php
+++ b/civicrm/CRM/PCP/Page/PCP.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/PCP/Page/PCPInfo.php b/civicrm/CRM/PCP/Page/PCPInfo.php
index 52daf8cafb..2104b106a8 100644
--- a/civicrm/CRM/PCP/Page/PCPInfo.php
+++ b/civicrm/CRM/PCP/Page/PCPInfo.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/PCP/StateMachine/PCP.php b/civicrm/CRM/PCP/StateMachine/PCP.php
index d80642df43..6a1e4937bf 100644
--- a/civicrm/CRM/PCP/StateMachine/PCP.php
+++ b/civicrm/CRM/PCP/StateMachine/PCP.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Pledge/BAO/Pledge.php b/civicrm/CRM/Pledge/BAO/Pledge.php
index 1fee5bf50d..8687d908b9 100644
--- a/civicrm/CRM/Pledge/BAO/Pledge.php
+++ b/civicrm/CRM/Pledge/BAO/Pledge.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Pledge_BAO_Pledge extends CRM_Pledge_DAO_Pledge {
@@ -1108,10 +1108,11 @@ SELECT pledge.contact_id as contact_id,
* @param int $pledgeID
*/
public static function cancel($pledgeID) {
- $statuses = array_flip(CRM_Contribute_PseudoConstant::contributionStatus());
$paymentIDs = self::findCancelablePayments($pledgeID);
+ $status = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
+ $cancelled = array_search('Cancelled', $status);
CRM_Pledge_BAO_PledgePayment::updatePledgePaymentStatus($pledgeID, $paymentIDs, NULL,
- $statuses['Cancelled'], 0, FALSE, TRUE
+ $cancelled, 0, FALSE, TRUE
);
}
diff --git a/civicrm/CRM/Pledge/BAO/PledgeBlock.php b/civicrm/CRM/Pledge/BAO/PledgeBlock.php
index 50a51566a0..4fe87d80ed 100644
--- a/civicrm/CRM/Pledge/BAO/PledgeBlock.php
+++ b/civicrm/CRM/Pledge/BAO/PledgeBlock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Pledge_BAO_PledgeBlock extends CRM_Pledge_DAO_PledgeBlock {
diff --git a/civicrm/CRM/Pledge/BAO/PledgePayment.php b/civicrm/CRM/Pledge/BAO/PledgePayment.php
index 4be274e4c4..4169573994 100644
--- a/civicrm/CRM/Pledge/BAO/PledgePayment.php
+++ b/civicrm/CRM/Pledge/BAO/PledgePayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Pledge_BAO_PledgePayment extends CRM_Pledge_DAO_PledgePayment {
diff --git a/civicrm/CRM/Pledge/BAO/Query.php b/civicrm/CRM/Pledge/BAO/Query.php
index b4bfd73b66..cd04c49b65 100644
--- a/civicrm/CRM/Pledge/BAO/Query.php
+++ b/civicrm/CRM/Pledge/BAO/Query.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Pledge_BAO_Query {
/**
diff --git a/civicrm/CRM/Pledge/Controller/Search.php b/civicrm/CRM/Pledge/Controller/Search.php
index 01342697b4..e5004478b8 100644
--- a/civicrm/CRM/Pledge/Controller/Search.php
+++ b/civicrm/CRM/Pledge/Controller/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/DAO/Pledge.php b/civicrm/CRM/Pledge/DAO/Pledge.php
index baadef74f6..70333ed422 100644
--- a/civicrm/CRM/Pledge/DAO/Pledge.php
+++ b/civicrm/CRM/Pledge/DAO/Pledge.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Pledge/Pledge.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Pledge/DAO/PledgeBlock.php b/civicrm/CRM/Pledge/DAO/PledgeBlock.php
index 04af44d666..c88235d5cc 100644
--- a/civicrm/CRM/Pledge/DAO/PledgeBlock.php
+++ b/civicrm/CRM/Pledge/DAO/PledgeBlock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Pledge/PledgeBlock.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Pledge/DAO/PledgePayment.php b/civicrm/CRM/Pledge/DAO/PledgePayment.php
index 03b4cfa8ca..4465c59359 100644
--- a/civicrm/CRM/Pledge/DAO/PledgePayment.php
+++ b/civicrm/CRM/Pledge/DAO/PledgePayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Pledge/PledgePayment.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Pledge/Form/Payment.php b/civicrm/CRM/Pledge/Form/Payment.php
index aba503ee58..2d774ee5c4 100644
--- a/civicrm/CRM/Pledge/Form/Payment.php
+++ b/civicrm/CRM/Pledge/Form/Payment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Form/Pledge.php b/civicrm/CRM/Pledge/Form/Pledge.php
index 6a4456ed60..764f98d2c7 100644
--- a/civicrm/CRM/Pledge/Form/Pledge.php
+++ b/civicrm/CRM/Pledge/Form/Pledge.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Form/PledgeView.php b/civicrm/CRM/Pledge/Form/PledgeView.php
index d76defa31a..85d2df588e 100644
--- a/civicrm/CRM/Pledge/Form/PledgeView.php
+++ b/civicrm/CRM/Pledge/Form/PledgeView.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Form/Search.php b/civicrm/CRM/Pledge/Form/Search.php
index 561aa360f2..cc098aaaee 100644
--- a/civicrm/CRM/Pledge/Form/Search.php
+++ b/civicrm/CRM/Pledge/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Form/Task.php b/civicrm/CRM/Pledge/Form/Task.php
index a443f524a9..d93408d2f9 100644
--- a/civicrm/CRM/Pledge/Form/Task.php
+++ b/civicrm/CRM/Pledge/Form/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Form/Task/Delete.php b/civicrm/CRM/Pledge/Form/Task/Delete.php
index 5f8491481e..0594789a18 100644
--- a/civicrm/CRM/Pledge/Form/Task/Delete.php
+++ b/civicrm/CRM/Pledge/Form/Task/Delete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Form/Task/Print.php b/civicrm/CRM/Pledge/Form/Task/Print.php
index 287df8a75b..e6525b559c 100644
--- a/civicrm/CRM/Pledge/Form/Task/Print.php
+++ b/civicrm/CRM/Pledge/Form/Task/Print.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -68,9 +68,7 @@ class CRM_Pledge_Form_Task_Print extends CRM_Pledge_Form_Task {
* - displaying elements for saving the search.
*/
public function buildQuickForm() {
-
// just need to add a javacript to popup the window for printing
-
$this->addButtons(array(
array(
'type' => 'next',
diff --git a/civicrm/CRM/Pledge/Form/Task/Result.php b/civicrm/CRM/Pledge/Form/Task/Result.php
index b856f85b1e..f4afa881f6 100644
--- a/civicrm/CRM/Pledge/Form/Task/Result.php
+++ b/civicrm/CRM/Pledge/Form/Task/Result.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Form/Task/SearchTaskHookSample.php b/civicrm/CRM/Pledge/Form/Task/SearchTaskHookSample.php
index 705514cdc9..a6cde292d2 100644
--- a/civicrm/CRM/Pledge/Form/Task/SearchTaskHookSample.php
+++ b/civicrm/CRM/Pledge/Form/Task/SearchTaskHookSample.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Info.php b/civicrm/CRM/Pledge/Info.php
index 6dba521576..b5cc49a780 100644
--- a/civicrm/CRM/Pledge/Info.php
+++ b/civicrm/CRM/Pledge/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* abstract class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Pledge_Info extends CRM_Core_Component_Info {
diff --git a/civicrm/CRM/Pledge/Page/AJAX.php b/civicrm/CRM/Pledge/Page/AJAX.php
index 7afc7795d9..6dcb2d1220 100644
--- a/civicrm/CRM/Pledge/Page/AJAX.php
+++ b/civicrm/CRM/Pledge/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Page/DashBoard.php b/civicrm/CRM/Pledge/Page/DashBoard.php
index 487b3701c7..68a1c3bde3 100644
--- a/civicrm/CRM/Pledge/Page/DashBoard.php
+++ b/civicrm/CRM/Pledge/Page/DashBoard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/Page/Payment.php b/civicrm/CRM/Pledge/Page/Payment.php
index b2b692da4d..a071e84b5f 100644
--- a/civicrm/CRM/Pledge/Page/Payment.php
+++ b/civicrm/CRM/Pledge/Page/Payment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Pledge_Page_Payment extends CRM_Core_Page {
diff --git a/civicrm/CRM/Pledge/Page/Tab.php b/civicrm/CRM/Pledge/Page/Tab.php
index bdc8340721..5b5af4f271 100644
--- a/civicrm/CRM/Pledge/Page/Tab.php
+++ b/civicrm/CRM/Pledge/Page/Tab.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Pledge_Page_Tab extends CRM_Core_Page {
public $_permission = NULL;
diff --git a/civicrm/CRM/Pledge/Page/UserDashboard.php b/civicrm/CRM/Pledge/Page/UserDashboard.php
index fee6d0b867..7c1009362a 100644
--- a/civicrm/CRM/Pledge/Page/UserDashboard.php
+++ b/civicrm/CRM/Pledge/Page/UserDashboard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Pledge_Page_UserDashboard extends CRM_Contact_Page_View_UserDashBoard {
diff --git a/civicrm/CRM/Pledge/Selector/Search.php b/civicrm/CRM/Pledge/Selector/Search.php
index 77bba6a6cd..5882970c04 100644
--- a/civicrm/CRM/Pledge/Selector/Search.php
+++ b/civicrm/CRM/Pledge/Selector/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Pledge/StateMachine/Search.php b/civicrm/CRM/Pledge/StateMachine/Search.php
index 37ff804fd7..5ed3c0e14f 100644
--- a/civicrm/CRM/Pledge/StateMachine/Search.php
+++ b/civicrm/CRM/Pledge/StateMachine/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Pledge_StateMachine_Search extends CRM_Core_StateMachine {
diff --git a/civicrm/CRM/Pledge/Task.php b/civicrm/CRM/Pledge/Task.php
index 3dce80b531..b1a6d339cd 100644
--- a/civicrm/CRM/Pledge/Task.php
+++ b/civicrm/CRM/Pledge/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Price/BAO/LineItem.php b/civicrm/CRM/Price/BAO/LineItem.php
index 8ecf74dad3..0ffcc0b0e2 100644
--- a/civicrm/CRM/Price/BAO/LineItem.php
+++ b/civicrm/CRM/Price/BAO/LineItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -57,9 +57,11 @@ class CRM_Price_BAO_LineItem extends CRM_Price_DAO_LineItem {
$id = CRM_Utils_Array::value('id', $params);
if ($id) {
CRM_Utils_Hook::pre('edit', 'LineItem', $id, $params);
+ $op = CRM_Core_Action::UPDATE;
}
else {
CRM_Utils_Hook::pre('create', 'LineItem', $params['entity_id'], $params);
+ $op = CRM_Core_Action::ADD;
}
// unset entity table and entity id in $params
@@ -67,6 +69,15 @@ class CRM_Price_BAO_LineItem extends CRM_Price_DAO_LineItem {
if ($id) {
unset($params['entity_id'], $params['entity_table']);
}
+ if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus() && CRM_Utils_Array::value('check_permissions', $params)) {
+ if (empty($params['financial_type_id'])) {
+ throw new Exception('Mandatory key(s) missing from params array: financial_type_id');
+ }
+ CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types, $op);
+ if (!in_array($params['financial_type_id'], array_keys($types))) {
+ throw new Exception('You do not have permission to create this line item');
+ }
+ }
$lineItemBAO = new CRM_Price_BAO_LineItem();
$lineItemBAO->copyValues($params);
@@ -105,6 +116,34 @@ class CRM_Price_BAO_LineItem extends CRM_Price_DAO_LineItem {
return NULL;
}
+ /**
+ * Modifies $params array for filtering financial types.
+ *
+ * @param array $params
+ * (reference ) an assoc array of name/value pairs.
+ *
+ */
+ public static function getAPILineItemParams(&$params) {
+ CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types);
+ if ($types && empty($params['financial_type_id'])) {
+ $params['financial_type_id'] = array('IN' => array_keys($types));
+ }
+ elseif ($types) {
+ if (is_array($params['financial_type_id'])) {
+ $invalidFts = array_diff($params['financial_type_id'], array_keys($types));
+ }
+ elseif (!in_array($params['financial_type_id'], array_keys($types))) {
+ $invalidFts = $params['financial_type_id'];
+ }
+ if ($invalidFts) {
+ $params['financial_type_id'] = array('NOT IN' => $invalidFts);
+ }
+ }
+ else {
+ $params['financial_type_id'] = 0;
+ }
+ }
+
/**
* @param int $entityId
* @param $entityTable
diff --git a/civicrm/CRM/Price/BAO/PriceField.php b/civicrm/CRM/Price/BAO/PriceField.php
index d0f8a98080..4ea169d4fa 100644
--- a/civicrm/CRM/Price/BAO/PriceField.php
+++ b/civicrm/CRM/Price/BAO/PriceField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Price/BAO/PriceFieldValue.php b/civicrm/CRM/Price/BAO/PriceFieldValue.php
index fc0210d5cf..a89b25c0ed 100644
--- a/civicrm/CRM/Price/BAO/PriceFieldValue.php
+++ b/civicrm/CRM/Price/BAO/PriceFieldValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Price/BAO/PriceSet.php b/civicrm/CRM/Price/BAO/PriceSet.php
index 35f4262f46..c9a485a653 100644
--- a/civicrm/CRM/Price/BAO/PriceSet.php
+++ b/civicrm/CRM/Price/BAO/PriceSet.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -1056,6 +1056,29 @@ WHERE id = %1";
if ($className == 'CRM_Contribute_Form_Contribution_Main') {
$form->_quickConfig = $quickConfig;
}
+
+ // Mark which field should have the auto-renew checkbox, if any. CRM-18305
+ if (is_array($form->_membershipTypeValues)) {
+ $autoRenewMembershipTypes = array();
+ foreach ($form->_membershipTypeValues as $membershiptTypeValue) {
+ if ($membershiptTypeValue['auto_renew']) {
+ $autoRenewMembershipTypes[] = $membershiptTypeValue['id'];
+ }
+ }
+ foreach ($form->_priceSet['fields'] as &$field) {
+ if (array_key_exists('options', $field) && is_array($field['options'])) {
+ foreach ($field['options'] as $option) {
+ if ($option['membership_type_id']) {
+ if (in_array($option['membership_type_id'], $autoRenewMembershipTypes)) {
+ $form->_priceSet['auto_renew_membership_field'] = $field['id'];
+ // Only one field can offer auto_renew memberships, so break here.
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
$form->assign('priceSet', $form->_priceSet);
$component = 'contribution';
diff --git a/civicrm/CRM/Price/DAO/LineItem.php b/civicrm/CRM/Price/DAO/LineItem.php
index 90c830964f..423086cfb1 100644
--- a/civicrm/CRM/Price/DAO/LineItem.php
+++ b/civicrm/CRM/Price/DAO/LineItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Price/LineItem.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Price/DAO/PriceField.php b/civicrm/CRM/Price/DAO/PriceField.php
index 3a93f294bd..36a2805397 100644
--- a/civicrm/CRM/Price/DAO/PriceField.php
+++ b/civicrm/CRM/Price/DAO/PriceField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Price/PriceField.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Price/DAO/PriceFieldValue.php b/civicrm/CRM/Price/DAO/PriceFieldValue.php
index d4a27af092..7014af01e6 100644
--- a/civicrm/CRM/Price/DAO/PriceFieldValue.php
+++ b/civicrm/CRM/Price/DAO/PriceFieldValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Price/PriceFieldValue.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Price/DAO/PriceSet.php b/civicrm/CRM/Price/DAO/PriceSet.php
index d78260ceaf..cdcd6a78e7 100644
--- a/civicrm/CRM/Price/DAO/PriceSet.php
+++ b/civicrm/CRM/Price/DAO/PriceSet.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Price/PriceSet.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Price/DAO/PriceSetEntity.php b/civicrm/CRM/Price/DAO/PriceSetEntity.php
index ad4e259188..b278999916 100644
--- a/civicrm/CRM/Price/DAO/PriceSetEntity.php
+++ b/civicrm/CRM/Price/DAO/PriceSetEntity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Price/PriceSetEntity.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Price/Form/DeleteField.php b/civicrm/CRM/Price/Form/DeleteField.php
index 2b8fafad55..176d96e12e 100644
--- a/civicrm/CRM/Price/Form/DeleteField.php
+++ b/civicrm/CRM/Price/Form/DeleteField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Price/Form/DeleteSet.php b/civicrm/CRM/Price/Form/DeleteSet.php
index 87b955e9ab..f783c7d3b5 100644
--- a/civicrm/CRM/Price/Form/DeleteSet.php
+++ b/civicrm/CRM/Price/Form/DeleteSet.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Price/Form/Field.php b/civicrm/CRM/Price/Form/Field.php
index 903e926aa3..1941677e19 100644
--- a/civicrm/CRM/Price/Form/Field.php
+++ b/civicrm/CRM/Price/Form/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Price/Form/Option.php b/civicrm/CRM/Price/Form/Option.php
index 08d3eaf614..52337dbf32 100644
--- a/civicrm/CRM/Price/Form/Option.php
+++ b/civicrm/CRM/Price/Form/Option.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Price/Form/Preview.php b/civicrm/CRM/Price/Form/Preview.php
index a3b4f523b1..71f687eede 100644
--- a/civicrm/CRM/Price/Form/Preview.php
+++ b/civicrm/CRM/Price/Form/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Price/Form/Set.php b/civicrm/CRM/Price/Form/Set.php
index a4234cd1dd..c1a87bc643 100644
--- a/civicrm/CRM/Price/Form/Set.php
+++ b/civicrm/CRM/Price/Form/Set.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Price/Page/Field.php b/civicrm/CRM/Price/Page/Field.php
index 185cb55893..f612262532 100644
--- a/civicrm/CRM/Price/Page/Field.php
+++ b/civicrm/CRM/Price/Page/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Price/Page/Option.php b/civicrm/CRM/Price/Page/Option.php
index 34253ba0df..c67194fa57 100644
--- a/civicrm/CRM/Price/Page/Option.php
+++ b/civicrm/CRM/Price/Page/Option.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Price/Page/Set.php b/civicrm/CRM/Price/Page/Set.php
index d811524d0b..3437be3268 100644
--- a/civicrm/CRM/Price/Page/Set.php
+++ b/civicrm/CRM/Price/Page/Set.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Profile/Form.php b/civicrm/CRM/Profile/Form.php
index babd87a1bb..5f8e72b220 100644
--- a/civicrm/CRM/Profile/Form.php
+++ b/civicrm/CRM/Profile/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Profile/Form/Dynamic.php b/civicrm/CRM/Profile/Form/Dynamic.php
index a06f79b723..9c3f20019d 100644
--- a/civicrm/CRM/Profile/Form/Dynamic.php
+++ b/civicrm/CRM/Profile/Form/Dynamic.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Profile/Form/Edit.php b/civicrm/CRM/Profile/Form/Edit.php
index 5147e6cf55..dd9e1c5f53 100644
--- a/civicrm/CRM/Profile/Form/Edit.php
+++ b/civicrm/CRM/Profile/Form/Edit.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Profile/Form/Search.php b/civicrm/CRM/Profile/Form/Search.php
index 2b07193a4c..b14e2f159a 100644
--- a/civicrm/CRM/Profile/Form/Search.php
+++ b/civicrm/CRM/Profile/Form/Search.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Profile/Page/Dynamic.php b/civicrm/CRM/Profile/Page/Dynamic.php
index e1d68d53f6..9b0dfd1b9a 100644
--- a/civicrm/CRM/Profile/Page/Dynamic.php
+++ b/civicrm/CRM/Profile/Page/Dynamic.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Profile/Page/Listings.php b/civicrm/CRM/Profile/Page/Listings.php
index 7689b6ec7b..3bc3e8d9b0 100644
--- a/civicrm/CRM/Profile/Page/Listings.php
+++ b/civicrm/CRM/Profile/Page/Listings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php b/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
index 6a4fd0a045..c27eb1953f 100644
--- a/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
+++ b/civicrm/CRM/Profile/Page/MultipleRecordFieldsListing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Profile/Page/Router.php b/civicrm/CRM/Profile/Page/Router.php
index 1893eae721..a9b6ab2b37 100644
--- a/civicrm/CRM/Profile/Page/Router.php
+++ b/civicrm/CRM/Profile/Page/Router.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Profile/Page/View.php b/civicrm/CRM/Profile/Page/View.php
index babbf41c4a..89d8f798fa 100644
--- a/civicrm/CRM/Profile/Page/View.php
+++ b/civicrm/CRM/Profile/Page/View.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Profile/Selector/Listings.php b/civicrm/CRM/Profile/Selector/Listings.php
index f08cb8f373..9c3611b658 100644
--- a/civicrm/CRM/Profile/Selector/Listings.php
+++ b/civicrm/CRM/Profile/Selector/Listings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Queue/BAO/QueueItem.php b/civicrm/CRM/Queue/BAO/QueueItem.php
index 60fcbd0ba5..25c0e66419 100644
--- a/civicrm/CRM/Queue/BAO/QueueItem.php
+++ b/civicrm/CRM/Queue/BAO/QueueItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Queue/DAO/QueueItem.php b/civicrm/CRM/Queue/DAO/QueueItem.php
index 38eb9e8d0b..9a767ad19f 100644
--- a/civicrm/CRM/Queue/DAO/QueueItem.php
+++ b/civicrm/CRM/Queue/DAO/QueueItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Queue/QueueItem.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Queue/ErrorPolicy.php b/civicrm/CRM/Queue/ErrorPolicy.php
index 9e3cee1bfc..0fbea745ce 100644
--- a/civicrm/CRM/Queue/ErrorPolicy.php
+++ b/civicrm/CRM/Queue/ErrorPolicy.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Queue/Menu.php b/civicrm/CRM/Queue/Menu.php
index a538b2d974..7ae1605849 100644
--- a/civicrm/CRM/Queue/Menu.php
+++ b/civicrm/CRM/Queue/Menu.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* allows us to use these paths during upgrades.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Queue/Page/AJAX.php b/civicrm/CRM/Queue/Page/AJAX.php
index 6f37e38e7d..c493167c0b 100644
--- a/civicrm/CRM/Queue/Page/AJAX.php
+++ b/civicrm/CRM/Queue/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Queue/Page/Runner.php b/civicrm/CRM/Queue/Page/Runner.php
index 8552d13de6..adf7f322dd 100644
--- a/civicrm/CRM/Queue/Page/Runner.php
+++ b/civicrm/CRM/Queue/Page/Runner.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Queue/Queue.php b/civicrm/CRM/Queue/Queue.php
index 83a6b9af29..75f8ef3c68 100644
--- a/civicrm/CRM/Queue/Queue.php
+++ b/civicrm/CRM/Queue/Queue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Queue/Queue/Memory.php b/civicrm/CRM/Queue/Queue/Memory.php
index 6d2acb432b..86dd11ccb0 100644
--- a/civicrm/CRM/Queue/Queue/Memory.php
+++ b/civicrm/CRM/Queue/Queue/Memory.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Queue/Queue/Sql.php b/civicrm/CRM/Queue/Queue/Sql.php
index d0f0192f9c..709638303b 100644
--- a/civicrm/CRM/Queue/Queue/Sql.php
+++ b/civicrm/CRM/Queue/Queue/Sql.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Queue/Runner.php b/civicrm/CRM/Queue/Runner.php
index de1cdbe96b..8d0c3fc208 100644
--- a/civicrm/CRM/Queue/Runner.php
+++ b/civicrm/CRM/Queue/Runner.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Queue/Service.php b/civicrm/CRM/Queue/Service.php
index 5bed0dc727..84501b8c39 100644
--- a/civicrm/CRM/Queue/Service.php
+++ b/civicrm/CRM/Queue/Service.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Queue/Task.php b/civicrm/CRM/Queue/Task.php
index d2a195549c..666dfd14b8 100644
--- a/civicrm/CRM/Queue/Task.php
+++ b/civicrm/CRM/Queue/Task.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Queue/TaskContext.php b/civicrm/CRM/Queue/TaskContext.php
index ac533eb186..986501fbef 100644
--- a/civicrm/CRM/Queue/TaskContext.php
+++ b/civicrm/CRM/Queue/TaskContext.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Report/BAO/Hook.php b/civicrm/CRM/Report/BAO/Hook.php
index 0a5611178b..f57aec0d6e 100644
--- a/civicrm/CRM/Report/BAO/Hook.php
+++ b/civicrm/CRM/Report/BAO/Hook.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/BAO/HookInterface.php b/civicrm/CRM/Report/BAO/HookInterface.php
index cfabc6eb0f..0bcfbe1ad5 100644
--- a/civicrm/CRM/Report/BAO/HookInterface.php
+++ b/civicrm/CRM/Report/BAO/HookInterface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/BAO/ReportInstance.php b/civicrm/CRM/Report/BAO/ReportInstance.php
index c692aeeb67..2971b7bff0 100644
--- a/civicrm/CRM/Report/BAO/ReportInstance.php
+++ b/civicrm/CRM/Report/BAO/ReportInstance.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance {
diff --git a/civicrm/CRM/Report/DAO/ReportInstance.php b/civicrm/CRM/Report/DAO/ReportInstance.php
index d11dcd6670..0627a8574d 100644
--- a/civicrm/CRM/Report/DAO/ReportInstance.php
+++ b/civicrm/CRM/Report/DAO/ReportInstance.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/Report/ReportInstance.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/Report/Form.php b/civicrm/CRM/Report/Form.php
index dd348ac510..f720104a49 100644
--- a/civicrm/CRM/Report/Form.php
+++ b/civicrm/CRM/Report/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -3658,7 +3658,13 @@ ORDER BY cg.weight, cf.weight";
return;
}
$mapper = CRM_Core_BAO_CustomQuery::$extendsMap;
- $customTables = explode(',', CRM_Core_DAO::singleValueQuery("SELECT GROUP_CONCAT(table_name) FROM civicrm_custom_group"));
+ //CRM-18276 GROUP_CONCAT could be used with singleValueQuery and then exploded,
+ //but by default that truncates to 1024 characters, which causes errors with installs with lots of custom field sets
+ $customTables = array();
+ $customTablesDAO = CRM_Core_DAO::executeQuery("SELECT table_name FROM civicrm_custom_group", CRM_Core_DAO::$_nullArray);
+ while ($customTablesDAO->fetch()) {
+ $customTables[] = $customTablesDAO->table_name;
+ }
foreach ($this->_columns as $table => $prop) {
if (in_array($table, $customTables)) {
diff --git a/civicrm/CRM/Report/Form/Activity.php b/civicrm/CRM/Report/Form/Activity.php
index 960b5516ed..7a9372a15e 100644
--- a/civicrm/CRM/Report/Form/Activity.php
+++ b/civicrm/CRM/Report/Form/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Report_Form_Activity extends CRM_Report_Form {
protected $_selectAliasesTotal = array();
diff --git a/civicrm/CRM/Report/Form/ActivitySummary.php b/civicrm/CRM/Report/Form/ActivitySummary.php
index fd1da6cba9..2f2a7c0077 100644
--- a/civicrm/CRM/Report/Form/ActivitySummary.php
+++ b/civicrm/CRM/Report/Form/ActivitySummary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Campaign/SurveyDetails.php b/civicrm/CRM/Report/Form/Campaign/SurveyDetails.php
index 895d3f9508..529f98c590 100644
--- a/civicrm/CRM/Report/Form/Campaign/SurveyDetails.php
+++ b/civicrm/CRM/Report/Form/Campaign/SurveyDetails.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Case/Demographics.php b/civicrm/CRM/Report/Form/Case/Demographics.php
index 4f755880ae..177d29faf7 100644
--- a/civicrm/CRM/Report/Form/Case/Demographics.php
+++ b/civicrm/CRM/Report/Form/Case/Demographics.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Case/Detail.php b/civicrm/CRM/Report/Form/Case/Detail.php
index 3637d7eb06..c3982af1ea 100644
--- a/civicrm/CRM/Report/Form/Case/Detail.php
+++ b/civicrm/CRM/Report/Form/Case/Detail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Case/Summary.php b/civicrm/CRM/Report/Form/Case/Summary.php
index 65fa79dfe4..fec119e271 100644
--- a/civicrm/CRM/Report/Form/Case/Summary.php
+++ b/civicrm/CRM/Report/Form/Case/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Case/TimeSpent.php b/civicrm/CRM/Report/Form/Case/TimeSpent.php
index f00f02d662..f09b557401 100644
--- a/civicrm/CRM/Report/Form/Case/TimeSpent.php
+++ b/civicrm/CRM/Report/Form/Case/TimeSpent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contact/CurrentEmployer.php b/civicrm/CRM/Report/Form/Contact/CurrentEmployer.php
index 94b2587086..fc85be7a6a 100644
--- a/civicrm/CRM/Report/Form/Contact/CurrentEmployer.php
+++ b/civicrm/CRM/Report/Form/Contact/CurrentEmployer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contact/Detail.php b/civicrm/CRM/Report/Form/Contact/Detail.php
index 198e180709..d8703f8d25 100644
--- a/civicrm/CRM/Report/Form/Contact/Detail.php
+++ b/civicrm/CRM/Report/Form/Contact/Detail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contact/Log.php b/civicrm/CRM/Report/Form/Contact/Log.php
index 79644121ef..3cdc9f06b2 100644
--- a/civicrm/CRM/Report/Form/Contact/Log.php
+++ b/civicrm/CRM/Report/Form/Contact/Log.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contact/LoggingDetail.php b/civicrm/CRM/Report/Form/Contact/LoggingDetail.php
index 76dd25840b..aa31272d0b 100644
--- a/civicrm/CRM/Report/Form/Contact/LoggingDetail.php
+++ b/civicrm/CRM/Report/Form/Contact/LoggingDetail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contact/LoggingSummary.php b/civicrm/CRM/Report/Form/Contact/LoggingSummary.php
index 5b984acf04..2ee03a7831 100644
--- a/civicrm/CRM/Report/Form/Contact/LoggingSummary.php
+++ b/civicrm/CRM/Report/Form/Contact/LoggingSummary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Report_Form_Contact_LoggingSummary extends CRM_Logging_ReportSummary {
/**
@@ -247,14 +247,9 @@ class CRM_Report_Form_Contact_LoggingSummary extends CRM_Logging_ReportSummary {
/**
* Generate From Clause.
- *
- * @param string $logTable
*/
- public function from($logTable = NULL) {
- static $entity = NULL;
- if ($logTable) {
- $entity = $logTable;
- }
+ public function from() {
+ $entity = $this->currentLogTable;
$detail = $this->_logTables[$entity];
$tableName = CRM_Utils_Array::value('table_name', $detail, $entity);
diff --git a/civicrm/CRM/Report/Form/Contact/Relationship.php b/civicrm/CRM/Report/Form/Contact/Relationship.php
index ea2deec19c..36e3d06d99 100644
--- a/civicrm/CRM/Report/Form/Contact/Relationship.php
+++ b/civicrm/CRM/Report/Form/Contact/Relationship.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contact/Summary.php b/civicrm/CRM/Report/Form/Contact/Summary.php
index 2f8e4e961b..ab82a89d68 100644
--- a/civicrm/CRM/Report/Form/Contact/Summary.php
+++ b/civicrm/CRM/Report/Form/Contact/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php b/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php
index 2e82d86456..f71433d689 100644
--- a/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/civicrm/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -230,6 +230,21 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
'financial_type_id' => array('title' => ts('Financial Type')),
),
),
+ 'civicrm_batch' => array(
+ 'dao' => 'CRM_Batch_DAO_Batch',
+ 'fields' => array(
+ 'title' => array(
+ 'title' => ts('Batch Title'),
+ 'alias' => 'batch',
+ 'default' => FALSE,
+ ),
+ 'name' => array(
+ 'title' => ts('Batch Name'),
+ 'alias' => 'batch',
+ 'default' => TRUE,
+ ),
+ ),
+ ),
'civicrm_contribution' => array(
'dao' => 'CRM_Contribute_DAO_Contribution',
'fields' => array(
@@ -415,6 +430,13 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
ON fitem.financial_account_id = {$this->_aliases['civicrm_financial_account']}_credit_2.id
LEFT JOIN civicrm_line_item {$this->_aliases['civicrm_line_item']}
ON fitem.entity_id = {$this->_aliases['civicrm_line_item']}.id AND fitem.entity_table = 'civicrm_line_item' ";
+ if ($this->isTableSelected('civicrm_batch')) {
+ $this->_from .= "LEFT JOIN civicrm_entity_batch ent_batch
+ ON {$this->_aliases['civicrm_financial_trxn']}.id = ent_batch.entity_id AND ent_batch.entity_table = 'civicrm_financial_trxn'
+ LEFT JOIN civicrm_batch batch
+ ON ent_batch.batch_id = batch.id";
+ }
+
$this->getPermissionedFTQuery($this, "civicrm_line_item_1");
}
diff --git a/civicrm/CRM/Report/Form/Contribute/Detail.php b/civicrm/CRM/Report/Form/Contribute/Detail.php
index 2659c804d4..79d78c68e0 100644
--- a/civicrm/CRM/Report/Form/Contribute/Detail.php
+++ b/civicrm/CRM/Report/Form/Contribute/Detail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -375,6 +375,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
$this->_columns['civicrm_contribution']['order_bys']['campaign_id'] = array('title' => ts('Campaign'));
}
@@ -517,7 +518,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
SUM( {$this->_aliases['civicrm_contribution']}.total_amount ) as amount,
ROUND(AVG({$this->_aliases['civicrm_contribution']}.total_amount), 2) as avg,
{$this->_aliases['civicrm_contribution']}.currency as currency,
- SUM( {$this->_aliases['civicrm_contribution']}.fee_amount ) as fees,
+ SUM( {$this->_aliases['civicrm_contribution']}.fee_amount ) as fees,
SUM( {$this->_aliases['civicrm_contribution']}.net_amount ) as net
";
@@ -604,6 +605,12 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency";
$this->buildACLClause($this->_aliases['civicrm_contact']);
$this->beginPostProcess();
+ // CRM-18312 - display soft_credits and soft_credits_for column
+ // when 'Contribution or Soft Credit?' column is not selected
+ if (empty($this->_params['fields']['contribution_or_soft'])) {
+ $this->_params['fields']['contribution_or_soft'] = 1;
+ $this->noDisplayContributionOrSoftColumn = TRUE;
+ }
if (CRM_Utils_Array::value('contribution_or_soft_value', $this->_params) ==
'contributions_only' &&
@@ -872,6 +879,12 @@ WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu
$rows[$rowNum]['civicrm_contribution_soft_credit_for'] = $string;
}
+ // CRM-18312 - hide 'contribution_or_soft' column if unchecked.
+ if (!empty($this->noDisplayContributionOrSoftColumn)) {
+ unset($rows[$rowNum]['civicrm_contribution_contribution_or_soft']);
+ unset($this->_columnHeaders['civicrm_contribution_contribution_or_soft']);
+ }
+
//convert soft_credit_type_id into label
if (array_key_exists('civicrm_contribution_soft_soft_credit_type_id', $rows[$rowNum])) {
$rows[$rowNum]['civicrm_contribution_soft_soft_credit_type_id'] = CRM_Core_PseudoConstant::getLabel(
diff --git a/civicrm/CRM/Report/Form/Contribute/History.php b/civicrm/CRM/Report/Form/Contribute/History.php
index cbc2de59e8..8c3fe86bf7 100644
--- a/civicrm/CRM/Report/Form/Contribute/History.php
+++ b/civicrm/CRM/Report/Form/Contribute/History.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contribute/HouseholdSummary.php b/civicrm/CRM/Report/Form/Contribute/HouseholdSummary.php
index 0056ada586..dc6954062a 100644
--- a/civicrm/CRM/Report/Form/Contribute/HouseholdSummary.php
+++ b/civicrm/CRM/Report/Form/Contribute/HouseholdSummary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -194,6 +194,7 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
}
$this->_currencyColumn = 'civicrm_contribution_currency';
diff --git a/civicrm/CRM/Report/Form/Contribute/LoggingDetail.php b/civicrm/CRM/Report/Form/Contribute/LoggingDetail.php
index 341ae90f34..060806dc78 100644
--- a/civicrm/CRM/Report/Form/Contribute/LoggingDetail.php
+++ b/civicrm/CRM/Report/Form/Contribute/LoggingDetail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contribute/LoggingSummary.php b/civicrm/CRM/Report/Form/Contribute/LoggingSummary.php
index f4f0055412..9ffa2603f8 100644
--- a/civicrm/CRM/Report/Form/Contribute/LoggingSummary.php
+++ b/civicrm/CRM/Report/Form/Contribute/LoggingSummary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contribute/Lybunt.php b/civicrm/CRM/Report/Form/Contribute/Lybunt.php
index 3a3b2b92e9..c12deb627c 100644
--- a/civicrm/CRM/Report/Form/Contribute/Lybunt.php
+++ b/civicrm/CRM/Report/Form/Contribute/Lybunt.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form {
diff --git a/civicrm/CRM/Report/Form/Contribute/OrganizationSummary.php b/civicrm/CRM/Report/Form/Contribute/OrganizationSummary.php
index 59883097c0..cc8b2cc9c0 100644
--- a/civicrm/CRM/Report/Form/Contribute/OrganizationSummary.php
+++ b/civicrm/CRM/Report/Form/Contribute/OrganizationSummary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -204,6 +204,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
}
diff --git a/civicrm/CRM/Report/Form/Contribute/PCP.php b/civicrm/CRM/Report/Form/Contribute/PCP.php
index 77a3e38df9..5ef011714d 100644
--- a/civicrm/CRM/Report/Form/Contribute/PCP.php
+++ b/civicrm/CRM/Report/Form/Contribute/PCP.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contribute/Recur.php b/civicrm/CRM/Report/Form/Contribute/Recur.php
index 211706424c..2e55034366 100644
--- a/civicrm/CRM/Report/Form/Contribute/Recur.php
+++ b/civicrm/CRM/Report/Form/Contribute/Recur.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contribute/RecurSummary.php b/civicrm/CRM/Report/Form/Contribute/RecurSummary.php
index 0133db518a..c0353e24f5 100644
--- a/civicrm/CRM/Report/Form/Contribute/RecurSummary.php
+++ b/civicrm/CRM/Report/Form/Contribute/RecurSummary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Contribute/Repeat.php b/civicrm/CRM/Report/Form/Contribute/Repeat.php
index a657fae91d..152775c1a4 100644
--- a/civicrm/CRM/Report/Form/Contribute/Repeat.php
+++ b/civicrm/CRM/Report/Form/Contribute/Repeat.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Report_Form_Contribute_Repeat extends CRM_Report_Form {
protected $_amountClauseWithAND = NULL;
diff --git a/civicrm/CRM/Report/Form/Contribute/SoftCredit.php b/civicrm/CRM/Report/Form/Contribute/SoftCredit.php
index 7a4afff37d..c9058223e7 100644
--- a/civicrm/CRM/Report/Form/Contribute/SoftCredit.php
+++ b/civicrm/CRM/Report/Form/Contribute/SoftCredit.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -301,6 +301,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
}
diff --git a/civicrm/CRM/Report/Form/Contribute/Summary.php b/civicrm/CRM/Report/Form/Contribute/Summary.php
index 685458c637..d320115f4d 100644
--- a/civicrm/CRM/Report/Form/Contribute/Summary.php
+++ b/civicrm/CRM/Report/Form/Contribute/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
protected $_addressField = FALSE;
diff --git a/civicrm/CRM/Report/Form/Contribute/Sybunt.php b/civicrm/CRM/Report/Form/Contribute/Sybunt.php
index 60d4ea9ce6..1625378f68 100644
--- a/civicrm/CRM/Report/Form/Contribute/Sybunt.php
+++ b/civicrm/CRM/Report/Form/Contribute/Sybunt.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form {
@@ -248,6 +248,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
}
diff --git a/civicrm/CRM/Report/Form/Contribute/TopDonor.php b/civicrm/CRM/Report/Form/Contribute/TopDonor.php
index 945c7074d5..1ffe5d6115 100644
--- a/civicrm/CRM/Report/Form/Contribute/TopDonor.php
+++ b/civicrm/CRM/Report/Form/Contribute/TopDonor.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Event.php b/civicrm/CRM/Report/Form/Event.php
index c9e979675f..956d3bd378 100644
--- a/civicrm/CRM/Report/Form/Event.php
+++ b/civicrm/CRM/Report/Form/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Event/Income.php b/civicrm/CRM/Report/Form/Event/Income.php
index 51e869c707..d5570f3321 100644
--- a/civicrm/CRM/Report/Form/Event/Income.php
+++ b/civicrm/CRM/Report/Form/Event/Income.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Event/IncomeCountSummary.php b/civicrm/CRM/Report/Form/Event/IncomeCountSummary.php
index 63cd87d037..8bfd9151ef 100644
--- a/civicrm/CRM/Report/Form/Event/IncomeCountSummary.php
+++ b/civicrm/CRM/Report/Form/Event/IncomeCountSummary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Event/ParticipantListCount.php b/civicrm/CRM/Report/Form/Event/ParticipantListCount.php
index 8eebf323a3..390e50a66c 100644
--- a/civicrm/CRM/Report/Form/Event/ParticipantListCount.php
+++ b/civicrm/CRM/Report/Form/Event/ParticipantListCount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Event/ParticipantListing.php b/civicrm/CRM/Report/Form/Event/ParticipantListing.php
index ce0bc96fdd..3497a4a84d 100644
--- a/civicrm/CRM/Report/Form/Event/ParticipantListing.php
+++ b/civicrm/CRM/Report/Form/Event/ParticipantListing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -411,6 +411,7 @@ class CRM_Report_Form_Event_ParticipantListing extends CRM_Report_Form_Event {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
$this->_columns['civicrm_participant']['order_bys']['campaign_id'] = array(
'title' => ts('Campaign'),
diff --git a/civicrm/CRM/Report/Form/Event/Summary.php b/civicrm/CRM/Report/Form/Event/Summary.php
index fa0c88d0cd..291194df89 100644
--- a/civicrm/CRM/Report/Form/Event/Summary.php
+++ b/civicrm/CRM/Report/Form/Event/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Extended.php b/civicrm/CRM/Report/Form/Extended.php
index 1f60de6f95..fe0999dddb 100644
--- a/civicrm/CRM/Report/Form/Extended.php
+++ b/civicrm/CRM/Report/Form/Extended.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Grant/Detail.php b/civicrm/CRM/Report/Form/Grant/Detail.php
index 34dbfa209b..461b7f29b6 100644
--- a/civicrm/CRM/Report/Form/Grant/Detail.php
+++ b/civicrm/CRM/Report/Form/Grant/Detail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Grant/Statistics.php b/civicrm/CRM/Report/Form/Grant/Statistics.php
index 2146d12e3d..811ee3b113 100644
--- a/civicrm/CRM/Report/Form/Grant/Statistics.php
+++ b/civicrm/CRM/Report/Form/Grant/Statistics.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Instance.php b/civicrm/CRM/Report/Form/Instance.php
index 69c6efa0de..814511450b 100644
--- a/civicrm/CRM/Report/Form/Instance.php
+++ b/civicrm/CRM/Report/Form/Instance.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Report/Form/Mailing/Bounce.php b/civicrm/CRM/Report/Form/Mailing/Bounce.php
index 4f8438a48b..82e1b0a6ac 100644
--- a/civicrm/CRM/Report/Form/Mailing/Bounce.php
+++ b/civicrm/CRM/Report/Form/Mailing/Bounce.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
@@ -189,7 +189,6 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
'email' => array(
'title' => ts('Email'),
'no_repeat' => TRUE,
- 'required' => TRUE,
),
'on_hold' => array(
'title' => ts('On hold'),
@@ -294,7 +293,7 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
$this->_from .= "
INNER JOIN civicrm_mailing_event_queue
ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
- INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
INNER JOIN civicrm_mailing_event_bounce {$this->_aliases['civicrm_mailing_event_bounce']}
ON {$this->_aliases['civicrm_mailing_event_bounce']}.event_queue_id = civicrm_mailing_event_queue.id
@@ -439,6 +438,15 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
$entryFound = FALSE;
foreach ($rows as $rowNum => $row) {
+
+ // 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>';
+ }
+ $entryFound = TRUE;
+ }
+
// make count columns point to detail report
// convert display name to links
if (array_key_exists('civicrm_contact_sort_name', $row) &&
diff --git a/civicrm/CRM/Report/Form/Mailing/Clicks.php b/civicrm/CRM/Report/Form/Mailing/Clicks.php
index c510ddf6c1..d8bdf6cf2e 100644
--- a/civicrm/CRM/Report/Form/Mailing/Clicks.php
+++ b/civicrm/CRM/Report/Form/Mailing/Clicks.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -134,7 +134,6 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form {
'email' => array(
'title' => ts('Email'),
'no_repeat' => TRUE,
- 'required' => TRUE,
),
),
'grouping' => 'contact-fields',
@@ -231,7 +230,7 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form {
$this->_from .= "
INNER JOIN civicrm_mailing_event_queue
ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
- INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
INNER JOIN civicrm_mailing_event_trackable_url_open
ON civicrm_mailing_event_trackable_url_open.event_queue_id = civicrm_mailing_event_queue.id
@@ -320,6 +319,15 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form {
public function alterDisplay(&$rows) {
$entryFound = FALSE;
foreach ($rows as $rowNum => $row) {
+
+ // 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>';
+ }
+ $entryFound = TRUE;
+ }
+
// make count columns point to detail report
// convert display name to links
if (array_key_exists('civicrm_contact_sort_name', $row) &&
diff --git a/civicrm/CRM/Report/Form/Mailing/Detail.php b/civicrm/CRM/Report/Form/Mailing/Detail.php
index c5de7edba0..ccbddd44e0 100644
--- a/civicrm/CRM/Report/Form/Mailing/Detail.php
+++ b/civicrm/CRM/Report/Form/Mailing/Detail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -236,7 +236,6 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form {
'fields' => array(
'email' => array(
'title' => ts('Email'),
- 'required' => TRUE,
),
),
'grouping' => 'contact-fields',
@@ -311,7 +310,7 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form {
$this->_from .= "
INNER JOIN civicrm_mailing_event_queue
ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
- INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id";
if (array_key_exists('delivery_id', $this->_params['fields'])) {
@@ -459,6 +458,15 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form {
public function alterDisplay(&$rows) {
$entryFound = FALSE;
foreach ($rows as $rowNum => $row) {
+
+ // 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>';
+ }
+ $entryFound = TRUE;
+ }
+
// make count columns point to detail report
// convert display name to links
if (array_key_exists('civicrm_contact_sort_name', $row) &&
diff --git a/civicrm/CRM/Report/Form/Mailing/Opened.php b/civicrm/CRM/Report/Form/Mailing/Opened.php
index 9faa4c9f84..2e70292ee0 100644
--- a/civicrm/CRM/Report/Form/Mailing/Opened.php
+++ b/civicrm/CRM/Report/Form/Mailing/Opened.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -134,7 +134,6 @@ class CRM_Report_Form_Mailing_Opened extends CRM_Report_Form {
'email' => array(
'title' => ts('Email'),
'no_repeat' => TRUE,
- 'required' => TRUE,
),
),
'order_bys' => array(
@@ -211,7 +210,7 @@ class CRM_Report_Form_Mailing_Opened extends CRM_Report_Form {
$this->_from .= "
INNER JOIN civicrm_mailing_event_queue
ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
- INNER JOIN civicrm_email {$this->_aliases['civicrm_email']}
+ LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
INNER JOIN civicrm_mailing_event_opened
ON civicrm_mailing_event_opened.event_queue_id = civicrm_mailing_event_queue.id
@@ -297,6 +296,15 @@ class CRM_Report_Form_Mailing_Opened extends CRM_Report_Form {
public function alterDisplay(&$rows) {
$entryFound = FALSE;
foreach ($rows as $rowNum => $row) {
+
+ // 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>';
+ }
+ $entryFound = TRUE;
+ }
+
// make count columns point to detail report
// convert display name to links
if (array_key_exists('civicrm_contact_sort_name', $row) &&
diff --git a/civicrm/CRM/Report/Form/Mailing/Summary.php b/civicrm/CRM/Report/Form/Mailing/Summary.php
index 2b11ca592c..b8e3664f6e 100644
--- a/civicrm/CRM/Report/Form/Mailing/Summary.php
+++ b/civicrm/CRM/Report/Form/Mailing/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Member/ContributionDetail.php b/civicrm/CRM/Report/Form/Member/ContributionDetail.php
index e02889c069..54b9c113fe 100644
--- a/civicrm/CRM/Report/Form/Member/ContributionDetail.php
+++ b/civicrm/CRM/Report/Form/Member/ContributionDetail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -378,6 +378,7 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
$this->_columns['civicrm_contribution']['order_bys']['campaign_id'] = array('title' => ts('Campaign'));
}
diff --git a/civicrm/CRM/Report/Form/Member/Detail.php b/civicrm/CRM/Report/Form/Member/Detail.php
index 611848ecb9..cd6ed27ad8 100644
--- a/civicrm/CRM/Report/Form/Member/Detail.php
+++ b/civicrm/CRM/Report/Form/Member/Detail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -247,6 +247,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
$this->_columns['civicrm_membership']['order_bys']['campaign_id'] = array('title' => ts('Campaign'));
diff --git a/civicrm/CRM/Report/Form/Member/Lapse.php b/civicrm/CRM/Report/Form/Member/Lapse.php
index cc45121c13..d746013baa 100644
--- a/civicrm/CRM/Report/Form/Member/Lapse.php
+++ b/civicrm/CRM/Report/Form/Member/Lapse.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Member/Summary.php b/civicrm/CRM/Report/Form/Member/Summary.php
index 99d5183705..d5400f5e56 100644
--- a/civicrm/CRM/Report/Form/Member/Summary.php
+++ b/civicrm/CRM/Report/Form/Member/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -186,6 +186,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
$this->_columns['civicrm_membership']['group_bys']['campaign_id'] = array('title' => ts('Campaign'));
}
diff --git a/civicrm/CRM/Report/Form/Membership/Summary.php b/civicrm/CRM/Report/Form/Membership/Summary.php
index 402c0b8a71..816cd44e2a 100644
--- a/civicrm/CRM/Report/Form/Membership/Summary.php
+++ b/civicrm/CRM/Report/Form/Membership/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Report_Form_Membership_Summary extends CRM_Report_Form {
diff --git a/civicrm/CRM/Report/Form/Pledge/Detail.php b/civicrm/CRM/Report/Form/Pledge/Detail.php
index ddf69d413a..0190fa10fa 100644
--- a/civicrm/CRM/Report/Form/Pledge/Detail.php
+++ b/civicrm/CRM/Report/Form/Pledge/Detail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -39,7 +39,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -197,6 +197,7 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
$this->_columns['civicrm_pledge']['group_bys']['campaign_id'] = array('title' => ts('Campaign'));
diff --git a/civicrm/CRM/Report/Form/Pledge/Pbnp.php b/civicrm/CRM/Report/Form/Pledge/Pbnp.php
index 80d56f7a90..c1e0cb3643 100644
--- a/civicrm/CRM/Report/Form/Pledge/Pbnp.php
+++ b/civicrm/CRM/Report/Form/Pledge/Pbnp.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -185,6 +185,7 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form {
'title' => ts('Campaign'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
+ 'type' => CRM_Utils_Type::T_INT,
);
}
diff --git a/civicrm/CRM/Report/Form/Pledge/Summary.php b/civicrm/CRM/Report/Form/Pledge/Summary.php
index 78c597b06f..04f10bbae7 100644
--- a/civicrm/CRM/Report/Form/Pledge/Summary.php
+++ b/civicrm/CRM/Report/Form/Pledge/Summary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Register.php b/civicrm/CRM/Report/Form/Register.php
index 35257fc7db..ac7d3e3901 100644
--- a/civicrm/CRM/Report/Form/Register.php
+++ b/civicrm/CRM/Report/Form/Register.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Form/Walklist/Walklist.php b/civicrm/CRM/Report/Form/Walklist/Walklist.php
index c8c3dd41fc..361492aa22 100644
--- a/civicrm/CRM/Report/Form/Walklist/Walklist.php
+++ b/civicrm/CRM/Report/Form/Walklist/Walklist.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Info.php b/civicrm/CRM/Report/Info.php
index d7ffa9f67a..adb81363d6 100644
--- a/civicrm/CRM/Report/Info.php
+++ b/civicrm/CRM/Report/Info.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
* abstract class.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Interface.php b/civicrm/CRM/Report/Interface.php
index d10c0eddf5..4fc366264d 100644
--- a/civicrm/CRM/Report/Interface.php
+++ b/civicrm/CRM/Report/Interface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
interface CRM_Report_Interface {
diff --git a/civicrm/CRM/Report/Page/Instance.php b/civicrm/CRM/Report/Page/Instance.php
index 1409a435a8..7c5bd87f34 100644
--- a/civicrm/CRM/Report/Page/Instance.php
+++ b/civicrm/CRM/Report/Page/Instance.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Report/Page/InstanceList.php b/civicrm/CRM/Report/Page/InstanceList.php
index 508eb67a10..3051a4b156 100644
--- a/civicrm/CRM/Report/Page/InstanceList.php
+++ b/civicrm/CRM/Report/Page/InstanceList.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Report/Page/Options.php b/civicrm/CRM/Report/Page/Options.php
index 4aa7c18c8b..40dd9e5403 100644
--- a/civicrm/CRM/Report/Page/Options.php
+++ b/civicrm/CRM/Report/Page/Options.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Report/Page/Report.php b/civicrm/CRM/Report/Page/Report.php
index 4f57f2470c..9689cc30c1 100644
--- a/civicrm/CRM/Report/Page/Report.php
+++ b/civicrm/CRM/Report/Page/Report.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Report/Page/TemplateList.php b/civicrm/CRM/Report/Page/TemplateList.php
index 8a7ee5d93f..dc9379bf38 100644
--- a/civicrm/CRM/Report/Page/TemplateList.php
+++ b/civicrm/CRM/Report/Page/TemplateList.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Report/Utils/Get.php b/civicrm/CRM/Report/Utils/Get.php
index 2f14b02ff3..8669159425 100644
--- a/civicrm/CRM/Report/Utils/Get.php
+++ b/civicrm/CRM/Report/Utils/Get.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Report/Utils/Report.php b/civicrm/CRM/Report/Utils/Report.php
index 8aa59cd6a5..c981e29611 100644
--- a/civicrm/CRM/Report/Utils/Report.php
+++ b/civicrm/CRM/Report/Utils/Report.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/SMS/BAO/Provider.php b/civicrm/CRM/SMS/BAO/Provider.php
index 65711742c5..3ae22774d4 100644
--- a/civicrm/CRM/SMS/BAO/Provider.php
+++ b/civicrm/CRM/SMS/BAO/Provider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_SMS_BAO_Provider extends CRM_SMS_DAO_Provider {
diff --git a/civicrm/CRM/SMS/Controller/Send.php b/civicrm/CRM/SMS/Controller/Send.php
index a168bef265..81da3d2082 100644
--- a/civicrm/CRM/SMS/Controller/Send.php
+++ b/civicrm/CRM/SMS/Controller/Send.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_SMS_Controller_Send extends CRM_Core_Controller {
diff --git a/civicrm/CRM/SMS/DAO/Provider.php b/civicrm/CRM/SMS/DAO/Provider.php
index d0e0d74ec6..debe9dac8d 100644
--- a/civicrm/CRM/SMS/DAO/Provider.php
+++ b/civicrm/CRM/SMS/DAO/Provider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -26,7 +26,7 @@
*/
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* Generated from xml/schema/CRM/SMS/Provider.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
diff --git a/civicrm/CRM/SMS/Form/Group.php b/civicrm/CRM/SMS/Form/Group.php
index acb5d76be8..3e9c301b38 100644
--- a/civicrm/CRM/SMS/Form/Group.php
+++ b/civicrm/CRM/SMS/Form/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/SMS/Form/Provider.php b/civicrm/CRM/SMS/Form/Provider.php
index 25dd50e7cb..836ac65dca 100644
--- a/civicrm/CRM/SMS/Form/Provider.php
+++ b/civicrm/CRM/SMS/Form/Provider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/SMS/Form/Schedule.php b/civicrm/CRM/SMS/Form/Schedule.php
index 1e7ecc7229..082fd6b50a 100644
--- a/civicrm/CRM/SMS/Form/Schedule.php
+++ b/civicrm/CRM/SMS/Form/Schedule.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_SMS_Form_Schedule extends CRM_Core_Form {
diff --git a/civicrm/CRM/SMS/Form/Upload.php b/civicrm/CRM/SMS/Form/Upload.php
index 6082c83523..d76b19b45f 100644
--- a/civicrm/CRM/SMS/Form/Upload.php
+++ b/civicrm/CRM/SMS/Form/Upload.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/SMS/Page/Callback.php b/civicrm/CRM/SMS/Page/Callback.php
index 183a6c9ac8..0377167f45 100644
--- a/civicrm/CRM/SMS/Page/Callback.php
+++ b/civicrm/CRM/SMS/Page/Callback.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_SMS_Page_Callback {
diff --git a/civicrm/CRM/SMS/Page/Provider.php b/civicrm/CRM/SMS/Page/Provider.php
index 6b56614115..dc33b84f6a 100644
--- a/civicrm/CRM/SMS/Page/Provider.php
+++ b/civicrm/CRM/SMS/Page/Provider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/SMS/Provider.php b/civicrm/CRM/SMS/Provider.php
index a01b0bfe8e..4d953f18d2 100644
--- a/civicrm/CRM/SMS/Provider.php
+++ b/civicrm/CRM/SMS/Provider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
abstract class CRM_SMS_Provider {
diff --git a/civicrm/CRM/SMS/StateMachine/Send.php b/civicrm/CRM/SMS/StateMachine/Send.php
index fb0e20c5b0..897cac2662 100644
--- a/civicrm/CRM/SMS/StateMachine/Send.php
+++ b/civicrm/CRM/SMS/StateMachine/Send.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Tag/Form/Tag.php b/civicrm/CRM/Tag/Form/Tag.php
index b784bd77ae..a786ebe19f 100644
--- a/civicrm/CRM/Tag/Form/Tag.php
+++ b/civicrm/CRM/Tag/Form/Tag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/UF/Form/AbstractPreview.php b/civicrm/CRM/UF/Form/AbstractPreview.php
index 228b00316a..4d3d182f35 100644
--- a/civicrm/CRM/UF/Form/AbstractPreview.php
+++ b/civicrm/CRM/UF/Form/AbstractPreview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/UF/Form/AdvanceSetting.php b/civicrm/CRM/UF/Form/AdvanceSetting.php
index e4bb7d97a9..0239efe4b6 100644
--- a/civicrm/CRM/UF/Form/AdvanceSetting.php
+++ b/civicrm/CRM/UF/Form/AdvanceSetting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/UF/Form/Field.php b/civicrm/CRM/UF/Form/Field.php
index 42c9d58c9d..72380b33e1 100644
--- a/civicrm/CRM/UF/Form/Field.php
+++ b/civicrm/CRM/UF/Form/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/UF/Form/Group.php b/civicrm/CRM/UF/Form/Group.php
index f824edcba1..3f89d0632c 100644
--- a/civicrm/CRM/UF/Form/Group.php
+++ b/civicrm/CRM/UF/Form/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/UF/Form/Inline/Preview.php b/civicrm/CRM/UF/Form/Inline/Preview.php
index 07e3b64457..d5bc72a4f3 100644
--- a/civicrm/CRM/UF/Form/Inline/Preview.php
+++ b/civicrm/CRM/UF/Form/Inline/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/UF/Form/Inline/PreviewById.php b/civicrm/CRM/UF/Form/Inline/PreviewById.php
index 5734cfc2de..7ed1f0a5c6 100644
--- a/civicrm/CRM/UF/Form/Inline/PreviewById.php
+++ b/civicrm/CRM/UF/Form/Inline/PreviewById.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/UF/Form/Preview.php b/civicrm/CRM/UF/Form/Preview.php
index ed9ae0b4d2..c10a79daee 100644
--- a/civicrm/CRM/UF/Form/Preview.php
+++ b/civicrm/CRM/UF/Form/Preview.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/UF/Page/AJAX.php b/civicrm/CRM/UF/Page/AJAX.php
index a7e8bc843b..1f9b854e21 100644
--- a/civicrm/CRM/UF/Page/AJAX.php
+++ b/civicrm/CRM/UF/Page/AJAX.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/UF/Page/Field.php b/civicrm/CRM/UF/Page/Field.php
index 7fb6b880eb..cd155df006 100644
--- a/civicrm/CRM/UF/Page/Field.php
+++ b/civicrm/CRM/UF/Page/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/UF/Page/Group.php b/civicrm/CRM/UF/Page/Group.php
index aa60dd5e57..82b7dd8b48 100644
--- a/civicrm/CRM/UF/Page/Group.php
+++ b/civicrm/CRM/UF/Page/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl b/civicrm/CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl
new file mode 100644
index 0000000000..66a5177567
--- /dev/null
+++ b/civicrm/CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl
@@ -0,0 +1,16 @@
+{php}
+ $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.5.msg_template/message_templates';
+ $templates = array();
+ foreach (preg_grep('/\.tpl$/', scandir($dir)) as $filename) {
+ $parts = explode('_', basename($filename, '.tpl'));
+ $templates[] = array('type' => array_pop($parts), 'name' => implode('_', $parts), 'filename' => "$dir/$filename");
+ }
+ $this->assign('templates', $templates);
+{/php}
+
+{foreach from=$templates item=tpl}
+ {fetch assign=content file=$tpl.filename}
+ SELECT @workflow_id := MAX(id) FROM civicrm_option_value WHERE name = '{$tpl.name}';
+ SELECT @content := msg_{$tpl.type} FROM civicrm_msg_template WHERE workflow_id = @workflow_id AND is_reserved = 1 LIMIT 1;
+ UPDATE civicrm_msg_template SET msg_{$tpl.type} = '{$content|escape:"quotes"}' WHERE workflow_id = @workflow_id AND (is_reserved = 1 OR (is_default = 1 AND msg_{$tpl.type} = @content));
+{/foreach}
diff --git a/civicrm/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_html.tpl b/civicrm/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_html.tpl
new file mode 100644
index 0000000000..278850b791
--- /dev/null
+++ b/civicrm/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_html.tpl
@@ -0,0 +1,528 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title></title>
+</head>
+<body>
+
+{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture}
+{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture}
+{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
+{capture assign=tdfirstStyle}style="width: 180px; padding-bottom: 15px;"{/capture}
+{capture assign=tdStyle}style="width: 100px;"{/capture}
+{capture assign=participantTotal}style="margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;"{/capture}
+
+
+<center>
+ <table width="700" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
+
+ <!-- BEGIN HEADER -->
+ <!-- You can add table row(s) here with logo or other header elements -->
+ <!-- END HEADER -->
+
+ <!-- BEGIN CONTENT -->
+
+ <tr>
+ <td>
+ <p>{contact.email_greeting},</p>
+
+ {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}
+ <p>{$event.confirm_email_text|htmlize}</p>
+
+ {else}
+ <p>{ts}Thank you for your participation.{/ts}
+ {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}
+ {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}.</p>
+
+ {/if}
+
+ <p>
+ {if $isOnWaitlist}
+ <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>
+ {if $isPrimary}
+ <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>
+ {/if}
+ {elseif $isRequireApproval}
+ <p>{ts}Your registration has been submitted.{/ts}</p>
+ {if $isPrimary}
+ <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>
+ {/if}
+ {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}
+ <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}
+ {else}
+ <p>{ts}Please print this confirmation for your records.{/ts}</p>
+ {/if}
+
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table width="700" style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
+ <tr>
+ <th {$headerStyle}>
+ {ts}Event Information and Location{/ts}
+ </th>
+ </tr>
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {$event.event_title}<br />
+ {$event.event_start_date|date_format:"%A"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:"%A"} {$event.event_end_date|crmDate}{/if}{/if}
+ </td>
+ </tr>
+
+
+ {if $conference_sessions}
+ <tr>
+ <td colspan="2" {$labelStyle}>
+ {ts}Your schedule:{/ts}
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {assign var='group_by_day' value='NA'}
+ {foreach from=$conference_sessions item=session}
+ {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"}
+ {assign var='group_by_day' value=$session.start_date}
+ <em>{$group_by_day|date_format:"%m/%d/%Y"}</em><br />
+ {/if}
+ {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />
+ {if $session.location} {$session.location}<br />{/if}
+ {/foreach}
+ </td>
+ </tr>
+ {/if}
+
+ {if $event.participant_role neq 'Attendee' and $defaultRole}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Participant Role{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$event.participant_role}
+ </td>
+ </tr>
+ {/if}
+
+ {if $isShowLocation}
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {if $location.address.1.name}
+ {$location.address.1.name}<br />
+ {/if}
+ {if $location.address.1.street_address}
+ {$location.address.1.street_address}<br />
+ {/if}
+ {if $location.address.1.supplemental_address_1}
+ {$location.address.1.supplemental_address_1}<br />
+ {/if}
+ {if $location.address.1.supplemental_address_2}
+ {$location.address.1.supplemental_address_2}<br />
+ {/if}
+ {if $location.address.1.city}
+ {$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}<br />
+ {/if}
+ </td>
+ </tr>
+ {/if}
+
+ {if $location.phone.1.phone || $location.email.1.email}
+ <tr>
+ <td colspan="2" {$labelStyle}>
+ {ts}Event Contacts:{/ts}
+ </td>
+ </tr>
+ {foreach from=$location.phone item=phone}
+ {if $phone.phone}
+ <tr>
+ <td {$labelStyle}>
+ {if $phone.phone_type}
+ {$phone.phone_type_display}
+ {else}
+ {ts}Phone{/ts}
+ {/if}
+ </td>
+ <td {$valueStyle}>
+ {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}
+ </td>
+ </tr>
+ {/if}
+ {/foreach}
+ {foreach from=$location.email item=eventEmail}
+ {if $eventEmail.email}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Email{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$eventEmail.email}
+ </td>
+ </tr>
+ {/if}
+ {/foreach}
+ {/if}
+
+ {if $event.is_public}
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
+ <a href="{$icalFeed}">{ts}Download iCalendar File{/ts}</a>
+ </td>
+ </tr>
+ {/if}
+
+ {if $event.is_share}
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture}
+ {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl}
+ </td>
+ </tr>
+ {/if}
+ {if $payer.name}
+ <tr>
+ <th {$headerStyle}>
+ {ts}You were registered by:{/ts}
+ </th>
+ </tr>
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {$payer.name}
+ </td>
+ </tr>
+ {/if}
+ {if $event.is_monetary}
+
+ <tr>
+ <th {$headerStyle}>
+ {$event.fee_label}
+ </th>
+ </tr>
+
+ {if $lineItem}
+ {foreach from=$lineItem item=value key=priceset}
+ {if $value neq 'skip'}
+ {if $isPrimary}
+ {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}
+ <tr>
+ <td colspan="2" {$labelStyle}>
+ {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}
+ </td>
+ </tr>
+ {/if}
+ {/if}
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
+ <tr>
+ <th>{ts}Item{/ts}</th>
+ <th>{ts}Qty{/ts}</th>
+ <th>{ts}Each{/ts}</th>
+ {if $dataArray}
+ <th>{ts}SubTotal{/ts}</th>
+ <th>{ts}Tax Rate{/ts}</th>
+ <th>{ts}Tax Amount{/ts}</th>
+ {/if}
+ <th>{ts}Total{/ts}</th>
+ {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
+ </tr>
+ {foreach from=$value item=line}
+ <tr>
+ <td {$tdfirstStyle}>
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
+ </td>
+ <td {$tdStyle} align="middle">
+ {$line.qty}
+ </td>
+ <td {$tdStyle}>
+ {$line.unit_price|crmMoney:$currency}
+ </td>
+ {if $dataArray}
+ <td {$tdStyle}>
+ {$line.unit_price*$line.qty|crmMoney}
+ </td>
+ {if $line.tax_rate != "" || $line.tax_amount != ""}
+ <td {$tdStyle}>
+ {$line.tax_rate|string_format:"%.2f"}%
+ </td>
+ <td {$tdStyle}>
+ {$line.tax_amount|crmMoney}
+ </td>
+ {else}
+ <td></td>
+ <td></td>
+ {/if}
+ {/if}
+ <td {$tdStyle}>
+ {$line.line_total+$line.tax_amount|crmMoney:$currency}
+ </td>
+ {if $pricesetFieldsCount }<td {$tdStyle}>{$line.participant_count}</td> {/if}
+ </tr>
+ {/foreach}
+ {if $individual}
+ <tr {$participantTotal}>
+ <td colspan=3>{ts}Participant Total{/ts}</td>
+ <td colspan=2>{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}</td>
+ <td colspan=1>{$individual.$priceset.totalTaxAmt|crmMoney}</td>
+ <td colspan=2>{$individual.$priceset.totalAmtWithTax|crmMoney}</td>
+ </tr>
+ {/if}
+ </table>
+ </td>
+ </tr>
+ {/if}
+ {/foreach}
+ {if $dataArray}
+ <tr>
+ <td {$labelStyle}>
+ {ts} Amount Before Tax: {/ts}
+ </td>
+ <td {$valueStyle}>
+ {$totalAmount-$totalTaxAmount|crmMoney}
+ </td>
+ </tr>
+ {foreach from=$dataArray item=value key=priceset}
+ <tr>
+ {if $priceset || $priceset == 0}
+ <td> {$taxTerm} {$priceset|string_format:"%.2f"}%</td>
+ <td> {$value|crmMoney:$currency}</td>
+ {else}
+ <td> {ts}No{/ts} {$taxTerm}</td>
+ <td> {$value|crmMoney:$currency}</td>
+ {/if}
+ </tr>
+ {/foreach}
+ {/if}
+ {/if}
+
+ {if $amounts && !$lineItem}
+ {foreach from=$amounts item=amnt key=level}
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {$amnt.amount|crmMoney:$currency} {$amnt.label}
+ </td>
+ </tr>
+ {/foreach}
+ {/if}
+
+ {if $totalTaxAmount}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Total Tax Amount{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$totalTaxAmount|crmMoney:$currency}
+ </td>
+ </tr>
+ {/if}
+ {if $isPrimary}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Total Amount{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}
+ </td>
+ </tr>
+ {if $pricesetFieldsCount }
+ <tr>
+ <td {$labelStyle}>
+ {ts}Total Participants{/ts}</td>
+ <td {$valueStyle}>
+ {assign var="count" value= 0}
+ {foreach from=$lineItem item=pcount}
+ {assign var="lineItemCount" value=0}
+ {if $pcount neq 'skip'}
+ {foreach from=$pcount item=p_count}
+ {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count}
+ {/foreach}
+ {if $lineItemCount < 1 }
+ {assign var="lineItemCount" value=1}
+ {/if}
+ {assign var="count" value=$count+$lineItemCount}
+ {/if}
+ {/foreach}
+ {$count}
+ </td> </tr>
+ {/if}
+
+ {if $register_date}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Registration Date{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$register_date|crmDate}
+ </td>
+ </tr>
+ {/if}
+
+ {if $receive_date}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Transaction Date{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$receive_date|crmDate}
+ </td>
+ </tr>
+ {/if}
+
+ {if $financialTypeName}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Financial Type{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$financialTypeName}
+ </td>
+ </tr>
+ {/if}
+
+ {if $trxn_id}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Transaction #{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$trxn_id}
+ </td>
+ </tr>
+ {/if}
+
+ {if $paidBy}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Paid By{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$paidBy}
+ </td>
+ </tr>
+ {/if}
+
+ {if $checkNumber}
+ <tr>
+ <td {$labelStyle}>
+ {ts}Check Number{/ts}
+ </td>
+ <td {$valueStyle}>
+ {$checkNumber}
+ </td>
+ </tr>
+ {/if}
+
+ {if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval}
+ <tr>
+ <th {$headerStyle}>
+ {ts}Billing Name and Address{/ts}
+ </th>
+ </tr>
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {$billingName}<br />
+ {$address|nl2br}
+ </td>
+ </tr>
+ {/if}
+
+ {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval}
+ <tr>
+ <th {$headerStyle}>
+ {ts}Credit Card Information{/ts}
+ </th>
+ </tr>
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {$credit_card_type}<br />
+ {$credit_card_number}<br />
+ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+ </td>
+ </tr>
+ {/if}
+
+ {/if}
+
+ {/if} {* End of conditional section for Paid events *}
+
+
+{if $customPre}
+{foreach from=$customPre item=customPr key=i}
+ <tr> <th {$headerStyle}>{$customPre_grouptitle.$i}</th></tr>
+ {foreach from=$customPr item=customValue key=customName}
+ {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+ <tr>
+ <td {$labelStyle}>{$customName}</td>
+ <td {$valueStyle}>{$customValue}</td>
+ </tr>
+ {/if}
+ {/foreach}
+{/foreach}
+{/if}
+
+{if $customPost}
+{foreach from=$customPost item=customPos key=j}
+ <tr> <th {$headerStyle}>{$customPost_grouptitle.$j}</th></tr>
+ {foreach from=$customPos item=customValue key=customName}
+ {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+ <tr>
+ <td {$labelStyle}>{$customName}</td>
+ <td {$valueStyle}>{$customValue}</td>
+ </tr>
+{/if}
+{/foreach}
+{/foreach}
+{/if}
+
+{if $customProfile}
+{foreach from=$customProfile.profile item=eachParticipant key=participantID}
+ <tr><th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th></tr>
+ {foreach from=$eachParticipant item=eachProfile key=pid}
+ <tr><th {$headerStyle}>{$customProfile.title.$pid}</th></tr>
+ {foreach from=$eachProfile item=val key=field}
+ <tr>{foreach from=$val item=v key=f}
+ <td {$labelStyle}>{$field}</td>
+ <td {$valueStyle}>{$v}</td>
+ {/foreach}
+ </tr>
+ {/foreach}
+{/foreach}
+{/foreach}
+{/if}
+
+ {if $customGroup}
+ {foreach from=$customGroup item=value key=customName}
+ <tr>
+ <th {$headerStyle}>
+ {$customName}
+ </th>
+ </tr>
+ {foreach from=$value item=v key=n}
+ <tr>
+ <td {$labelStyle}>
+ {$n}
+ </td>
+ <td {$valueStyle}>
+ {$v}
+ </td>
+ </tr>
+ {/foreach}
+ {/foreach}
+ {/if}
+ </table>
+ {if $event.allow_selfcancelxfer }
+ <tr>
+ <td colspan="2" {$valueStyle}>
+ {ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />
+ {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture}
+ <a href="{$selfService}">{ts}Click here to transfer or cancel your registration.{/ts}</a>
+ </td>
+ </tr>
+ {/if}
+ </td>
+ </tr>
+ </table>
+</center>
+
+</body>
+</html>
diff --git a/civicrm/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_text.tpl b/civicrm/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_text.tpl
new file mode 100644
index 0000000000..d056a8c607
--- /dev/null
+++ b/civicrm/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_text.tpl
@@ -0,0 +1,314 @@
+{contact.email_greeting},
+
+{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}
+{$event.confirm_email_text}
+
+{else}
+ {ts}Thank you for your participation.{/ts}
+ {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to %1.{/ts}
+ {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}
+ {/if}.
+
+{/if}
+
+{if $isOnWaitlist}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{ts}You have been added to the WAIT LIST for this event.{/ts}
+
+{if $isPrimary}
+{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}
+{/if}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{elseif $isRequireApproval}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{ts}Your registration has been submitted.{/ts}
+
+{if $isPrimary}
+{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}
+
+{/if}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$pay_later_receipt}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{else}
+
+{ts}Please print this confirmation for your records.{/ts}
+{/if}
+
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{ts}Event Information and Location{/ts}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$event.event_title}
+{$event.event_start_date|date_format:"%A"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:"%A"} {$event.event_end_date|crmDate}{/if}{/if}
+{if $conference_sessions}
+
+
+{ts}Your schedule:{/ts}
+{assign var='group_by_day' value='NA'}
+{foreach from=$conference_sessions item=session}
+{if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"}
+{assign var='group_by_day' value=$session.start_date}
+
+{$group_by_day|date_format:"%m/%d/%Y"}
+
+
+{/if}
+{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}
+{if $session.location} {$session.location}{/if}
+{/foreach}
+{/if}
+
+{if $event.participant_role neq 'Attendee' and $defaultRole}
+{ts}Participant Role{/ts}: {$event.participant_role}
+{/if}
+
+{if $isShowLocation}
+{if $location.address.1.name}
+
+{$location.address.1.name}
+{/if}
+{if $location.address.1.street_address}{$location.address.1.street_address}
+{/if}
+{if $location.address.1.supplemental_address_1}{$location.address.1.supplemental_address_1}
+{/if}
+{if $location.address.1.supplemental_address_2}{$location.address.1.supplemental_address_2}
+{/if}
+{if $location.address.1.city}{$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
+{/if}
+
+{/if}{*End of isShowLocation condition*}
+
+{if $location.phone.1.phone || $location.email.1.email}
+
+{ts}Event Contacts:{/ts}
+{foreach from=$location.phone item=phone}
+{if $phone.phone}
+
+{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}
+{/foreach}
+{foreach from=$location.email item=eventEmail}
+{if $eventEmail.email}
+
+{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}
+{/if}
+
+{if $event.is_public}
+{capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
+{ts}Download iCalendar File:{/ts} {$icalFeed}
+{/if}
+
+{if $payer.name}
+You were registered by: {$payer.name}
+{/if}
+{if $event.is_monetary} {* This section for Paid events only.*}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$event.fee_label}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{if $lineItem}{foreach from=$lineItem item=value key=priceset}
+
+{if $value neq 'skip'}
+{if $isPrimary}
+{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}
+{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}
+
+{/if}
+{/if}
+-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}
+
+{capture assign=ts_item}{ts}Item{/ts}{/capture}
+{capture assign=ts_qty}{ts}Qty{/ts}{/capture}
+{capture assign=ts_each}{ts}Each{/ts}{/capture}
+{if $dataArray}
+{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}
+{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}
+{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}
+{/if}
+{capture assign=ts_total}{ts}Total{/ts}{/capture}
+{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if}
+{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"}
+-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}
+
+{foreach from=$value item=line}
+{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if}
+{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:$currency|string_format:"%10s"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"}{$ts_participant_count|string_format:"%10s"}
+{/foreach}
+----------------------------------------------------------------------------------------------------------------
+{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%29s"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%33s"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:"%12s"}{/if}
+{/if}
+{""|string_format:"%120s"}
+{/foreach}
+{""|string_format:"%120s"}
+
+{if $dataArray}
+{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}
+
+{foreach from=$dataArray item=value key=priceset}
+{if $priceset || $priceset == 0}
+{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency}
+{else}
+{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}
+{/if}
+{/foreach}
+{/if}
+{/if}
+
+{if $amounts && !$lineItem}
+{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label}
+{/foreach}
+{/if}
+
+{if $totalTaxAmount}
+{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}
+{/if}
+{if $isPrimary }
+
+{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}
+
+{if $pricesetFieldsCount }
+ {assign var="count" value= 0}
+ {foreach from=$lineItem item=pcount}
+ {assign var="lineItemCount" value=0}
+ {if $pcount neq 'skip'}
+ {foreach from=$pcount item=p_count}
+ {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count}
+ {/foreach}
+ {if $lineItemCount < 1 }
+ {assign var="lineItemCount" value=1}
+ {/if}
+ {assign var="count" value=$count+$lineItemCount}
+ {/if}
+ {/foreach}
+
+{ts}Total Participants{/ts}: {$count}
+{/if}
+
+{if $register_date}
+{ts}Registration Date{/ts}: {$register_date|crmDate}
+{/if}
+{if $receive_date}
+{ts}Transaction Date{/ts}: {$receive_date|crmDate}
+{/if}
+{if $financialTypeName}
+{ts}Financial Type{/ts}: {$financialTypeName}
+{/if}
+{if $trxn_id}
+{ts}Transaction #{/ts}: {$trxn_id}
+{/if}
+{if $paidBy}
+{ts}Paid By{/ts}: {$paidBy}
+{/if}
+{if $checkNumber}
+{ts}Check Number{/ts}: {$checkNumber}
+{/if}
+{if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{ts}Billing Name and Address{/ts}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$billingName}
+{$address}
+{/if}
+
+{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{ts}Credit Card Information{/ts}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$credit_card_type}
+{$credit_card_number}
+{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+{/if}
+{/if}
+{/if} {* End of conditional section for Paid events *}
+
+{if $customPre}
+{foreach from=$customPre item=customPr key=i}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$customPre_grouptitle.$i}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{foreach from=$customPr item=customValue key=customName}
+{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+ {$customName}: {$customValue}
+{/if}
+{/foreach}
+{/foreach}
+{/if}
+
+{if $customPost}
+{foreach from=$customPost item=customPos key=j}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$customPost_grouptitle.$j}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{foreach from=$customPos item=customValue key=customName}
+{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+ {$customName}: {$customValue}
+{/if}
+{/foreach}
+{/foreach}
+{/if}
+{if $customProfile}
+
+{foreach from=$customProfile.profile item=eachParticipant key=participantID}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{ts 1=$participantID+2}Participant Information - Participant %1{/ts}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{foreach from=$eachParticipant item=eachProfile key=pid}
+----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}
+
+{$customProfile.title.$pid}
+----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}
+
+{foreach from=$eachProfile item=val key=field}
+{foreach from=$val item=v key=f}
+{$field}: {$v}
+{/foreach}
+{/foreach}
+{/foreach}
+{/foreach}
+{/if}
+{if $customGroup}
+{foreach from=$customGroup item=value key=customName}
+=========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$customName}
+=========================================================={if $pricesetFieldsCount }===================={/if}
+
+{foreach from=$value item=v key=n}
+{$n}: {$v}
+{/foreach}
+{/foreach}
+{/if}
+
+{if $event.allow_selfcancelxfer }
+{ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}
+ {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture}
+{ts}Transfer or cancel your registration:{/ts} {$selfService}
+{/if}
diff --git a/civicrm/CRM/Upgrade/Controller.php b/civicrm/CRM/Upgrade/Controller.php
index 6e2674aca4..132991f136 100644
--- a/civicrm/CRM/Upgrade/Controller.php
+++ b/civicrm/CRM/Upgrade/Controller.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Form.php b/civicrm/CRM/Upgrade/Form.php
index e8519a0e3f..38e3b0205e 100644
--- a/civicrm/CRM/Upgrade/Form.php
+++ b/civicrm/CRM/Upgrade/Form.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Headless.php b/civicrm/CRM/Upgrade/Headless.php
index 953aa95059..d634b52c98 100644
--- a/civicrm/CRM/Upgrade/Headless.php
+++ b/civicrm/CRM/Upgrade/Headless.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Upgrade/Incremental/Base.php b/civicrm/CRM/Upgrade/Incremental/Base.php
index 858e1a5adc..562472c527 100644
--- a/civicrm/CRM/Upgrade/Incremental/Base.php
+++ b/civicrm/CRM/Upgrade/Incremental/Base.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7.alpha1 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Upgrade/Incremental/General.php b/civicrm/CRM/Upgrade/Incremental/General.php
index ad761d435e..b74c4794c6 100644
--- a/civicrm/CRM/Upgrade/Incremental/General.php
+++ b/civicrm/CRM/Upgrade/Incremental/General.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourFive.php b/civicrm/CRM/Upgrade/Incremental/php/FourFive.php
index d96b886385..4c6b5d341e 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourFive.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourFive.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourFour.php b/civicrm/CRM/Upgrade/Incremental/php/FourFour.php
index 73399f6e67..08e0ea25f1 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourFour.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourOne.php b/civicrm/CRM/Upgrade/Incremental/php/FourOne.php
index ae92660900..f222a287f3 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourOne.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourOne.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php b/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php
index 66221d929c..94ed0dfb1b 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -297,7 +297,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
// Add default position for Getting Started Dashlet ( left column)
$sql = "INSERT INTO `civicrm_dashboard_contact` (dashboard_id, contact_id, column_no, is_active)
SELECT (SELECT MAX(id) FROM `civicrm_dashboard`), contact_id, 0, IF (SUM(is_active) > 0, 1, 0)
-FROM `civicrm_dashboard_contact` WHERE 1 GROUP BY contact_id";
+FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_contact.contact_id = civicrm_contact.id GROUP BY contact_id";
CRM_Core_DAO::executeQuery($sql);
}
return TRUE;
@@ -552,6 +552,7 @@ FROM `civicrm_dashboard_contact` WHERE 1 GROUP BY contact_id";
'label' => ts('Contact Deleted by Merge'),
'description' => ts('Contact was merged into another contact'),
'is_active' => TRUE,
+ 'filter' => 1,
));
return TRUE;
}
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourSix.php b/civicrm/CRM/Upgrade/Incremental/php/FourSix.php
index de085ac4f0..8d59582d96 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourSix.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourSix.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7.alpha1 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourThree.php b/civicrm/CRM/Upgrade/Incremental/php/FourThree.php
index 4901e78420..289ace535e 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourThree.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourThree.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Upgrade/Incremental/php/FourTwo.php b/civicrm/CRM/Upgrade/Incremental/php/FourTwo.php
index 021f539773..f11c45b660 100644
--- a/civicrm/CRM/Upgrade/Incremental/php/FourTwo.php
+++ b/civicrm/CRM/Upgrade/Incremental/php/FourTwo.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
new file mode 100644
index 0000000000..acb2898c55
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
@@ -0,0 +1,74 @@
+{* file to handle db changes in 4.7.5 during upgrade *}
+{include file='../CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl'}
+
+-- Minor fix for CRM-16173, CRM-16831 - change labels, add separator, etc.
+SELECT @parent_id := id from `civicrm_navigation` where name = 'System Settings' AND domain_id = {$domainID};
+UPDATE `civicrm_navigation` SET `label` = 'Components' where `name` = 'Enable Components' and `parent_id` = @parent_id;
+
+UPDATE
+ `civicrm_navigation` AS nav1
+ JOIN `civicrm_navigation` AS nav2 ON
+ nav1.name = 'Connections'
+ AND nav2.name = 'Manage Extensions'
+ AND nav1.parent_id = @parent_id
+SET
+ nav1.weight = nav2.weight,
+ nav2.weight = nav1.weight,
+ nav2.has_separator = 1,
+ nav2.label = 'Extensions';
+
+-- CRM-18327 filter value missed on the contact deleted by merge activity --
+UPDATE civicrm_option_value ov
+LEFT JOIN civicrm_option_group og ON og.id = ov.option_group_id
+SET filter = 1
+WHERE ov.name = 'Contact Deleted by Merge' AND og.name = 'activity_type';
+
+-- CRM-18241 Change field length of civicrm_option_value.label from 255 to 512 --
+{if $multilingual}
+ {foreach from=$locales item=loc}
+ ALTER TABLE civicrm_option_value CHANGE label_{$loc} label_{$loc} varchar( 512 ) DEFAULT NULL ;
+ {/foreach}
+{else}
+ ALTER TABLE civicrm_option_value CHANGE label label varchar( 512 ) DEFAULT NULL ;
+{/if}
+
+-- CRM-18345: Don't delete mailing records when email address / phone is deleted
+ALTER TABLE `civicrm_mailing_event_queue`
+ DROP FOREIGN KEY `FK_civicrm_mailing_event_queue_email_id`;
+
+ALTER TABLE `civicrm_mailing_event_queue`
+ ADD CONSTRAINT `FK_civicrm_mailing_event_queue_email_id`
+ FOREIGN KEY (`email_id`)
+ REFERENCES `civicrm_email`(`id`)
+ ON DELETE SET NULL
+ ON UPDATE RESTRICT;
+
+ALTER TABLE `civicrm_mailing_event_queue`
+ DROP FOREIGN KEY `FK_civicrm_mailing_event_queue_phone_id`;
+
+ALTER TABLE `civicrm_mailing_event_queue`
+ ADD CONSTRAINT `FK_civicrm_mailing_event_queue_phone_id`
+ FOREIGN KEY (`phone_id`)
+ REFERENCES `civicrm_phone`(`id`)
+ ON DELETE SET NULL
+ ON UPDATE RESTRICT;
+
+ALTER TABLE `civicrm_mailing_recipients`
+ DROP FOREIGN KEY `FK_civicrm_mailing_recipients_email_id`;
+
+ALTER TABLE `civicrm_mailing_recipients`
+ ADD CONSTRAINT `FK_civicrm_mailing_recipients_email_id`
+ FOREIGN KEY (`email_id`)
+ REFERENCES `civicrm_email`(`id`)
+ ON DELETE SET NULL
+ ON UPDATE RESTRICT;
+
+ALTER TABLE `civicrm_mailing_recipients`
+ DROP FOREIGN KEY `FK_civicrm_mailing_recipients_phone_id`;
+
+ALTER TABLE `civicrm_mailing_recipients`
+ ADD CONSTRAINT `FK_civicrm_mailing_recipients_phone_id`
+ FOREIGN KEY (`phone_id`)
+ REFERENCES `civicrm_phone`(`id`)
+ ON DELETE SET NULL
+ ON UPDATE RESTRICT;
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/4.7.6.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/4.7.6.mysql.tpl
new file mode 100644
index 0000000000..f29916faf9
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/4.7.6.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 4.7.6 during upgrade *}
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/README.txt b/civicrm/CRM/Upgrade/Incremental/sql/README.txt
index 29af38a415..18ee445b00 100644
--- a/civicrm/CRM/Upgrade/Incremental/sql/README.txt
+++ b/civicrm/CRM/Upgrade/Incremental/sql/README.txt
@@ -1,7 +1,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Upgrade/Page/Cleanup.php b/civicrm/CRM/Upgrade/Page/Cleanup.php
index ecb1c2a693..1460809550 100644
--- a/civicrm/CRM/Upgrade/Page/Cleanup.php
+++ b/civicrm/CRM/Upgrade/Page/Cleanup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Upgrade/Page/Upgrade.php b/civicrm/CRM/Upgrade/Page/Upgrade.php
index 61e1ae1311..0ff2536164 100644
--- a/civicrm/CRM/Upgrade/Page/Upgrade.php
+++ b/civicrm/CRM/Upgrade/Page/Upgrade.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page {
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php
index 11cc7234ee..e397f0c8e7 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php
index c022d3c08f..aaba3a8ec8 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php
index 66b8d444a7..b83b15d94f 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php
index dedae1bb73..cfa32b7e2f 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php
index 51c1ae45f9..a5adbf2aa7 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php
index 90807e0a97..410af2823d 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php
index a6767500da..d731e5dfae 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php
index 786feb9319..20d41846ac 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php
index 7cf6624dcd..eb14c613a1 100644
--- a/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php
+++ b/civicrm/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Upgrade/StateMachine.php b/civicrm/CRM/Upgrade/StateMachine.php
index d344b14b81..136deb9c90 100644
--- a/civicrm/CRM/Upgrade/StateMachine.php
+++ b/civicrm/CRM/Upgrade/StateMachine.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/API/AbstractFieldCoder.php b/civicrm/CRM/Utils/API/AbstractFieldCoder.php
index 7fd5850516..d6e3012ce8 100644
--- a/civicrm/CRM/Utils/API/AbstractFieldCoder.php
+++ b/civicrm/CRM/Utils/API/AbstractFieldCoder.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* of all fields (except for some black-listed skip-fields).
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'api/Wrapper.php';
diff --git a/civicrm/CRM/Utils/API/HTMLInputCoder.php b/civicrm/CRM/Utils/API/HTMLInputCoder.php
index 9baf083224..cfb7735f9b 100644
--- a/civicrm/CRM/Utils/API/HTMLInputCoder.php
+++ b/civicrm/CRM/Utils/API/HTMLInputCoder.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -35,7 +35,7 @@
* escaping scheme and consequently remove HTMLInputCoder.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_API_HTMLInputCoder extends CRM_Utils_API_AbstractFieldCoder {
private $skipFields = NULL;
diff --git a/civicrm/CRM/Utils/API/MatchOption.php b/civicrm/CRM/Utils/API/MatchOption.php
index 790f42a214..dafb4bd580 100644
--- a/civicrm/CRM/Utils/API/MatchOption.php
+++ b/civicrm/CRM/Utils/API/MatchOption.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -49,7 +49,7 @@
* @endcode
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'api/Wrapper.php';
diff --git a/civicrm/CRM/Utils/API/NullOutputCoder.php b/civicrm/CRM/Utils/API/NullOutputCoder.php
index 77931c310f..73eb44aa9b 100644
--- a/civicrm/CRM/Utils/API/NullOutputCoder.php
+++ b/civicrm/CRM/Utils/API/NullOutputCoder.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* when the actual value is NULL or "". Rewrite the output.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'api/Wrapper.php';
diff --git a/civicrm/CRM/Utils/API/ReloadOption.php b/civicrm/CRM/Utils/API/ReloadOption.php
index 08be146d70..d75e64ae5b 100644
--- a/civicrm/CRM/Utils/API/ReloadOption.php
+++ b/civicrm/CRM/Utils/API/ReloadOption.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -38,7 +38,7 @@
* @endcode
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'api/Wrapper.php';
diff --git a/civicrm/CRM/Utils/Address.php b/civicrm/CRM/Utils/Address.php
index 62c7a31b49..45a100bde4 100644
--- a/civicrm/CRM/Utils/Address.php
+++ b/civicrm/CRM/Utils/Address.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Address Utilities
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Address {
diff --git a/civicrm/CRM/Utils/Address/BatchUpdate.php b/civicrm/CRM/Utils/Address/BatchUpdate.php
index 0034e9ee55..1ec54ae8f9 100644
--- a/civicrm/CRM/Utils/Address/BatchUpdate.php
+++ b/civicrm/CRM/Utils/Address/BatchUpdate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Address/USPS.php b/civicrm/CRM/Utils/Address/USPS.php
index 2f26dd8f9c..3900e13e5d 100644
--- a/civicrm/CRM/Utils/Address/USPS.php
+++ b/civicrm/CRM/Utils/Address/USPS.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Array.php b/civicrm/CRM/Utils/Array.php
index 0ac816af05..b342b3f6ff 100644
--- a/civicrm/CRM/Utils/Array.php
+++ b/civicrm/CRM/Utils/Array.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Provides a collection of static methods for array manipulation.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Array {
diff --git a/civicrm/CRM/Utils/AutoClean.php b/civicrm/CRM/Utils/AutoClean.php
index 0e8c7967f3..a0790e77e5 100644
--- a/civicrm/CRM/Utils/AutoClean.php
+++ b/civicrm/CRM/Utils/AutoClean.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Cache.php b/civicrm/CRM/Utils/Cache.php
index ff40e8ad8f..8c04a9e81a 100644
--- a/civicrm/CRM/Utils/Cache.php
+++ b/civicrm/CRM/Utils/Cache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Cache/APCcache.php b/civicrm/CRM/Utils/Cache/APCcache.php
index afad7929e2..801e3f220a 100644
--- a/civicrm/CRM/Utils/Cache/APCcache.php
+++ b/civicrm/CRM/Utils/Cache/APCcache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Cache_APCcache implements CRM_Utils_Cache_Interface {
const DEFAULT_TIMEOUT = 3600;
diff --git a/civicrm/CRM/Utils/Cache/ArrayCache.php b/civicrm/CRM/Utils/Cache/ArrayCache.php
index 6f1815db55..95ac6d2481 100644
--- a/civicrm/CRM/Utils/Cache/ArrayCache.php
+++ b/civicrm/CRM/Utils/Cache/ArrayCache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Cache/Interface.php b/civicrm/CRM/Utils/Cache/Interface.php
index f702114bf8..22de0c61bd 100644
--- a/civicrm/CRM/Utils/Cache/Interface.php
+++ b/civicrm/CRM/Utils/Cache/Interface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*
* CRM_Utils_Cache_Interface
*
diff --git a/civicrm/CRM/Utils/Cache/Memcache.php b/civicrm/CRM/Utils/Cache/Memcache.php
index 3c35c247cb..c1722fa056 100644
--- a/civicrm/CRM/Utils/Cache/Memcache.php
+++ b/civicrm/CRM/Utils/Cache/Memcache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Cache_Memcache implements CRM_Utils_Cache_Interface {
const DEFAULT_HOST = 'localhost';
diff --git a/civicrm/CRM/Utils/Cache/Memcached.php b/civicrm/CRM/Utils/Cache/Memcached.php
index 33c16d6123..c794b7d8db 100644
--- a/civicrm/CRM/Utils/Cache/Memcached.php
+++ b/civicrm/CRM/Utils/Cache/Memcached.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Cache_Memcached implements CRM_Utils_Cache_Interface {
const DEFAULT_HOST = 'localhost';
diff --git a/civicrm/CRM/Utils/Cache/NoCache.php b/civicrm/CRM/Utils/Cache/NoCache.php
index c7cda8a8d6..fa5908a148 100644
--- a/civicrm/CRM/Utils/Cache/NoCache.php
+++ b/civicrm/CRM/Utils/Cache/NoCache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Cache_NoCache implements CRM_Utils_Cache_Interface {
diff --git a/civicrm/CRM/Utils/Cache/Redis.php b/civicrm/CRM/Utils/Cache/Redis.php
index 12a4b357be..ac6434cca1 100644
--- a/civicrm/CRM/Utils/Cache/Redis.php
+++ b/civicrm/CRM/Utils/Cache/Redis.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Utils/Cache/SerializeCache.php b/civicrm/CRM/Utils/Cache/SerializeCache.php
index 36d7a08670..08db03cf20 100644
--- a/civicrm/CRM/Utils/Cache/SerializeCache.php
+++ b/civicrm/CRM/Utils/Cache/SerializeCache.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Cache/SqlGroup.php b/civicrm/CRM/Utils/Cache/SqlGroup.php
index 25ce940bda..632bb8a468 100644
--- a/civicrm/CRM/Utils/Cache/SqlGroup.php
+++ b/civicrm/CRM/Utils/Cache/SqlGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Check.php b/civicrm/CRM/Utils/Check.php
index f2a40b7657..1ea40eacd9 100644
--- a/civicrm/CRM/Utils/Check.php
+++ b/civicrm/CRM/Utils/Check.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Check {
// How often to run checks and notify admins about issues.
diff --git a/civicrm/CRM/Utils/Check/Component.php b/civicrm/CRM/Utils/Check/Component.php
index fe05ee2507..d3cbaacfb8 100644
--- a/civicrm/CRM/Utils/Check/Component.php
+++ b/civicrm/CRM/Utils/Check/Component.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
abstract class CRM_Utils_Check_Component {
@@ -56,4 +56,5 @@ abstract class CRM_Utils_Check_Component {
}
return $messages;
}
-}
\ No newline at end of file
+
+}
diff --git a/civicrm/CRM/Utils/Check/Component/Case.php b/civicrm/CRM/Utils/Check/Component/Case.php
index e3da6d1501..3221fa2167 100644
--- a/civicrm/CRM/Utils/Check/Component/Case.php
+++ b/civicrm/CRM/Utils/Check/Component/Case.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Check_Component_Case extends CRM_Utils_Check_Component {
@@ -43,8 +43,7 @@ class CRM_Utils_Check_Component_Case extends CRM_Utils_Check_Component {
protected $caseTypeNames;
/**
- * @param CRM_Case_XMLRepository $xmlRepo
- * @param array <string> $caseTypeNames
+ * Class constructor.
*/
public function __construct() {
$this->caseTypeNames = CRM_Case_PseudoConstant::caseType('name');
diff --git a/civicrm/CRM/Utils/Check/Component/Env.php b/civicrm/CRM/Utils/Check/Component/Env.php
index 05855f6110..48f88870f0 100644
--- a/civicrm/CRM/Utils/Check/Component/Env.php
+++ b/civicrm/CRM/Utils/Check/Component/Env.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Check_Component_Env extends CRM_Utils_Check_Component {
diff --git a/civicrm/CRM/Utils/Check/Component/Security.php b/civicrm/CRM/Utils/Check/Component/Security.php
index 3d2e37ec5e..19e7f66183 100644
--- a/civicrm/CRM/Utils/Check/Component/Security.php
+++ b/civicrm/CRM/Utils/Check/Component/Security.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Check_Component_Security extends CRM_Utils_Check_Component {
diff --git a/civicrm/CRM/Utils/Check/Message.php b/civicrm/CRM/Utils/Check/Message.php
index 140c1b9b76..ff29ec1a6c 100644
--- a/civicrm/CRM/Utils/Check/Message.php
+++ b/civicrm/CRM/Utils/Check/Message.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Check_Message {
/**
diff --git a/civicrm/CRM/Utils/Constant.php b/civicrm/CRM/Utils/Constant.php
index e6857b6e75..3cfebecb20 100644
--- a/civicrm/CRM/Utils/Constant.php
+++ b/civicrm/CRM/Utils/Constant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Crypt.php b/civicrm/CRM/Utils/Crypt.php
index 634b0d4ca1..a4e3ad13d9 100644
--- a/civicrm/CRM/Utils/Crypt.php
+++ b/civicrm/CRM/Utils/Crypt.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Crypt {
diff --git a/civicrm/CRM/Utils/Date.php b/civicrm/CRM/Utils/Date.php
index 892ad15fb8..fbf073ab9f 100644
--- a/civicrm/CRM/Utils/Date.php
+++ b/civicrm/CRM/Utils/Date.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/DeprecatedUtils.php b/civicrm/CRM/Utils/DeprecatedUtils.php
index ce2002e812..93f9b37829 100644
--- a/civicrm/CRM/Utils/DeprecatedUtils.php
+++ b/civicrm/CRM/Utils/DeprecatedUtils.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/*
diff --git a/civicrm/CRM/Utils/FakeObject.php b/civicrm/CRM/Utils/FakeObject.php
index aa30cb70da..c80ac830b6 100644
--- a/civicrm/CRM/Utils/FakeObject.php
+++ b/civicrm/CRM/Utils/FakeObject.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/File.php b/civicrm/CRM/Utils/File.php
index 283b6467fb..686c7dcd95 100644
--- a/civicrm/CRM/Utils/File.php
+++ b/civicrm/CRM/Utils/File.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Geocode.php b/civicrm/CRM/Utils/Geocode.php
index 38472994d6..83c38bb6d9 100644
--- a/civicrm/CRM/Utils/Geocode.php
+++ b/civicrm/CRM/Utils/Geocode.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Geocode/Google.php b/civicrm/CRM/Utils/Geocode/Google.php
index 21335710b9..a35314d45f 100644
--- a/civicrm/CRM/Utils/Geocode/Google.php
+++ b/civicrm/CRM/Utils/Geocode/Google.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Geocode/Yahoo.php b/civicrm/CRM/Utils/Geocode/Yahoo.php
index 1010c40bb0..d5f8b68174 100644
--- a/civicrm/CRM/Utils/Geocode/Yahoo.php
+++ b/civicrm/CRM/Utils/Geocode/Yahoo.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/GlobalStack.php b/civicrm/CRM/Utils/GlobalStack.php
index e718b5a43c..8939256772 100644
--- a/civicrm/CRM/Utils/GlobalStack.php
+++ b/civicrm/CRM/Utils/GlobalStack.php
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Hook.php b/civicrm/CRM/Utils/Hook.php
index 243f04d430..4b3770b6cd 100644
--- a/civicrm/CRM/Utils/Hook.php
+++ b/civicrm/CRM/Utils/Hook.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
abstract class CRM_Utils_Hook {
@@ -2095,4 +2095,15 @@ abstract class CRM_Utils_Hook {
);
}
+ /**
+ * This hook is called for bypass a few civicrm urls from IDS check
+ * @param array $skip list of civicrm url;
+ */
+ public static function idsException(&$skip) {
+ return self::singleton()->invoke(1, $skip, self::$_nullObject,
+ self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+ 'civicrm_idsException'
+ );
+ }
+
}
diff --git a/civicrm/CRM/Utils/Hook/Backdrop.php b/civicrm/CRM/Utils/Hook/Backdrop.php
index 050cd9a364..0e6bcacf82 100644
--- a/civicrm/CRM/Utils/Hook/Backdrop.php
+++ b/civicrm/CRM/Utils/Hook/Backdrop.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Hook_Backdrop extends CRM_Utils_Hook_DrupalBase {
diff --git a/civicrm/CRM/Utils/Hook/Drupal.php b/civicrm/CRM/Utils/Hook/Drupal.php
index 4e2e01f390..6f969d6200 100644
--- a/civicrm/CRM/Utils/Hook/Drupal.php
+++ b/civicrm/CRM/Utils/Hook/Drupal.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Hook_Drupal extends CRM_Utils_Hook_DrupalBase {
diff --git a/civicrm/CRM/Utils/Hook/Drupal6.php b/civicrm/CRM/Utils/Hook/Drupal6.php
index 13b573baca..45ef927bf9 100644
--- a/civicrm/CRM/Utils/Hook/Drupal6.php
+++ b/civicrm/CRM/Utils/Hook/Drupal6.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Hook_Drupal6 extends CRM_Utils_Hook_DrupalBase {
}
diff --git a/civicrm/CRM/Utils/Hook/Drupal8.php b/civicrm/CRM/Utils/Hook/Drupal8.php
index ca6e8b397c..895e41913f 100644
--- a/civicrm/CRM/Utils/Hook/Drupal8.php
+++ b/civicrm/CRM/Utils/Hook/Drupal8.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Hook_Drupal8 extends CRM_Utils_Hook_DrupalBase {
diff --git a/civicrm/CRM/Utils/Hook/DrupalBase.php b/civicrm/CRM/Utils/Hook/DrupalBase.php
index be681e5758..dfb2de1488 100644
--- a/civicrm/CRM/Utils/Hook/DrupalBase.php
+++ b/civicrm/CRM/Utils/Hook/DrupalBase.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Hook_DrupalBase extends CRM_Utils_Hook {
diff --git a/civicrm/CRM/Utils/Hook/Joomla.php b/civicrm/CRM/Utils/Hook/Joomla.php
index 026715fcda..15ff5e4d3f 100644
--- a/civicrm/CRM/Utils/Hook/Joomla.php
+++ b/civicrm/CRM/Utils/Hook/Joomla.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Hook_Joomla extends CRM_Utils_Hook {
/**
diff --git a/civicrm/CRM/Utils/Hook/Soap.php b/civicrm/CRM/Utils/Hook/Soap.php
index 124e27be64..e8e5f02cd5 100644
--- a/civicrm/CRM/Utils/Hook/Soap.php
+++ b/civicrm/CRM/Utils/Hook/Soap.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Hook_Soap extends CRM_Utils_Hook {
/**
diff --git a/civicrm/CRM/Utils/Hook/UnitTests.php b/civicrm/CRM/Utils/Hook/UnitTests.php
index 5105476d04..5ee0392932 100644
--- a/civicrm/CRM/Utils/Hook/UnitTests.php
+++ b/civicrm/CRM/Utils/Hook/UnitTests.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook {
diff --git a/civicrm/CRM/Utils/Hook/WordPress.php b/civicrm/CRM/Utils/Hook/WordPress.php
index f92dcc8b7c..b99aa800c1 100644
--- a/civicrm/CRM/Utils/Hook/WordPress.php
+++ b/civicrm/CRM/Utils/Hook/WordPress.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Hook_WordPress extends CRM_Utils_Hook {
diff --git a/civicrm/CRM/Utils/Http.php b/civicrm/CRM/Utils/Http.php
index ec16188112..afc32dea08 100644
--- a/civicrm/CRM/Utils/Http.php
+++ b/civicrm/CRM/Utils/Http.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Http {
diff --git a/civicrm/CRM/Utils/HttpClient.php b/civicrm/CRM/Utils/HttpClient.php
index ee4cb5171f..dfa92e6dcc 100644
--- a/civicrm/CRM/Utils/HttpClient.php
+++ b/civicrm/CRM/Utils/HttpClient.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -34,7 +34,7 @@
* want to deal with that so late in the 4.3 dev cycle.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_HttpClient {
diff --git a/civicrm/CRM/Utils/ICalendar.php b/civicrm/CRM/Utils/ICalendar.php
index bae913ed9d..d765b80f84 100644
--- a/civicrm/CRM/Utils/ICalendar.php
+++ b/civicrm/CRM/Utils/ICalendar.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/JS.php b/civicrm/CRM/Utils/JS.php
index 4fd8d76e61..09c5a0457a 100644
--- a/civicrm/CRM/Utils/JS.php
+++ b/civicrm/CRM/Utils/JS.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Parse Javascript content and extract translatable strings.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_JS {
/**
diff --git a/civicrm/CRM/Utils/JSON.php b/civicrm/CRM/Utils/JSON.php
index 52a40c9988..254156dd85 100644
--- a/civicrm/CRM/Utils/JSON.php
+++ b/civicrm/CRM/Utils/JSON.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Mail.php b/civicrm/CRM/Utils/Mail.php
index c940eddaaf..57453a0ca5 100644
--- a/civicrm/CRM/Utils/Mail.php
+++ b/civicrm/CRM/Utils/Mail.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Mail {
@@ -155,14 +155,13 @@ class CRM_Utils_Mail {
* TRUE if a mail was sent, else FALSE.
*/
public static function send(&$params) {
- $returnPath = CRM_Core_BAO_MailSettings::defaultReturnPath();
+ $defaultReturnPath = CRM_Core_BAO_MailSettings::defaultReturnPath();
$includeMessageId = CRM_Core_BAO_MailSettings::includeMessageId();
$emailDomain = CRM_Core_BAO_MailSettings::defaultDomain();
$from = CRM_Utils_Array::value('from', $params);
- if (!$returnPath) {
- $returnPath = self::pluckEmailFromHeader($from);
+ if (!$defaultReturnPath) {
+ $defaultReturnPath = self::pluckEmailFromHeader($from);
}
- $params['returnPath'] = $returnPath;
// first call the mail alter hook
CRM_Utils_Hook::alterMailParams($params);
@@ -198,7 +197,7 @@ class CRM_Utils_Mail {
$headers['Content-Type'] = $htmlMessage ? 'multipart/mixed; charset=utf-8' : 'text/plain; charset=utf-8';
$headers['Content-Disposition'] = 'inline';
$headers['Content-Transfer-Encoding'] = '8bit';
- $headers['Return-Path'] = CRM_Utils_Array::value('returnPath', $params);
+ $headers['Return-Path'] = CRM_Utils_Array::value('returnPath', $params, $defaultReturnPath);
// CRM-11295: Omit reply-to headers if empty; this avoids issues with overzealous mailservers
$replyTo = CRM_Utils_Array::value('replyTo', $params, CRM_Utils_Array::value('from', $params));
diff --git a/civicrm/CRM/Utils/Mail/EmailProcessor.php b/civicrm/CRM/Utils/Mail/EmailProcessor.php
index b07cd689f8..933d7c1079 100644
--- a/civicrm/CRM/Utils/Mail/EmailProcessor.php
+++ b/civicrm/CRM/Utils/Mail/EmailProcessor.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
// we should consider moving these to the settings table
diff --git a/civicrm/CRM/Utils/Mail/Incoming.php b/civicrm/CRM/Utils/Mail/Incoming.php
index 6c536b8323..56a88aa5c4 100644
--- a/civicrm/CRM/Utils/Mail/Incoming.php
+++ b/civicrm/CRM/Utils/Mail/Incoming.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Mail_Incoming {
const
diff --git a/civicrm/CRM/Utils/Migrate/Export.php b/civicrm/CRM/Utils/Migrate/Export.php
index f2230d7adc..72c0e32ac9 100644
--- a/civicrm/CRM/Utils/Migrate/Export.php
+++ b/civicrm/CRM/Utils/Migrate/Export.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Migrate_Export {
diff --git a/civicrm/CRM/Utils/Migrate/ExportJSON.php b/civicrm/CRM/Utils/Migrate/ExportJSON.php
index 9f07954514..e97c069fd0 100644
--- a/civicrm/CRM/Utils/Migrate/ExportJSON.php
+++ b/civicrm/CRM/Utils/Migrate/ExportJSON.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Migrate_ExportJSON {
const CHUNK_SIZE = 128;
diff --git a/civicrm/CRM/Utils/Migrate/Import.php b/civicrm/CRM/Utils/Migrate/Import.php
index b4fe967d97..927f82385c 100644
--- a/civicrm/CRM/Utils/Migrate/Import.php
+++ b/civicrm/CRM/Utils/Migrate/Import.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Migrate_Import {
/**
diff --git a/civicrm/CRM/Utils/Migrate/ImportJSON.php b/civicrm/CRM/Utils/Migrate/ImportJSON.php
index ffaba2f85e..2aa2076369 100644
--- a/civicrm/CRM/Utils/Migrate/ImportJSON.php
+++ b/civicrm/CRM/Utils/Migrate/ImportJSON.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Migrate_ImportJSON {
diff --git a/civicrm/CRM/Utils/Money.php b/civicrm/CRM/Utils/Money.php
index 6064602454..a1a638b9e4 100644
--- a/civicrm/CRM/Utils/Money.php
+++ b/civicrm/CRM/Utils/Money.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Network.php b/civicrm/CRM/Utils/Network.php
index 2027df7e68..ae64fed7fc 100644
--- a/civicrm/CRM/Utils/Network.php
+++ b/civicrm/CRM/Utils/Network.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Number.php b/civicrm/CRM/Utils/Number.php
index 7eecb8cd01..24c016011e 100644
--- a/civicrm/CRM/Utils/Number.php
+++ b/civicrm/CRM/Utils/Number.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/OpenFlashChart.php b/civicrm/CRM/Utils/OpenFlashChart.php
index 1349902b4b..6e4f3c337a 100644
--- a/civicrm/CRM/Utils/OpenFlashChart.php
+++ b/civicrm/CRM/Utils/OpenFlashChart.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'packages/OpenFlashChart/php-ofc-library/open-flash-chart.php';
diff --git a/civicrm/CRM/Utils/OptionBag.php b/civicrm/CRM/Utils/OptionBag.php
index 5c296520da..0a3d26214c 100644
--- a/civicrm/CRM/Utils/OptionBag.php
+++ b/civicrm/CRM/Utils/OptionBag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/PDF/Label.php b/civicrm/CRM/Utils/PDF/Label.php
index 86e2b3f451..0795c8c797 100644
--- a/civicrm/CRM/Utils/PDF/Label.php
+++ b/civicrm/CRM/Utils/PDF/Label.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* functionality and smarts to the base PDF_Label.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/PDF/Utils.php b/civicrm/CRM/Utils/PDF/Utils.php
index 50419c6969..89752cd753 100644
--- a/civicrm/CRM/Utils/PDF/Utils.php
+++ b/civicrm/CRM/Utils/PDF/Utils.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -32,7 +32,7 @@ define('DOMPDF_ENABLE_AUTOLOAD', FALSE);
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_PDF_Utils {
diff --git a/civicrm/CRM/Utils/Pager.php b/civicrm/CRM/Utils/Pager.php
index 7b6d3c7133..ef8cb36360 100644
--- a/civicrm/CRM/Utils/Pager.php
+++ b/civicrm/CRM/Utils/Pager.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/PagerAToZ.php b/civicrm/CRM/Utils/PagerAToZ.php
index ca73afc944..b0269cec2a 100644
--- a/civicrm/CRM/Utils/PagerAToZ.php
+++ b/civicrm/CRM/Utils/PagerAToZ.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/PseudoConstant.php b/civicrm/CRM/Utils/PseudoConstant.php
index 9624239608..5681fc884c 100644
--- a/civicrm/CRM/Utils/PseudoConstant.php
+++ b/civicrm/CRM/Utils/PseudoConstant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -45,7 +45,7 @@ class CRM_Utils_PseudoConstant {
);
/**
- * @var array
+ * @var array
* ($name => $className)
*/
private static $constants = NULL;
diff --git a/civicrm/CRM/Utils/QueryFormatter.php b/civicrm/CRM/Utils/QueryFormatter.php
index fcd352cc66..bdbabea97e 100644
--- a/civicrm/CRM/Utils/QueryFormatter.php
+++ b/civicrm/CRM/Utils/QueryFormatter.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/REST.php b/civicrm/CRM/Utils/REST.php
index ca96341cf5..20a7657c18 100644
--- a/civicrm/CRM/Utils/REST.php
+++ b/civicrm/CRM/Utils/REST.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This class handles all REST client requests.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_REST {
diff --git a/civicrm/CRM/Utils/ReCAPTCHA.php b/civicrm/CRM/Utils/ReCAPTCHA.php
index ea6f66d309..bf4177f0fd 100644
--- a/civicrm/CRM/Utils/ReCAPTCHA.php
+++ b/civicrm/CRM/Utils/ReCAPTCHA.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_ReCAPTCHA {
diff --git a/civicrm/CRM/Utils/Recent.php b/civicrm/CRM/Utils/Recent.php
index 969e254d18..25de25889d 100644
--- a/civicrm/CRM/Utils/Recent.php
+++ b/civicrm/CRM/Utils/Recent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Request.php b/civicrm/CRM/Utils/Request.php
index 3d546bac7c..c08f10b99b 100644
--- a/civicrm/CRM/Utils/Request.php
+++ b/civicrm/CRM/Utils/Request.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Rule.php b/civicrm/CRM/Utils/Rule.php
index cc7dff3e1e..97153c51db 100644
--- a/civicrm/CRM/Utils/Rule.php
+++ b/civicrm/CRM/Utils/Rule.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'HTML/QuickForm/Rule/Email.php';
diff --git a/civicrm/CRM/Utils/SQL.php b/civicrm/CRM/Utils/SQL.php
index ed2db992ca..994c698bad 100644
--- a/civicrm/CRM/Utils/SQL.php
+++ b/civicrm/CRM/Utils/SQL.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* Just another collection of static utils functions.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_SQL {
diff --git a/civicrm/CRM/Utils/SQL/Select.php b/civicrm/CRM/Utils/SQL/Select.php
index 15e3df4803..000042776d 100644
--- a/civicrm/CRM/Utils/SQL/Select.php
+++ b/civicrm/CRM/Utils/SQL/Select.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -79,7 +79,7 @@
* @endcode
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_SQL_Select implements ArrayAccess {
@@ -125,6 +125,7 @@ class CRM_Utils_SQL_Select implements ArrayAccess {
private $limit = NULL;
private $offset = NULL;
private $params = array();
+ private $distinct = NULL;
// Public to work-around PHP 5.3 limit.
public $strict = NULL;
@@ -256,6 +257,19 @@ class CRM_Utils_SQL_Select implements ArrayAccess {
return $this;
}
+ /**
+ * Return only distinct values
+ *
+ * @param bool $isDistinct allow DISTINCT select or not
+ * @return CRM_Utils_SQL_Select
+ */
+ public function distinct($isDistinct = TRUE) {
+ if ($isDistinct) {
+ $this->distinct = 'DISTINCT ';
+ }
+ return $this;
+ }
+
/**
* Limit results by adding extra condition(s) to the WHERE clause
*
@@ -536,7 +550,7 @@ class CRM_Utils_SQL_Select implements ArrayAccess {
$sql .= ")\n";
}
if ($this->selects) {
- $sql .= 'SELECT ' . implode(', ', $this->selects) . "\n";
+ $sql .= 'SELECT ' . $this->distinct . implode(', ', $this->selects) . "\n";
}
else {
$sql .= 'SELECT *' . "\n";
diff --git a/civicrm/CRM/Utils/Signer.php b/civicrm/CRM/Utils/Signer.php
index 25c382af58..4569a6c8b6 100644
--- a/civicrm/CRM/Utils/Signer.php
+++ b/civicrm/CRM/Utils/Signer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/SoapServer.php b/civicrm/CRM/Utils/SoapServer.php
index ee3f10990f..223f8f014d 100644
--- a/civicrm/CRM/Utils/SoapServer.php
+++ b/civicrm/CRM/Utils/SoapServer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@
* This class handles all SOAP client requests.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_SoapServer {
diff --git a/civicrm/CRM/Utils/Sort.php b/civicrm/CRM/Utils/Sort.php
index 8ebc4289ee..1801f97a4e 100644
--- a/civicrm/CRM/Utils/Sort.php
+++ b/civicrm/CRM/Utils/Sort.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -35,7 +35,7 @@
* if introducing additional functionality
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Sort {
diff --git a/civicrm/CRM/Utils/String.php b/civicrm/CRM/Utils/String.php
index 6d598e792f..2fd10785e1 100644
--- a/civicrm/CRM/Utils/String.php
+++ b/civicrm/CRM/Utils/String.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
require_once 'HTML/QuickForm/Rule/Email.php';
diff --git a/civicrm/CRM/Utils/System.php b/civicrm/CRM/Utils/System.php
index 057545cb89..886fb2f5a5 100644
--- a/civicrm/CRM/Utils/System.php
+++ b/civicrm/CRM/Utils/System.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/System/Backdrop.php b/civicrm/CRM/Utils/System/Backdrop.php
index 960c07c7d5..f09017102e 100644
--- a/civicrm/CRM/Utils/System/Backdrop.php
+++ b/civicrm/CRM/Utils/System/Backdrop.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/System/Drupal.php b/civicrm/CRM/Utils/System/Drupal.php
index a9322f6942..8beb99405c 100644
--- a/civicrm/CRM/Utils/System/Drupal.php
+++ b/civicrm/CRM/Utils/System/Drupal.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -149,7 +149,7 @@ class CRM_Utils_System_Drupal extends CRM_Utils_System_DrupalBase {
array(':mail' => $params['mail'])
)->fetchField();
if ((bool) $uid) {
- $resetUrl = $config->userFrameworkBaseURL . 'user/password';
+ $resetUrl = url('user/password');
$errors[$emailName] = ts('The email address %1 already has an account associated with it. <a href="%2">Have you forgotten your password?</a>',
array(1 => $params['mail'], 2 => $resetUrl)
);
diff --git a/civicrm/CRM/Utils/System/Drupal6.php b/civicrm/CRM/Utils/System/Drupal6.php
index f94b8bea04..435e70b282 100644
--- a/civicrm/CRM/Utils/System/Drupal6.php
+++ b/civicrm/CRM/Utils/System/Drupal6.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/System/Drupal8.php b/civicrm/CRM/Utils/System/Drupal8.php
index 56085e95e6..a9892d0610 100644
--- a/civicrm/CRM/Utils/System/Drupal8.php
+++ b/civicrm/CRM/Utils/System/Drupal8.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/System/DrupalBase.php b/civicrm/CRM/Utils/System/DrupalBase.php
index 1d4e602393..3129073181 100644
--- a/civicrm/CRM/Utils/System/DrupalBase.php
+++ b/civicrm/CRM/Utils/System/DrupalBase.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -252,7 +252,7 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
'cms:view user account',
))
) {
- return CRM_Utils_System::url('user/' . $uid);
+ return url('user/' . $uid);
};
}
diff --git a/civicrm/CRM/Utils/System/Joomla.php b/civicrm/CRM/Utils/System/Joomla.php
index 0176be5bbc..14e6f6aa7e 100644
--- a/civicrm/CRM/Utils/System/Joomla.php
+++ b/civicrm/CRM/Utils/System/Joomla.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
@@ -677,6 +677,21 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base {
return $destination;
}
+ /**
+ * Determine the location of the CMS root.
+ *
+ * @return string|NULL
+ * local file system path to CMS root, or NULL if it cannot be determined
+ */
+ public function cmsRootPath() {
+ list($url, $siteName, $siteRoot) = $this->getDefaultSiteSettings();
+ $includePath = "$siteRoot/libraries/cms/version";
+ if (file_exists("$includePath/version.php")) {
+ return $siteRoot;
+ }
+ return NULL;
+ }
+
/**
* @inheritDoc
*/
diff --git a/civicrm/CRM/Utils/System/Soap.php b/civicrm/CRM/Utils/System/Soap.php
index d3b43a1e9a..9ec8040d5e 100644
--- a/civicrm/CRM/Utils/System/Soap.php
+++ b/civicrm/CRM/Utils/System/Soap.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/System/UnitTests.php b/civicrm/CRM/Utils/System/UnitTests.php
index 60dca10882..d6bfe2156a 100644
--- a/civicrm/CRM/Utils/System/UnitTests.php
+++ b/civicrm/CRM/Utils/System/UnitTests.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php
index 355b5bc535..1ec0c355f0 100644
--- a/civicrm/CRM/Utils/System/WordPress.php
+++ b/civicrm/CRM/Utils/System/WordPress.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/CRM/Utils/SystemLogger.php b/civicrm/CRM/Utils/SystemLogger.php
index bfcdfe949c..0dfabdecd4 100644
--- a/civicrm/CRM/Utils/SystemLogger.php
+++ b/civicrm/CRM/Utils/SystemLogger.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_SystemLogger extends Psr\Log\AbstractLogger implements \Psr\Log\LoggerInterface {
/**
diff --git a/civicrm/CRM/Utils/Time.php b/civicrm/CRM/Utils/Time.php
index 73e5dd39d4..6eeb20981e 100644
--- a/civicrm/CRM/Utils/Time.php
+++ b/civicrm/CRM/Utils/Time.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Token.php b/civicrm/CRM/Utils/Token.php
index 57ffda4119..63d6cbf823 100644
--- a/civicrm/CRM/Utils/Token.php
+++ b/civicrm/CRM/Utils/Token.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/CRM/Utils/Type.php b/civicrm/CRM/Utils/Type.php
index 5af0d01272..a7816f7dd2 100644
--- a/civicrm/CRM/Utils/Type.php
+++ b/civicrm/CRM/Utils/Type.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Type {
const
diff --git a/civicrm/CRM/Utils/Verp.php b/civicrm/CRM/Utils/Verp.php
index 0c77f2dd95..411b5869b1 100644
--- a/civicrm/CRM/Utils/Verp.php
+++ b/civicrm/CRM/Utils/Verp.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@
* headers.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Verp {
/* Mapping of reserved characters to hex codes */
diff --git a/civicrm/CRM/Utils/VersionCheck.php b/civicrm/CRM/Utils/VersionCheck.php
index 9b51ed6e94..0f965601fe 100644
--- a/civicrm/CRM/Utils/VersionCheck.php
+++ b/civicrm/CRM/Utils/VersionCheck.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_VersionCheck {
const
diff --git a/civicrm/CRM/Utils/Weight.php b/civicrm/CRM/Utils/Weight.php
index c5d01a6598..352b6616e2 100644
--- a/civicrm/CRM/Utils/Weight.php
+++ b/civicrm/CRM/Utils/Weight.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/CRM/Utils/Wrapper.php b/civicrm/CRM/Utils/Wrapper.php
index 29ace3332e..ae23d3dc6b 100644
--- a/civicrm/CRM/Utils/Wrapper.php
+++ b/civicrm/CRM/Utils/Wrapper.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -33,7 +33,7 @@
* run method as explained below.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_Wrapper {
diff --git a/civicrm/CRM/Utils/XML.php b/civicrm/CRM/Utils/XML.php
index c5fb7669ce..db56e511b0 100644
--- a/civicrm/CRM/Utils/XML.php
+++ b/civicrm/CRM/Utils/XML.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CRM_Utils_XML {
diff --git a/civicrm/CRM/Utils/Zip.php b/civicrm/CRM/Utils/Zip.php
index ad5ee42b98..522ae19a51 100644
--- a/civicrm/CRM/Utils/Zip.php
+++ b/civicrm/CRM/Utils/Zip.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/Civi/API/Event/AuthorizeEvent.php b/civicrm/Civi/API/Event/AuthorizeEvent.php
index 4cbad5a926..6fd92aa63d 100644
--- a/civicrm/Civi/API/Event/AuthorizeEvent.php
+++ b/civicrm/Civi/API/Event/AuthorizeEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Event/Event.php b/civicrm/Civi/API/Event/Event.php
index 36c09215b5..e9bcbe5024 100644
--- a/civicrm/Civi/API/Event/Event.php
+++ b/civicrm/Civi/API/Event/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Event/ExceptionEvent.php b/civicrm/Civi/API/Event/ExceptionEvent.php
index b6c20901fe..98c1de0e19 100644
--- a/civicrm/Civi/API/Event/ExceptionEvent.php
+++ b/civicrm/Civi/API/Event/ExceptionEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Event/PrepareEvent.php b/civicrm/Civi/API/Event/PrepareEvent.php
index a02072cca8..6f3157b892 100644
--- a/civicrm/Civi/API/Event/PrepareEvent.php
+++ b/civicrm/Civi/API/Event/PrepareEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Event/ResolveEvent.php b/civicrm/Civi/API/Event/ResolveEvent.php
index 6eac3ec84e..a16242fff0 100644
--- a/civicrm/Civi/API/Event/ResolveEvent.php
+++ b/civicrm/Civi/API/Event/ResolveEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Event/RespondEvent.php b/civicrm/Civi/API/Event/RespondEvent.php
index 47f66f48b3..f2d5832316 100644
--- a/civicrm/Civi/API/Event/RespondEvent.php
+++ b/civicrm/Civi/API/Event/RespondEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Events.php b/civicrm/Civi/API/Events.php
index 0b326097bf..aa8a81f37f 100644
--- a/civicrm/Civi/API/Events.php
+++ b/civicrm/Civi/API/Events.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Kernel.php b/civicrm/Civi/API/Kernel.php
index 9d85508e1b..dc2de659ff 100644
--- a/civicrm/Civi/API/Kernel.php
+++ b/civicrm/Civi/API/Kernel.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -35,7 +35,7 @@ use Civi\API\Provider\ProviderInterface;
/**
* @package Civi
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class Kernel {
diff --git a/civicrm/Civi/API/Provider/AdhocProvider.php b/civicrm/Civi/API/Provider/AdhocProvider.php
index 3664a17f20..f0644ba5f3 100644
--- a/civicrm/Civi/API/Provider/AdhocProvider.php
+++ b/civicrm/Civi/API/Provider/AdhocProvider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Provider/MagicFunctionProvider.php b/civicrm/Civi/API/Provider/MagicFunctionProvider.php
index 2dbe6679c1..9035bca91f 100644
--- a/civicrm/Civi/API/Provider/MagicFunctionProvider.php
+++ b/civicrm/Civi/API/Provider/MagicFunctionProvider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Provider/ProviderInterface.php b/civicrm/Civi/API/Provider/ProviderInterface.php
index 88717f2b85..6a25186d90 100644
--- a/civicrm/Civi/API/Provider/ProviderInterface.php
+++ b/civicrm/Civi/API/Provider/ProviderInterface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Provider/ReflectionProvider.php b/civicrm/Civi/API/Provider/ReflectionProvider.php
index aebc8057f2..00b1d7906e 100644
--- a/civicrm/Civi/API/Provider/ReflectionProvider.php
+++ b/civicrm/Civi/API/Provider/ReflectionProvider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Provider/StaticProvider.php b/civicrm/Civi/API/Provider/StaticProvider.php
index 0ae6e07f20..d6cd7a4fcb 100644
--- a/civicrm/Civi/API/Provider/StaticProvider.php
+++ b/civicrm/Civi/API/Provider/StaticProvider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Request.php b/civicrm/Civi/API/Request.php
index 0affb6ce49..86451eb162 100644
--- a/civicrm/Civi/API/Request.php
+++ b/civicrm/Civi/API/Request.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/SelectQuery.php b/civicrm/Civi/API/SelectQuery.php
index a31feff2a5..fe50234416 100644
--- a/civicrm/Civi/API/SelectQuery.php
+++ b/civicrm/Civi/API/SelectQuery.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Subscriber/APIv3SchemaAdapter.php b/civicrm/Civi/API/Subscriber/APIv3SchemaAdapter.php
index 969b05e2a6..263bb13f08 100644
--- a/civicrm/Civi/API/Subscriber/APIv3SchemaAdapter.php
+++ b/civicrm/Civi/API/Subscriber/APIv3SchemaAdapter.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Subscriber/ChainSubscriber.php b/civicrm/Civi/API/Subscriber/ChainSubscriber.php
index 46bea11877..dfe9176e04 100644
--- a/civicrm/Civi/API/Subscriber/ChainSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/ChainSubscriber.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php b/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
index 1d7a0dd383..8e7868b17c 100644
--- a/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
+++ b/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Subscriber/I18nSubscriber.php b/civicrm/Civi/API/Subscriber/I18nSubscriber.php
index 58d325ba73..11b72e9cec 100644
--- a/civicrm/Civi/API/Subscriber/I18nSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/I18nSubscriber.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Subscriber/PermissionCheck.php b/civicrm/Civi/API/Subscriber/PermissionCheck.php
index 2c806114bc..e36e9a6107 100644
--- a/civicrm/Civi/API/Subscriber/PermissionCheck.php
+++ b/civicrm/Civi/API/Subscriber/PermissionCheck.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Subscriber/TransactionSubscriber.php b/civicrm/Civi/API/Subscriber/TransactionSubscriber.php
index ee10ea1647..529146f514 100644
--- a/civicrm/Civi/API/Subscriber/TransactionSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/TransactionSubscriber.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Subscriber/WhitelistSubscriber.php b/civicrm/Civi/API/Subscriber/WhitelistSubscriber.php
index 09ada1a9c3..128fde9c4f 100644
--- a/civicrm/Civi/API/Subscriber/WhitelistSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/WhitelistSubscriber.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -38,7 +38,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
* whitelist, then it generates an error.
*
* @package Civi
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class WhitelistSubscriber implements EventSubscriberInterface {
diff --git a/civicrm/Civi/API/Subscriber/WrapperAdapter.php b/civicrm/Civi/API/Subscriber/WrapperAdapter.php
index ac32b6e214..fc939e1b02 100644
--- a/civicrm/Civi/API/Subscriber/WrapperAdapter.php
+++ b/civicrm/Civi/API/Subscriber/WrapperAdapter.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/Subscriber/XDebugSubscriber.php b/civicrm/Civi/API/Subscriber/XDebugSubscriber.php
index d0ac7fdc18..a80b37fcb6 100644
--- a/civicrm/Civi/API/Subscriber/XDebugSubscriber.php
+++ b/civicrm/Civi/API/Subscriber/XDebugSubscriber.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/API/WhitelistRule.php b/civicrm/Civi/API/WhitelistRule.php
index 57598b5e5c..1004825a9c 100644
--- a/civicrm/Civi/API/WhitelistRule.php
+++ b/civicrm/Civi/API/WhitelistRule.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/ActionSchedule/Mapping.php b/civicrm/Civi/ActionSchedule/Mapping.php
index de3ea72011..6fe50fb41c 100644
--- a/civicrm/Civi/ActionSchedule/Mapping.php
+++ b/civicrm/Civi/ActionSchedule/Mapping.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/ActionSchedule/MappingInterface.php b/civicrm/Civi/ActionSchedule/MappingInterface.php
index 4e4403efb4..54d28a3051 100644
--- a/civicrm/Civi/ActionSchedule/MappingInterface.php
+++ b/civicrm/Civi/ActionSchedule/MappingInterface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/ActionSchedule/RecipientBuilder.php b/civicrm/Civi/ActionSchedule/RecipientBuilder.php
index def2175fe3..450dcfe270 100644
--- a/civicrm/Civi/ActionSchedule/RecipientBuilder.php
+++ b/civicrm/Civi/ActionSchedule/RecipientBuilder.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -178,31 +178,57 @@ class RecipientBuilder {
$startDateClauses = $this->prepareStartDateClauses();
- $firstQuery = $query->copy()
- ->merge($this->selectIntoActionLog(self::PHASE_RELATION_FIRST, $query))
- ->merge($this->joinReminder('LEFT JOIN', 'rel', $query))
- ->where("reminder.id IS NULL")
- ->where($startDateClauses)
- ->strict()
- ->toSQL();
- \CRM_Core_DAO::executeQuery($firstQuery);
-
// In some cases reference_date got outdated due to many reason e.g. In Membership renewal end_date got extended
// which means reference date mismatches with the end_date where end_date may be used as the start_action_date
// criteria for some schedule reminder so in order to send new reminder we INSERT new reminder with new reference_date
// value via UNION operation
+ $referenceReminderIDs = array();
+ $referenceDate = NULL;
if (!empty($query['casUseReferenceDate'])) {
+ // First retrieve all the action log's ids which are outdated or in other words reference_date now don't match with entity date.
+ // And the retrieve the updated entity date which will later used below to update all other outdated action log records
+ $sql = $query->copy()
+ ->select('reminder.id as id')
+ ->select($query['casDateField'] . ' as reference_date')
+ ->merge($this->joinReminder('INNER JOIN', 'rel', $query))
+ ->where("reminder.id IS NOT NULL AND reminder.reference_date IS NOT NULL AND reminder.reference_date <> !casDateField")
+ ->where($startDateClauses)
+ ->orderBy("reminder.id desc")
+ ->strict()
+ ->toSQL();
+ $dao = \CRM_Core_DAO::executeQuery($sql);
+
+ while ($dao->fetch()) {
+ $referenceReminderIDs[] = $dao->id;
+ $referenceDate = $dao->reference_date;
+ }
+ }
+
+ if (empty($referenceReminderIDs)) {
+ $firstQuery = $query->copy()
+ ->merge($this->selectIntoActionLog(self::PHASE_RELATION_FIRST, $query))
+ ->merge($this->joinReminder('LEFT JOIN', 'rel', $query))
+ ->where("reminder.id IS NULL")
+ ->where($startDateClauses)
+ ->strict()
+ ->toSQL();
+ \CRM_Core_DAO::executeQuery($firstQuery);
+ }
+ else {
+ // INSERT new log to send reminder as desired entity date got updated
$referenceQuery = $query->copy()
->merge($this->selectIntoActionLog(self::PHASE_RELATION_FIRST, $query))
->merge($this->joinReminder('LEFT JOIN', 'rel', $query))
- ->where("reminder.id IS NOT NULL")
+ ->where("reminder.id = !reminderID")
->where($startDateClauses)
- ->where("reminder.action_date_time IS NOT NULL AND reminder.reference_date IS NOT NULL")
- ->groupBy("reminder.id, reminder.reference_date")
- ->having("reminder.id = MAX(reminder.id) AND reminder.reference_date <> !casDateField")
+ ->param('reminderID', $referenceReminderIDs[0])
->strict()
->toSQL();
\CRM_Core_DAO::executeQuery($referenceQuery);
+
+ // Update all the previous outdated reference date valued, action_log rows to the latest changed entity date
+ $updateQuery = "UPDATE civicrm_action_log SET reference_date = '" . $referenceDate . "' WHERE id IN (" . implode(', ', $referenceReminderIDs) . ")";
+ \CRM_Core_DAO::executeQuery($updateQuery);
}
}
diff --git a/civicrm/Civi/CCase/Analyzer.php b/civicrm/Civi/CCase/Analyzer.php
index 5ecf0fa9bc..607afed981 100644
--- a/civicrm/Civi/CCase/Analyzer.php
+++ b/civicrm/Civi/CCase/Analyzer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/CCase/CaseChangeListener.php b/civicrm/Civi/CCase/CaseChangeListener.php
index aa5d2086eb..65a4972f3e 100644
--- a/civicrm/Civi/CCase/CaseChangeListener.php
+++ b/civicrm/Civi/CCase/CaseChangeListener.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/CCase/Event/CaseChangeEvent.php b/civicrm/Civi/CCase/Event/CaseChangeEvent.php
index 7575d2b9f0..10f01063c0 100644
--- a/civicrm/Civi/CCase/Event/CaseChangeEvent.php
+++ b/civicrm/Civi/CCase/Event/CaseChangeEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/CCase/Events.php b/civicrm/Civi/CCase/Events.php
index 31b12caf14..8323c31d3e 100644
--- a/civicrm/Civi/CCase/Events.php
+++ b/civicrm/Civi/CCase/Events.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/CCase/SequenceListener.php b/civicrm/Civi/CCase/SequenceListener.php
index 5d40b49628..340076ca24 100644
--- a/civicrm/Civi/CCase/SequenceListener.php
+++ b/civicrm/Civi/CCase/SequenceListener.php
@@ -64,7 +64,15 @@ class SequenceListener implements CaseChangeListener {
}
}
- // OK, the activity has completed every step in the sequence!
+ //CRM-17452 - Close the case only if all the activities are complete
+ $activities = $analyzer->getActivities();
+ foreach ($activities as $activity) {
+ if ($activity['status_id'] != $actStatuses['Completed']) {
+ return;
+ }
+ }
+
+ // OK, the all activities have completed
civicrm_api3('Case', 'create', array(
'id' => $analyzer->getCaseId(),
'status_id' => 'Closed',
diff --git a/civicrm/Civi/Core/DAO/Event/PostDelete.php b/civicrm/Civi/Core/DAO/Event/PostDelete.php
index 5a1d915799..e9a4f3c5c1 100644
--- a/civicrm/Civi/Core/DAO/Event/PostDelete.php
+++ b/civicrm/Civi/Core/DAO/Event/PostDelete.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/DAO/Event/PostUpdate.php b/civicrm/Civi/Core/DAO/Event/PostUpdate.php
index 91617b06ac..690b223676 100644
--- a/civicrm/Civi/Core/DAO/Event/PostUpdate.php
+++ b/civicrm/Civi/Core/DAO/Event/PostUpdate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/DatabaseInitializer.php b/civicrm/Civi/Core/DatabaseInitializer.php
index 91ead0c6d4..ea9b29888e 100644
--- a/civicrm/Civi/Core/DatabaseInitializer.php
+++ b/civicrm/Civi/Core/DatabaseInitializer.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/Event/PostEvent.php b/civicrm/Civi/Core/Event/PostEvent.php
index 80ae41bbc4..e7253fe0db 100644
--- a/civicrm/Civi/Core/Event/PostEvent.php
+++ b/civicrm/Civi/Core/Event/PostEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/Event/PreEvent.php b/civicrm/Civi/Core/Event/PreEvent.php
index bb0b84014c..4c536c68bf 100644
--- a/civicrm/Civi/Core/Event/PreEvent.php
+++ b/civicrm/Civi/Core/Event/PreEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/Event/SystemInstallEvent.php b/civicrm/Civi/Core/Event/SystemInstallEvent.php
index 614b8e9a07..d1e41efe58 100644
--- a/civicrm/Civi/Core/Event/SystemInstallEvent.php
+++ b/civicrm/Civi/Core/Event/SystemInstallEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/Event/UnhandledExceptionEvent.php b/civicrm/Civi/Core/Event/UnhandledExceptionEvent.php
index 560a7ecc7c..2c7fb08c8f 100644
--- a/civicrm/Civi/Core/Event/UnhandledExceptionEvent.php
+++ b/civicrm/Civi/Core/Event/UnhandledExceptionEvent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/InstallationCanary.php b/civicrm/Civi/Core/InstallationCanary.php
index 007b89f10d..3fd967bcbd 100644
--- a/civicrm/Civi/Core/InstallationCanary.php
+++ b/civicrm/Civi/Core/InstallationCanary.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/Lock/LockInterface.php b/civicrm/Civi/Core/Lock/LockInterface.php
index 317e46b5e0..21def75830 100644
--- a/civicrm/Civi/Core/Lock/LockInterface.php
+++ b/civicrm/Civi/Core/Lock/LockInterface.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/Lock/LockManager.php b/civicrm/Civi/Core/Lock/LockManager.php
index 934c0bddb4..ec85be7c40 100644
--- a/civicrm/Civi/Core/Lock/LockManager.php
+++ b/civicrm/Civi/Core/Lock/LockManager.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/Lock/NullLock.php b/civicrm/Civi/Core/Lock/NullLock.php
index 8691a69a18..fad1ebfdce 100644
--- a/civicrm/Civi/Core/Lock/NullLock.php
+++ b/civicrm/Civi/Core/Lock/NullLock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -29,7 +29,7 @@ namespace Civi\Core\Lock;
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class NullLock implements LockInterface {
diff --git a/civicrm/Civi/Core/SettingsBag.php b/civicrm/Civi/Core/SettingsBag.php
index 14585e999a..f769dc3278 100644
--- a/civicrm/Civi/Core/SettingsBag.php
+++ b/civicrm/Civi/Core/SettingsBag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/SettingsManager.php b/civicrm/Civi/Core/SettingsManager.php
index a272329898..acbf79db27 100644
--- a/civicrm/Civi/Core/SettingsManager.php
+++ b/civicrm/Civi/Core/SettingsManager.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/SettingsMetadata.php b/civicrm/Civi/Core/SettingsMetadata.php
index c0b3806705..3afc37d266 100644
--- a/civicrm/Civi/Core/SettingsMetadata.php
+++ b/civicrm/Civi/Core/SettingsMetadata.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/Civi/Core/Transaction/Frame.php b/civicrm/Civi/Core/Transaction/Frame.php
index abf7297881..f3ad3fc4cf 100644
--- a/civicrm/Civi/Core/Transaction/Frame.php
+++ b/civicrm/Civi/Core/Transaction/Frame.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -33,7 +33,7 @@ namespace Civi\Core\Transaction;
* and any nested frames are SQL savepoints (SAVEPOINT foo/ROLLBACK TO SAVEPOINT).
*
* @package Civi
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class Frame {
diff --git a/civicrm/Civi/Core/Transaction/Manager.php b/civicrm/Civi/Core/Transaction/Manager.php
index 62acd9303a..773cf564c6 100644
--- a/civicrm/Civi/Core/Transaction/Manager.php
+++ b/civicrm/Civi/Core/Transaction/Manager.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -30,7 +30,7 @@ namespace Civi\Core\Transaction;
/**
*
* @package Civi
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class Manager {
diff --git a/civicrm/Civi/Token/AbstractTokenSubscriber.php b/civicrm/Civi/Token/AbstractTokenSubscriber.php
index 3566fdf453..a7d21f1344 100644
--- a/civicrm/Civi/Token/AbstractTokenSubscriber.php
+++ b/civicrm/Civi/Token/AbstractTokenSubscriber.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/ang/crmMailing/BodyHtml.html b/civicrm/ang/crmMailing/BodyHtml.html
index c8400c60bc..730beecdd8 100644
--- a/civicrm/ang/crmMailing/BodyHtml.html
+++ b/civicrm/ang/crmMailing/BodyHtml.html
@@ -14,6 +14,7 @@ Required vars: mailing
crm-ui-insert-rx="insert:body_html"
ng-model="mailing.body_html"
ng-blur="checkTokens(mailing, 'body_html', 'insert:body_html')"
+ class="crm-wysiwyg-fullpage"
></textarea>
<span ng-model="body_html_tokens" crm-ui-validate="hasAllTokens(mailing, 'body_html')"></span>
<div ng-show="htmlForm.$error.crmUiValidate" class="crmMailing-error-link">
diff --git a/civicrm/api/Exception.php b/civicrm/api/Exception.php
index 267c87fcdc..bba5e6e4f7 100644
--- a/civicrm/api/Exception.php
+++ b/civicrm/api/Exception.php
@@ -5,7 +5,7 @@
*
* @package CiviCRM_APIv3
*
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
diff --git a/civicrm/api/v3/Acl.php b/civicrm/api/v3/Acl.php
index 4b9372e0a6..f08b660de0 100644
--- a/civicrm/api/v3/Acl.php
+++ b/civicrm/api/v3/Acl.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/AclRole.php b/civicrm/api/v3/AclRole.php
index f602b4c5fa..7db1dc9d2d 100644
--- a/civicrm/api/v3/AclRole.php
+++ b/civicrm/api/v3/AclRole.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ActionSchedule.php b/civicrm/api/v3/ActionSchedule.php
index 56850865de..6f47d287e3 100644
--- a/civicrm/api/v3/ActionSchedule.php
+++ b/civicrm/api/v3/ActionSchedule.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Activity.php b/civicrm/api/v3/Activity.php
index 7ded326ec9..494772a98b 100644
--- a/civicrm/api/v3/Activity.php
+++ b/civicrm/api/v3/Activity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ActivityContact.php b/civicrm/api/v3/ActivityContact.php
index 468a844b7f..f15192f9e7 100644
--- a/civicrm/api/v3/ActivityContact.php
+++ b/civicrm/api/v3/ActivityContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ActivityType.php b/civicrm/api/v3/ActivityType.php
index ff5dafc942..f54c8bf9be 100644
--- a/civicrm/api/v3/ActivityType.php
+++ b/civicrm/api/v3/ActivityType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Address.php b/civicrm/api/v3/Address.php
index 452539c6a1..86feb4211f 100644
--- a/civicrm/api/v3/Address.php
+++ b/civicrm/api/v3/Address.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Attachment.php b/civicrm/api/v3/Attachment.php
index 1ae66b2651..fc9366fc24 100644
--- a/civicrm/api/v3/Attachment.php
+++ b/civicrm/api/v3/Attachment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Batch.php b/civicrm/api/v3/Batch.php
index f192d16f86..c72bb904cb 100644
--- a/civicrm/api/v3/Batch.php
+++ b/civicrm/api/v3/Batch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Campaign.php b/civicrm/api/v3/Campaign.php
index 5d86407361..5b55884f76 100644
--- a/civicrm/api/v3/Campaign.php
+++ b/civicrm/api/v3/Campaign.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Case.php b/civicrm/api/v3/Case.php
index 076f001a73..729fc6ee79 100644
--- a/civicrm/api/v3/Case.php
+++ b/civicrm/api/v3/Case.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/CaseContact.php b/civicrm/api/v3/CaseContact.php
index ef23871b60..0a2a854d0b 100644
--- a/civicrm/api/v3/CaseContact.php
+++ b/civicrm/api/v3/CaseContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/CaseType.php b/civicrm/api/v3/CaseType.php
index af0d9b7e5b..3598412fce 100644
--- a/civicrm/api/v3/CaseType.php
+++ b/civicrm/api/v3/CaseType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Constant.php b/civicrm/api/v3/Constant.php
index 2a79466a09..189885048a 100644
--- a/civicrm/api/v3/Constant.php
+++ b/civicrm/api/v3/Constant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Contact.php b/civicrm/api/v3/Contact.php
index 1fb51a2a73..fdab683d68 100644
--- a/civicrm/api/v3/Contact.php
+++ b/civicrm/api/v3/Contact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ContactType.php b/civicrm/api/v3/ContactType.php
index 2cb035b7d9..a7e0359fb0 100644
--- a/civicrm/api/v3/ContactType.php
+++ b/civicrm/api/v3/ContactType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Contribution.php b/civicrm/api/v3/Contribution.php
index 1ac600a5b6..19643950c9 100644
--- a/civicrm/api/v3/Contribution.php
+++ b/civicrm/api/v3/Contribution.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -48,16 +48,13 @@ function civicrm_api3_contribution_create(&$params) {
if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) {
if (empty($params['id'])) {
- $op = 'add';
+ $op = CRM_Core_Action::ADD;
}
else {
if (empty($params['financial_type_id'])) {
- $params['financial_type_id'] = civicrm_api3('Contribution', 'getvalue', array(
- 'id' => $params['id'],
- 'return' => 'financial_type_id',
- ));
+ $params['financial_type_id'] = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution', $params['id'], 'financial_type_id');
}
- $op = 'edit';
+ $op = CRM_Core_Action::UPDATE;
}
CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types, $op);
if (!in_array($params['financial_type_id'], array_keys($types))) {
diff --git a/civicrm/api/v3/ContributionPage.php b/civicrm/api/v3/ContributionPage.php
index f996be5bb6..cbf9096402 100644
--- a/civicrm/api/v3/ContributionPage.php
+++ b/civicrm/api/v3/ContributionPage.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ContributionProduct.php b/civicrm/api/v3/ContributionProduct.php
index a1598fad4b..fc2e510238 100644
--- a/civicrm/api/v3/ContributionProduct.php
+++ b/civicrm/api/v3/ContributionProduct.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ContributionRecur.php b/civicrm/api/v3/ContributionRecur.php
index b0969e7e74..1ffc60fd9a 100644
--- a/civicrm/api/v3/ContributionRecur.php
+++ b/civicrm/api/v3/ContributionRecur.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ContributionSoft.php b/civicrm/api/v3/ContributionSoft.php
index 5bcf1af6a6..3bfe307f2f 100644
--- a/civicrm/api/v3/ContributionSoft.php
+++ b/civicrm/api/v3/ContributionSoft.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Country.php b/civicrm/api/v3/Country.php
index 9071ed6aab..bfb4274654 100644
--- a/civicrm/api/v3/Country.php
+++ b/civicrm/api/v3/Country.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/CustomField.php b/civicrm/api/v3/CustomField.php
index 2cea880732..46aa39513a 100644
--- a/civicrm/api/v3/CustomField.php
+++ b/civicrm/api/v3/CustomField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/CustomGroup.php b/civicrm/api/v3/CustomGroup.php
index f2c3c44aaf..0a963cf58c 100644
--- a/civicrm/api/v3/CustomGroup.php
+++ b/civicrm/api/v3/CustomGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/CustomSearch.php b/civicrm/api/v3/CustomSearch.php
index 6e7abc288d..a7b59e70f9 100644
--- a/civicrm/api/v3/CustomSearch.php
+++ b/civicrm/api/v3/CustomSearch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/CustomValue.php b/civicrm/api/v3/CustomValue.php
index 6c7565234f..8f646a2067 100644
--- a/civicrm/api/v3/CustomValue.php
+++ b/civicrm/api/v3/CustomValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Cxn.php b/civicrm/api/v3/Cxn.php
index c080f70761..12b3914108 100644
--- a/civicrm/api/v3/Cxn.php
+++ b/civicrm/api/v3/Cxn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/CxnApp.php b/civicrm/api/v3/CxnApp.php
index 4e9a4989cd..cfd389299e 100644
--- a/civicrm/api/v3/CxnApp.php
+++ b/civicrm/api/v3/CxnApp.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Dashboard.php b/civicrm/api/v3/Dashboard.php
index 95a7327fd3..3593b541f4 100644
--- a/civicrm/api/v3/Dashboard.php
+++ b/civicrm/api/v3/Dashboard.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/DashboardContact.php b/civicrm/api/v3/DashboardContact.php
index d9a7660042..442eca0393 100644
--- a/civicrm/api/v3/DashboardContact.php
+++ b/civicrm/api/v3/DashboardContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Domain.php b/civicrm/api/v3/Domain.php
index 4dfcbd2265..6f3ca68dbe 100644
--- a/civicrm/api/v3/Domain.php
+++ b/civicrm/api/v3/Domain.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Email.php b/civicrm/api/v3/Email.php
index b9538437f0..9c4df9a99e 100644
--- a/civicrm/api/v3/Email.php
+++ b/civicrm/api/v3/Email.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/EntityBatch.php b/civicrm/api/v3/EntityBatch.php
index bcac0bb584..ae031defea 100644
--- a/civicrm/api/v3/EntityBatch.php
+++ b/civicrm/api/v3/EntityBatch.php
@@ -1,9 +1,9 @@
<?php
/*
--------------------------------------------------------------------
- | CiviCRM version 4.6 |
+ | CiviCRM version 4.7 |
--------------------------------------------------------------------
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
--------------------------------------------------------------------
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/EntityFinancialAccount.php b/civicrm/api/v3/EntityFinancialAccount.php
index 37f046c315..b8aaa521af 100644
--- a/civicrm/api/v3/EntityFinancialAccount.php
+++ b/civicrm/api/v3/EntityFinancialAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/EntityFinancialTrxn.php b/civicrm/api/v3/EntityFinancialTrxn.php
index d3da3bb07b..482ee71c7b 100644
--- a/civicrm/api/v3/EntityFinancialTrxn.php
+++ b/civicrm/api/v3/EntityFinancialTrxn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/EntityTag.php b/civicrm/api/v3/EntityTag.php
index 9d7c0bf395..459306298e 100644
--- a/civicrm/api/v3/EntityTag.php
+++ b/civicrm/api/v3/EntityTag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Event.php b/civicrm/api/v3/Event.php
index cfa9980143..d79674c48e 100644
--- a/civicrm/api/v3/Event.php
+++ b/civicrm/api/v3/Event.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Extension.php b/civicrm/api/v3/Extension.php
index 0d251289ac..183af02e36 100644
--- a/civicrm/api/v3/Extension.php
+++ b/civicrm/api/v3/Extension.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/File.php b/civicrm/api/v3/File.php
index cc9b35ed91..c98f7b71a7 100644
--- a/civicrm/api/v3/File.php
+++ b/civicrm/api/v3/File.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/FinancialAccount.php b/civicrm/api/v3/FinancialAccount.php
index 30e3fb0482..5f945faf7b 100644
--- a/civicrm/api/v3/FinancialAccount.php
+++ b/civicrm/api/v3/FinancialAccount.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/FinancialItem.php b/civicrm/api/v3/FinancialItem.php
index 6aadcc2da1..80560cc439 100644
--- a/civicrm/api/v3/FinancialItem.php
+++ b/civicrm/api/v3/FinancialItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/FinancialTrxn.php b/civicrm/api/v3/FinancialTrxn.php
index 84b76b6794..04e5bd87a0 100644
--- a/civicrm/api/v3/FinancialTrxn.php
+++ b/civicrm/api/v3/FinancialTrxn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/FinancialType.php b/civicrm/api/v3/FinancialType.php
index c302bab755..6d198fa6a2 100644
--- a/civicrm/api/v3/FinancialType.php
+++ b/civicrm/api/v3/FinancialType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Generic.php b/civicrm/api/v3/Generic.php
index 5a420895b7..60a5aedb4f 100644
--- a/civicrm/api/v3/Generic.php
+++ b/civicrm/api/v3/Generic.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Generic/Getactions.php b/civicrm/api/v3/Generic/Getactions.php
index 97e752f1ca..c779e0d93e 100644
--- a/civicrm/api/v3/Generic/Getactions.php
+++ b/civicrm/api/v3/Generic/Getactions.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Generic/Getlist.php b/civicrm/api/v3/Generic/Getlist.php
index 12aa202338..b9334989ce 100644
--- a/civicrm/api/v3/Generic/Getlist.php
+++ b/civicrm/api/v3/Generic/Getlist.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Generic/Setvalue.php b/civicrm/api/v3/Generic/Setvalue.php
index 1c0e19412c..ee53e093dd 100644
--- a/civicrm/api/v3/Generic/Setvalue.php
+++ b/civicrm/api/v3/Generic/Setvalue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Generic/Update.php b/civicrm/api/v3/Generic/Update.php
index 2426416420..1783225f70 100644
--- a/civicrm/api/v3/Generic/Update.php
+++ b/civicrm/api/v3/Generic/Update.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Grant.php b/civicrm/api/v3/Grant.php
index 3174e2415f..15fc110b7d 100644
--- a/civicrm/api/v3/Grant.php
+++ b/civicrm/api/v3/Grant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Group.php b/civicrm/api/v3/Group.php
index a752c672b1..c0e1188ea7 100644
--- a/civicrm/api/v3/Group.php
+++ b/civicrm/api/v3/Group.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/GroupContact.php b/civicrm/api/v3/GroupContact.php
index 308bb104f8..1546b692a9 100644
--- a/civicrm/api/v3/GroupContact.php
+++ b/civicrm/api/v3/GroupContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/GroupNesting.php b/civicrm/api/v3/GroupNesting.php
index 809df402e5..675fe6525f 100644
--- a/civicrm/api/v3/GroupNesting.php
+++ b/civicrm/api/v3/GroupNesting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/GroupOrganization.php b/civicrm/api/v3/GroupOrganization.php
index 607ffe1286..cd407b46a4 100644
--- a/civicrm/api/v3/GroupOrganization.php
+++ b/civicrm/api/v3/GroupOrganization.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Im.php b/civicrm/api/v3/Im.php
index c1afefbf53..5236700a22 100644
--- a/civicrm/api/v3/Im.php
+++ b/civicrm/api/v3/Im.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Job.php b/civicrm/api/v3/Job.php
index c68c9b9140..306f6de0aa 100644
--- a/civicrm/api/v3/Job.php
+++ b/civicrm/api/v3/Job.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/JobLog.php b/civicrm/api/v3/JobLog.php
index 058dbc3a5e..18d70cbdeb 100644
--- a/civicrm/api/v3/JobLog.php
+++ b/civicrm/api/v3/JobLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/LineItem.php b/civicrm/api/v3/LineItem.php
index 11f3017ea1..7c304e1899 100644
--- a/civicrm/api/v3/LineItem.php
+++ b/civicrm/api/v3/LineItem.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -75,6 +75,9 @@ function _civicrm_api3_line_item_create_spec(&$params) {
* Array of matching line_items
*/
function civicrm_api3_line_item_get($params) {
+ if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus() && CRM_Utils_Array::value('check_permissions', $params)) {
+ CRM_Price_BAO_LineItem::getAPILineItemParams($params);
+ }
return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
}
@@ -90,5 +93,14 @@ function civicrm_api3_line_item_get($params) {
* API result array
*/
function civicrm_api3_line_item_delete($params) {
+ if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus() && CRM_Utils_Array::value('check_permissions', $params)) {
+ CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types, CRM_Core_Action::DELETE);
+ if (empty($params['financial_type_id'])) {
+ $params['financial_type_id'] = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_LineItem', $params['id'], 'financial_type_id');
+ }
+ if (!in_array($params['financial_type_id'], array_keys($types))) {
+ throw new API_Exception('You do not have permission to delete this line item');
+ }
+ }
return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params);
}
diff --git a/civicrm/api/v3/LocBlock.php b/civicrm/api/v3/LocBlock.php
index 9316978c27..f547fd5a9b 100644
--- a/civicrm/api/v3/LocBlock.php
+++ b/civicrm/api/v3/LocBlock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/LocationType.php b/civicrm/api/v3/LocationType.php
index 71961a2f32..52377911ff 100644
--- a/civicrm/api/v3/LocationType.php
+++ b/civicrm/api/v3/LocationType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailSettings.php b/civicrm/api/v3/MailSettings.php
index ddfab17260..8604c0c709 100644
--- a/civicrm/api/v3/MailSettings.php
+++ b/civicrm/api/v3/MailSettings.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Mailing.php b/civicrm/api/v3/Mailing.php
index 6b7d164058..06ada98cba 100644
--- a/civicrm/api/v3/Mailing.php
+++ b/civicrm/api/v3/Mailing.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingAB.php b/civicrm/api/v3/MailingAB.php
index 6af253bab4..dfc139cc7e 100644
--- a/civicrm/api/v3/MailingAB.php
+++ b/civicrm/api/v3/MailingAB.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingComponent.php b/civicrm/api/v3/MailingComponent.php
index 82a6407a57..391f85aa36 100644
--- a/civicrm/api/v3/MailingComponent.php
+++ b/civicrm/api/v3/MailingComponent.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingContact.php b/civicrm/api/v3/MailingContact.php
index 58c3d93f1a..43eab41f3b 100644
--- a/civicrm/api/v3/MailingContact.php
+++ b/civicrm/api/v3/MailingContact.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingEventConfirm.php b/civicrm/api/v3/MailingEventConfirm.php
index 8d0afb9f42..3ea4ab13b3 100644
--- a/civicrm/api/v3/MailingEventConfirm.php
+++ b/civicrm/api/v3/MailingEventConfirm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingEventQueue.php b/civicrm/api/v3/MailingEventQueue.php
index e9dd875de3..8d47bab048 100644
--- a/civicrm/api/v3/MailingEventQueue.php
+++ b/civicrm/api/v3/MailingEventQueue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingEventResubscribe.php b/civicrm/api/v3/MailingEventResubscribe.php
index d7163b591d..c322072571 100644
--- a/civicrm/api/v3/MailingEventResubscribe.php
+++ b/civicrm/api/v3/MailingEventResubscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingEventSubscribe.php b/civicrm/api/v3/MailingEventSubscribe.php
index 76a30801a4..651d42abce 100644
--- a/civicrm/api/v3/MailingEventSubscribe.php
+++ b/civicrm/api/v3/MailingEventSubscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingEventUnsubscribe.php b/civicrm/api/v3/MailingEventUnsubscribe.php
index 28f093eee6..0fb9471840 100644
--- a/civicrm/api/v3/MailingEventUnsubscribe.php
+++ b/civicrm/api/v3/MailingEventUnsubscribe.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingGroup.php b/civicrm/api/v3/MailingGroup.php
index f567fb40eb..15cc1008e6 100644
--- a/civicrm/api/v3/MailingGroup.php
+++ b/civicrm/api/v3/MailingGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingJob.php b/civicrm/api/v3/MailingJob.php
index fa1dce476a..df6216444e 100644
--- a/civicrm/api/v3/MailingJob.php
+++ b/civicrm/api/v3/MailingJob.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MailingRecipients.php b/civicrm/api/v3/MailingRecipients.php
index b7a56d4c2a..6428191da4 100644
--- a/civicrm/api/v3/MailingRecipients.php
+++ b/civicrm/api/v3/MailingRecipients.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Mapping.php b/civicrm/api/v3/Mapping.php
index bce8eaa498..b66e2fac14 100644
--- a/civicrm/api/v3/Mapping.php
+++ b/civicrm/api/v3/Mapping.php
@@ -2,9 +2,9 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.6 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MappingField.php b/civicrm/api/v3/MappingField.php
index 50a88f4b30..696df49422 100644
--- a/civicrm/api/v3/MappingField.php
+++ b/civicrm/api/v3/MappingField.php
@@ -2,9 +2,9 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.6 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Membership.php b/civicrm/api/v3/Membership.php
index f69fd0eb84..7a60a5f0ba 100644
--- a/civicrm/api/v3/Membership.php
+++ b/civicrm/api/v3/Membership.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MembershipBlock.php b/civicrm/api/v3/MembershipBlock.php
index 75aa09d753..ace89dd211 100644
--- a/civicrm/api/v3/MembershipBlock.php
+++ b/civicrm/api/v3/MembershipBlock.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MembershipLog.php b/civicrm/api/v3/MembershipLog.php
index 681c533a4c..82dc114e07 100644
--- a/civicrm/api/v3/MembershipLog.php
+++ b/civicrm/api/v3/MembershipLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MembershipPayment.php b/civicrm/api/v3/MembershipPayment.php
index a271aaefaa..13e39c623b 100644
--- a/civicrm/api/v3/MembershipPayment.php
+++ b/civicrm/api/v3/MembershipPayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MembershipStatus.php b/civicrm/api/v3/MembershipStatus.php
index 3d36680a55..fd57834281 100644
--- a/civicrm/api/v3/MembershipStatus.php
+++ b/civicrm/api/v3/MembershipStatus.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MembershipType.php b/civicrm/api/v3/MembershipType.php
index 42d4f94001..fb29a18d7d 100644
--- a/civicrm/api/v3/MembershipType.php
+++ b/civicrm/api/v3/MembershipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/MessageTemplate.php b/civicrm/api/v3/MessageTemplate.php
index fdc5217e28..d9f5a2fc82 100644
--- a/civicrm/api/v3/MessageTemplate.php
+++ b/civicrm/api/v3/MessageTemplate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Navigation.php b/civicrm/api/v3/Navigation.php
index e920e81d22..1a3cfea15c 100644
--- a/civicrm/api/v3/Navigation.php
+++ b/civicrm/api/v3/Navigation.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Note.php b/civicrm/api/v3/Note.php
index 85922e056d..01f835699b 100644
--- a/civicrm/api/v3/Note.php
+++ b/civicrm/api/v3/Note.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/OpenID.php b/civicrm/api/v3/OpenID.php
index f5a22d776d..226d9fd3e4 100644
--- a/civicrm/api/v3/OpenID.php
+++ b/civicrm/api/v3/OpenID.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/OptionGroup.php b/civicrm/api/v3/OptionGroup.php
index b8ac7ef4cc..c40bc3fd38 100644
--- a/civicrm/api/v3/OptionGroup.php
+++ b/civicrm/api/v3/OptionGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/OptionValue.php b/civicrm/api/v3/OptionValue.php
index 6c51aa5405..e34f3ec28b 100644
--- a/civicrm/api/v3/OptionValue.php
+++ b/civicrm/api/v3/OptionValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Order.php b/civicrm/api/v3/Order.php
index 008a584189..aeb7106563 100644
--- a/civicrm/api/v3/Order.php
+++ b/civicrm/api/v3/Order.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Participant.php b/civicrm/api/v3/Participant.php
index d3e3561c89..245d6649c9 100644
--- a/civicrm/api/v3/Participant.php
+++ b/civicrm/api/v3/Participant.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ParticipantPayment.php b/civicrm/api/v3/ParticipantPayment.php
index 59c0499d88..808e75a550 100644
--- a/civicrm/api/v3/ParticipantPayment.php
+++ b/civicrm/api/v3/ParticipantPayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ParticipantStatusType.php b/civicrm/api/v3/ParticipantStatusType.php
index 3e8b082f75..fc3549f995 100644
--- a/civicrm/api/v3/ParticipantStatusType.php
+++ b/civicrm/api/v3/ParticipantStatusType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/PaymentProcessor.php b/civicrm/api/v3/PaymentProcessor.php
index 0a90f22271..d68481c270 100644
--- a/civicrm/api/v3/PaymentProcessor.php
+++ b/civicrm/api/v3/PaymentProcessor.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/PaymentProcessorType.php b/civicrm/api/v3/PaymentProcessorType.php
index 363436faac..48a528a7dc 100644
--- a/civicrm/api/v3/PaymentProcessorType.php
+++ b/civicrm/api/v3/PaymentProcessorType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/PaymentToken.php b/civicrm/api/v3/PaymentToken.php
index aa96e4db3c..617106dc31 100644
--- a/civicrm/api/v3/PaymentToken.php
+++ b/civicrm/api/v3/PaymentToken.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Phone.php b/civicrm/api/v3/Phone.php
index 66abd13bba..87dac297f5 100644
--- a/civicrm/api/v3/Phone.php
+++ b/civicrm/api/v3/Phone.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Phone/Get.php b/civicrm/api/v3/Phone/Get.php
index 7c9026de3c..4807cbe0e4 100644
--- a/civicrm/api/v3/Phone/Get.php
+++ b/civicrm/api/v3/Phone/Get.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Pledge.php b/civicrm/api/v3/Pledge.php
index ec474db898..d5b5183901 100644
--- a/civicrm/api/v3/Pledge.php
+++ b/civicrm/api/v3/Pledge.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/PledgePayment.php b/civicrm/api/v3/PledgePayment.php
index 2cb75ecae4..3efdb647db 100644
--- a/civicrm/api/v3/PledgePayment.php
+++ b/civicrm/api/v3/PledgePayment.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Premium.php b/civicrm/api/v3/Premium.php
index e19c99b051..67f6ac4c28 100644
--- a/civicrm/api/v3/Premium.php
+++ b/civicrm/api/v3/Premium.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/PriceField.php b/civicrm/api/v3/PriceField.php
index ffa4dde11c..d6586e02cf 100644
--- a/civicrm/api/v3/PriceField.php
+++ b/civicrm/api/v3/PriceField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/PriceFieldValue.php b/civicrm/api/v3/PriceFieldValue.php
index 4c9a803f00..488ff4e4fc 100644
--- a/civicrm/api/v3/PriceFieldValue.php
+++ b/civicrm/api/v3/PriceFieldValue.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/PriceSet.php b/civicrm/api/v3/PriceSet.php
index f984638b13..fd9f2408c5 100644
--- a/civicrm/api/v3/PriceSet.php
+++ b/civicrm/api/v3/PriceSet.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/PrintLabel.php b/civicrm/api/v3/PrintLabel.php
index 7bd8b19cd4..27c80817a3 100644
--- a/civicrm/api/v3/PrintLabel.php
+++ b/civicrm/api/v3/PrintLabel.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Product.php b/civicrm/api/v3/Product.php
index c6c828c81b..1e784b7c41 100644
--- a/civicrm/api/v3/Product.php
+++ b/civicrm/api/v3/Product.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Profile.php b/civicrm/api/v3/Profile.php
index 992dfad7c9..3607b42849 100644
--- a/civicrm/api/v3/Profile.php
+++ b/civicrm/api/v3/Profile.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/RecurringEntity.php b/civicrm/api/v3/RecurringEntity.php
index 4d28de9b13..eba9879c6b 100644
--- a/civicrm/api/v3/RecurringEntity.php
+++ b/civicrm/api/v3/RecurringEntity.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Relationship.php b/civicrm/api/v3/Relationship.php
index b13487ee15..95c394390b 100644
--- a/civicrm/api/v3/Relationship.php
+++ b/civicrm/api/v3/Relationship.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/RelationshipType.php b/civicrm/api/v3/RelationshipType.php
index c2eba4d56e..5b5c85929d 100644
--- a/civicrm/api/v3/RelationshipType.php
+++ b/civicrm/api/v3/RelationshipType.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ReportInstance.php b/civicrm/api/v3/ReportInstance.php
index 677a5fd908..6480b42745 100644
--- a/civicrm/api/v3/ReportInstance.php
+++ b/civicrm/api/v3/ReportInstance.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/ReportTemplate.php b/civicrm/api/v3/ReportTemplate.php
index aa502885fb..e8e98580e7 100644
--- a/civicrm/api/v3/ReportTemplate.php
+++ b/civicrm/api/v3/ReportTemplate.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Setting.php b/civicrm/api/v3/Setting.php
index 2817f11643..1599aaa571 100644
--- a/civicrm/api/v3/Setting.php
+++ b/civicrm/api/v3/Setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/SmsProvider.php b/civicrm/api/v3/SmsProvider.php
index 766aabd4b3..3e853f2a7b 100644
--- a/civicrm/api/v3/SmsProvider.php
+++ b/civicrm/api/v3/SmsProvider.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/StatusPreference.php b/civicrm/api/v3/StatusPreference.php
index 142fc6534e..f5a2d0ff20 100644
--- a/civicrm/api/v3/StatusPreference.php
+++ b/civicrm/api/v3/StatusPreference.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Survey.php b/civicrm/api/v3/Survey.php
index 99a06a62e1..7ff1b1be17 100644
--- a/civicrm/api/v3/Survey.php
+++ b/civicrm/api/v3/Survey.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/System.php b/civicrm/api/v3/System.php
index b7514c5a06..b2f4ce44fc 100644
--- a/civicrm/api/v3/System.php
+++ b/civicrm/api/v3/System.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/SystemLog.php b/civicrm/api/v3/SystemLog.php
index 461a7025f5..9b624639e4 100644
--- a/civicrm/api/v3/SystemLog.php
+++ b/civicrm/api/v3/SystemLog.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Tag.php b/civicrm/api/v3/Tag.php
index 30b407d9b7..d555c31693 100644
--- a/civicrm/api/v3/Tag.php
+++ b/civicrm/api/v3/Tag.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/UFField.php b/civicrm/api/v3/UFField.php
index 22bcbf785b..fbe76ff50b 100644
--- a/civicrm/api/v3/UFField.php
+++ b/civicrm/api/v3/UFField.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/UFGroup.php b/civicrm/api/v3/UFGroup.php
index 89fb6c284b..02a2b320c4 100644
--- a/civicrm/api/v3/UFGroup.php
+++ b/civicrm/api/v3/UFGroup.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/UFJoin.php b/civicrm/api/v3/UFJoin.php
index 4f5922531f..fbd2b3fbac 100644
--- a/civicrm/api/v3/UFJoin.php
+++ b/civicrm/api/v3/UFJoin.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/UFMatch.php b/civicrm/api/v3/UFMatch.php
index c373369da4..d3cd54e2fb 100644
--- a/civicrm/api/v3/UFMatch.php
+++ b/civicrm/api/v3/UFMatch.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/User.php b/civicrm/api/v3/User.php
index ee850f3454..f21fda98a0 100644
--- a/civicrm/api/v3/User.php
+++ b/civicrm/api/v3/User.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/Website.php b/civicrm/api/v3/Website.php
index 1eaedb214b..f435a10e02 100644
--- a/civicrm/api/v3/Website.php
+++ b/civicrm/api/v3/Website.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/WordReplacement.php b/civicrm/api/v3/WordReplacement.php
index c7bdfa4302..1aea732629 100644
--- a/civicrm/api/v3/WordReplacement.php
+++ b/civicrm/api/v3/WordReplacement.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/api/v3/utils.php b/civicrm/api/v3/utils.php
index 3cd75f7a66..64df76e7f7 100644
--- a/civicrm/api/v3/utils.php
+++ b/civicrm/api/v3/utils.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/bin/ContributionProcessor.php b/civicrm/bin/ContributionProcessor.php
index b90655b705..0618eb014b 100644
--- a/civicrm/bin/ContributionProcessor.php
+++ b/civicrm/bin/ContributionProcessor.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
class CiviContributeProcessor {
static $_paypalParamsMapper = array(
diff --git a/civicrm/bin/cron.php b/civicrm/bin/cron.php
index 8ac555c869..7ba2df6bb6 100644
--- a/civicrm/bin/cron.php
+++ b/civicrm/bin/cron.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/bin/encryptDB.php b/civicrm/bin/encryptDB.php
index acbc7457d9..02ff41f71e 100644
--- a/civicrm/bin/encryptDB.php
+++ b/civicrm/bin/encryptDB.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
define('CRM_ENCRYPT', 1);
diff --git a/civicrm/bin/migrate/export.php b/civicrm/bin/migrate/export.php
index 84470d5c34..ad2c73bdd1 100644
--- a/civicrm/bin/migrate/export.php
+++ b/civicrm/bin/migrate/export.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
function run() {
session_start();
diff --git a/civicrm/bin/migrate/exportJSON.php b/civicrm/bin/migrate/exportJSON.php
index d8dd24376a..3012412b03 100644
--- a/civicrm/bin/migrate/exportJSON.php
+++ b/civicrm/bin/migrate/exportJSON.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
function run() {
session_start();
diff --git a/civicrm/bin/migrate/import.php b/civicrm/bin/migrate/import.php
index 4505eadb79..a51b3ebce0 100644
--- a/civicrm/bin/migrate/import.php
+++ b/civicrm/bin/migrate/import.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
function run() {
session_start();
diff --git a/civicrm/bin/migrate/importJSON.php b/civicrm/bin/migrate/importJSON.php
index 75bfe307f6..18a5c02404 100644
--- a/civicrm/bin/migrate/importJSON.php
+++ b/civicrm/bin/migrate/importJSON.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
function run() {
session_start();
diff --git a/civicrm/bin/migrate/move.php b/civicrm/bin/migrate/move.php
index 6a94275f05..271644121c 100644
--- a/civicrm/bin/migrate/move.php
+++ b/civicrm/bin/migrate/move.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
function run() {
session_start();
diff --git a/civicrm/bower_components/ckeditor/.bower.json b/civicrm/bower_components/ckeditor/.bower.json
index 74430a82e5..fe51b928b9 100644
--- a/civicrm/bower_components/ckeditor/.bower.json
+++ b/civicrm/bower_components/ckeditor/.bower.json
@@ -16,12 +16,12 @@
"homepage": "http://ckeditor.com",
"main": "./ckeditor.js",
"moduleType": "globals",
- "version": "4.5.7",
- "_release": "4.5.7",
+ "version": "4.5.8",
+ "_release": "4.5.8",
"_resolution": {
"type": "version",
- "tag": "4.5.7",
- "commit": "a55e90c4e4114c40169b054bbeb2190c3a62a055"
+ "tag": "4.5.8",
+ "commit": "6345bc8f142bb72ffb83b4a964be4d88ad3905c8"
},
"_source": "git://github.com/ckeditor/ckeditor-releases.git",
"_target": "~4.5",
diff --git a/civicrm/bower_components/ckeditor/CHANGES.md b/civicrm/bower_components/ckeditor/CHANGES.md
index a11b9aaf26..f751de9932 100644
--- a/civicrm/bower_components/ckeditor/CHANGES.md
+++ b/civicrm/bower_components/ckeditor/CHANGES.md
@@ -1,21 +1,33 @@
CKEditor 4 Changelog
====================
+## CKEditor 4.5.8
+
+New Features:
+
+* [#12440](http://dev.ckeditor.com/ticket/12440): Added the [`config.colorButton_enableAutomatic`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_enableAutomatic) option to allow hiding the "Automatic" option in the [color picker](http://ckeditor.com/addon/colorbutton).
+
+Fixed Issues:
+
+* [#10448](http://dev.ckeditor.com/ticket/10448): Fixed: Lack of scrollbar in the [right-to-left text direction](http://ckeditor.com/addon/bidi).
+* [#12707](http://dev.ckeditor.com/ticket/12707): Fixed: The order of table elements does not comply with the HTML specification.
+* [#13756](http://dev.ckeditor.com/ticket/13756): [Edge] Fixed: Context menus are cut-off.
+
## CKEditor 4.5.7
New Features:
-* [#14327](http://dev.ckeditor.com/ticket/14327): Added Swiss German localization.
+* [#14327](http://dev.ckeditor.com/ticket/14327): Added Swiss German localization. Thanks to [Miro Grenda](https://twitter.com/mirogrenda)!
-Other Changes:
+Fixed Issues:
* [#13816](http://dev.ckeditor.com/ticket/13816): Introduced a new strategy for Filling Character handling to avoid changes in DOM. This fixes the following issues:
* [#12727](http://dev.ckeditor.com/ticket/12727): [Blink] `IndexSizeError` when using the [Div Editing Area](http://ckeditor.com/addon/divarea) and [Content Templates](http://ckeditor.com/addon/templates) plugins.
* [#13377](http://dev.ckeditor.com/ticket/13377): [Widget](http://ckeditor.com/addon/widget) plugin issue when typing in Korean.
* [#13389](http://dev.ckeditor.com/ticket/13389): [Blink] [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) fails when the cursor is next to an `<hr>` tag.
* [#13513](http://dev.ckeditor.com/ticket/13513): [Blink, WebKit] [Div Editing Area](http://ckeditor.com/addon/divarea) and [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) throw an error when an image is the only data in the editor.
-* [#13884](http://dev.ckeditor.com/ticket/13884): Fixed: Copy/paste table in Firefox results in just first cell being pasted.
-* [#14234](http://dev.ckeditor.com/ticket/14234): Fixed: URL input field is not marked as required in the [Embed](http://ckeditor.com/addon/embed) dialog.
+* [#13884](http://dev.ckeditor.com/ticket/13884): [Firefox] Fixed: Copying and pasting a table results in just the first cell being pasted.
+* [#14234](http://dev.ckeditor.com/ticket/14234): Fixed: URL input field is not marked as required in the [Media Embed](http://ckeditor.com/addon/embed) dialog.
## CKEditor 4.5.6
diff --git a/civicrm/bower_components/ckeditor/ckeditor.js b/civicrm/bower_components/ckeditor/ckeditor.js
index 6683d0cf69..4d61009cbf 100644
--- a/civicrm/bower_components/ckeditor/ckeditor.js
+++ b/civicrm/bower_components/ckeditor/ckeditor.js
@@ -2,7 +2,7 @@
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
-(function(){window.CKEDITOR&&window.CKEDITOR.dom||(window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,e={timestamp:"G14D",version:"4.5.7 (Standard)",revision:"e98277f",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var b=window.CKEDITOR_BASEPATH||"";if(!b)for(var c=document.getElementsByTagName("script"),e=0;e<c.length;e++){var f=c[e].src.match(a);if(f){b=f[1];break}}-1==b.indexOf(":/")&&"//"!=
+(function(){window.CKEDITOR&&window.CKEDITOR.dom||(window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,e={timestamp:"G2VE",version:"4.5.8 (Standard)",revision:"c1fc9a9",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var b=window.CKEDITOR_BASEPATH||"";if(!b)for(var c=document.getElementsByTagName("script"),e=0;e<c.length;e++){var f=c[e].src.match(a);if(f){b=f[1];break}}-1==b.indexOf(":/")&&"//"!=
b.slice(0,2)&&(b=0===b.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+b:location.href.match(/^[^\?]*\/(?:)/)[0]+b);if(!b)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return b}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"\x26":"?")+"t\x3d"+this.timestamp);
return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(f){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(f){function b(){try{document.documentElement.doScroll("left")}catch(g){setTimeout(b,1);return}a()}c.push(f);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",
a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);f=!1;try{f=!window.frameElement}catch(k){}document.documentElement.doScroll&&f&&b()}}}()},b=window.CKEDITOR_GETURL;if(b){var c=e.getUrl;e.getUrl=function(a){return b.call(e,a)||c.call(e,a)}}return e}()),CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var e=CKEDITOR.event.prototype,b;for(b in e)null==a[b]&&(a[b]=e[b])},
@@ -638,7 +638,7 @@ panel:e,parentElement:c,definition:d,document:f,iframe:k,children:[],dir:b.lang.
this.allowBlur(!1);var g=this._.editor.editable();this._.returnFocus=g.hasFocus?g:new CKEDITOR.dom.element(CKEDITOR.document.$.activeElement);this._.hideTimeout=0;var n=this.element,g=this._.iframe,g=CKEDITOR.env.ie&&!CKEDITOR.env.edge?g:new CKEDITOR.dom.window(g.$.contentWindow),t=n.getDocument(),r=this._.parentElement.getPositionedAncestor(),q=c.getDocumentPosition(t),t=r?r.getDocumentPosition(t):{x:0,y:0},v="rtl"==this._.dir,p=q.x+(e||0)-t.x,w=q.y+(l||0)-t.y;!v||1!=d&&4!=d?v||2!=d&&3!=d||(p+=c.$.offsetWidth-
1):p+=c.$.offsetWidth;if(3==d||4==d)w+=c.$.offsetHeight-1;this._.panel._.offsetParentId=c.getId();n.setStyles({top:w+"px",left:0,display:""});n.setOpacity(0);n.getFirst().removeStyle("width");this._.editor.focusManager.add(g);this._.blurSet||(CKEDITOR.event.useCapture=!0,g.on("blur",function(a){function b(){delete this._.returnFocus;this.hide()}this.allowBlur()&&a.data.getPhase()==CKEDITOR.EVENT_PHASE_AT_TARGET&&this.visible&&!this._.activeChild&&(CKEDITOR.env.iOS?this._.hideTimeout||(this._.hideTimeout=
CKEDITOR.tools.setTimeout(b,0,this)):b.call(this))},this),g.on("focus",function(){this._.focused=!0;this.hideChild();this.allowBlur(!0)},this),CKEDITOR.env.iOS&&(g.on("touchstart",function(){clearTimeout(this._.hideTimeout)},this),g.on("touchend",function(){this._.hideTimeout=0;this.focus()},this)),CKEDITOR.event.useCapture=!1,this._.blurSet=1);h.onEscape=CKEDITOR.tools.bind(function(a){if(this.onEscape&&!1===this.onEscape(a))return!1},this);CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.tools.bind(function(){var a=
-n;a.removeStyle("width");if(k.autoSize){var b=k.element.getDocument(),b=(CKEDITOR.env.webkit?k.element:b.getBody()).$.scrollWidth;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetWidth||0)-(a.$.clientWidth||0)+3);a.setStyle("width",b+10+"px");b=k.element.$.scrollHeight;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetHeight||0)-(a.$.clientHeight||0)+3);a.setStyle("height",b+"px");h._.currentBlock.element.setStyle("display","none").removeStyle("display")}else a.removeStyle("height");
+n;a.removeStyle("width");if(k.autoSize){var b=k.element.getDocument(),b=(CKEDITOR.env.webkit||CKEDITOR.env.edge?k.element:b.getBody()).$.scrollWidth;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetWidth||0)-(a.$.clientWidth||0)+3);a.setStyle("width",b+10+"px");b=k.element.$.scrollHeight;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetHeight||0)-(a.$.clientHeight||0)+3);a.setStyle("height",b+"px");h._.currentBlock.element.setStyle("display","none").removeStyle("display")}else a.removeStyle("height");
v&&(p-=n.$.offsetWidth);n.setStyle("left",p+"px");var b=h.element.getWindow(),a=n.$.getBoundingClientRect(),b=b.getViewPaneSize(),c=a.width||a.right-a.left,d=a.height||a.bottom-a.top,e=v?a.right:b.width-a.left,g=v?b.width-a.right:a.left;v?e<c&&(p=g>c?p+c:b.width>c?p-a.left:p-a.right+b.width):e<c&&(p=g>c?p-c:b.width>c?p-a.right+b.width:p-a.left);c=a.top;b.height-a.top<d&&(w=c>d?w-d:b.height>d?w-a.bottom+b.height:w-a.top);CKEDITOR.env.ie&&(b=a=new CKEDITOR.dom.element(n.$.offsetParent),"html"==b.getName()&&
(b=b.getDocument().getBody()),"rtl"==b.getComputedStyle("direction")&&(p=CKEDITOR.env.ie8Compat?p-2*n.getDocument().getDocumentElement().$.scrollLeft:p-(a.$.scrollWidth-a.$.clientWidth)));var a=n.getFirst(),m;(m=a.getCustomData("activePanel"))&&m.onHide&&m.onHide.call(this,1);a.setCustomData("activePanel",this);n.setStyles({top:w+"px",left:p+"px"});n.setOpacity(1);f&&f()},this);h.isLoaded?a():h.onLoad=a;CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.env.webkit&&CKEDITOR.document.getWindow().getScrollPosition().y;
this.focus();k.element.focus();CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=a);this.allowBlur(!0);this._.editor.fire("panelShow",this)},0,this)},CKEDITOR.env.air?200:0,this);this.visible=1;this.onShow&&this.onShow.call(this)},reposition:function(){var a=this._.showBlockParams;this.visible&&this._.showBlockParams&&(this.hide(),this.showBlock.apply(this,a))},focus:function(){if(CKEDITOR.env.webkit){var a=CKEDITOR.document.getActive();a&&!a.equals(this._.iframe)&&a.$.blur()}(this._.lastFocused||
diff --git a/civicrm/bower_components/ckeditor/contents.css b/civicrm/bower_components/ckeditor/contents.css
index 88f34fe578..bef3ebc8b1 100644
--- a/civicrm/bower_components/ckeditor/contents.css
+++ b/civicrm/bower_components/ckeditor/contents.css
@@ -22,6 +22,9 @@ body
{
font-size: 13px;
line-height: 1.6;
+
+ /* Fix for missing scrollbars with RTL texts. (#10488) */
+ word-wrap: break-word;
}
blockquote
diff --git a/civicrm/bower_components/ckeditor/lang/nl.js b/civicrm/bower_components/ckeditor/lang/nl.js
index 663d2cef4f..c5db1adef4 100644
--- a/civicrm/bower_components/ckeditor/lang/nl.js
+++ b/civicrm/bower_components/ckeditor/lang/nl.js
@@ -2,4 +2,4 @@
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
-CKEDITOR.lang['nl']={"wsc":{"btnIgnore":"Negeren","btnIgnoreAll":"Alles negeren","btnReplace":"Vervangen","btnReplaceAll":"Alles vervangen","btnUndo":"Ongedaan maken","changeTo":"Wijzig in","errorLoading":"Er is een fout opgetreden bij het laden van de dienst: %s.","ieSpellDownload":"De spellingscontrole is niet geïnstalleerd. Wilt u deze nu downloaden?","manyChanges":"Klaar met spellingscontrole: %1 woorden aangepast","noChanges":"Klaar met spellingscontrole: geen woorden aangepast","noMispell":"Klaar met spellingscontrole: geen fouten gevonden","noSuggestions":"- Geen suggesties -","notAvailable":"Excuses, deze dienst is momenteel niet beschikbaar.","notInDic":"Niet in het woordenboek","oneChange":"Klaar met spellingscontrole: één woord aangepast","progress":"Bezig met spellingscontrole...","title":"Spellingscontrole","toolbar":"Spellingscontrole"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"table":{"border":"Randdikte","caption":"Onderschrift","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"stylescombo":{"label":"Stijl","panelTitle":"Opmaakstijlen","panelTitle1":"Blok stijlen","panelTitle2":"Inline stijlen","panelTitle3":"Object stijlen"},"specialchar":{"options":"Speciale tekens opties","title":"Selecteer speciaal teken","toolbar":"Speciaal teken invoegen"},"sourcearea":{"toolbar":"Broncode"},"scayt":{"btn_about":"Over SCAYT","btn_dictionaries":"Woordenboeken","btn_disable":"SCAYT uitschakelen","btn_enable":"SCAYT inschakelen","btn_langs":"Talen","btn_options":"Opties","text_title":"Controleer de spelling tijdens het typen"},"removeformat":{"toolbar":"Opmaak verwijderen"},"pastetext":{"button":"Plakken als platte tekst","title":"Plakken als platte tekst"},"pastefromword":{"confirmCleanup":"De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?","error":"Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout","title":"Plakken vanuit Word","toolbar":"Plakken vanuit Word"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"magicline":{"title":"Hier paragraaf invoeren"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"link":{"acccessKey":"Toegangstoets","advanced":"Geavanceerd","advisoryContentType":"Aanbevolen content-type","advisoryTitle":"Adviserende titel","anchor":{"toolbar":"Interne link","menu":"Eigenschappen interne link","title":"Eigenschappen interne link","name":"Naam interne link","errorName":"Geef de naam van de interne link op","remove":"Interne link verwijderen"},"anchorId":"Op kenmerk interne link","anchorName":"Op naam interne link","charset":"Karakterset van gelinkte bron","cssClasses":"Stylesheet-klassen","emailAddress":"E-mailadres","emailBody":"Inhoud bericht","emailSubject":"Onderwerp bericht","id":"Id","info":"Linkomschrijving","langCode":"Taalcode","langDir":"Schrijfrichting","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","menu":"Link wijzigen","name":"Naam","noAnchors":"(Geen interne links in document gevonden)","noEmail":"Geef een e-mailadres","noUrl":"Geef de link van de URL","other":"<ander>","popupDependent":"Afhankelijk (Netscape)","popupFeatures":"Instellingen popupvenster","popupFullScreen":"Volledig scherm (IE)","popupLeft":"Positie links","popupLocationBar":"Locatiemenu","popupMenuBar":"Menubalk","popupResizable":"Herschaalbaar","popupScrollBars":"Schuifbalken","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Positie boven","rel":"Relatie","selectAnchor":"Kies een interne link","styles":"Stijl","tabIndex":"Tabvolgorde","target":"Doelvenster","targetFrame":"<frame>","targetFrameName":"Naam doelframe","targetPopup":"<popupvenster>","targetPopupName":"Naam popupvenster","title":"Link","toAnchor":"Interne link in pagina","toEmail":"E-mail","toUrl":"URL","toolbar":"Link invoegen/wijzigen","type":"Linktype","unlink":"Link verwijderen","upload":"Upload"},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"image":{"alt":"Alternatieve tekst","border":"Rand","btnUpload":"Naar server verzenden","button2Img":"Wilt u de geselecteerde afbeeldingsknop vervangen door een eenvoudige afbeelding?","hSpace":"HSpace","img2Button":"Wilt u de geselecteerde afbeelding vervangen door een afbeeldingsknop?","infoTab":"Informatie afbeelding","linkTab":"Link","lockRatio":"Afmetingen vergrendelen","menu":"Eigenschappen afbeelding","resetSize":"Afmetingen resetten","title":"Eigenschappen afbeelding","titleButton":"Eigenschappen afbeeldingsknop","upload":"Upload","urlMissing":"De URL naar de afbeelding ontbreekt.","vSpace":"VSpace","validateBorder":"Rand moet een heel nummer zijn.","validateHSpace":"HSpace moet een heel nummer zijn.","validateVSpace":"VSpace moet een heel nummer zijn."},"horizontalrule":{"toolbar":"Horizontale lijn invoegen"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Kop 1","tag_h2":"Kop 2","tag_h3":"Kop 3","tag_h4":"Kop 4","tag_h5":"Kop 5","tag_h6":"Kop 6","tag_p":"Normaal","tag_pre":"Met opmaak"},"fakeobjects":{"anchor":"Interne link","flash":"Flash animatie","hiddenfield":"Verborgen veld","iframe":"IFrame","unknown":"Onbekend object"},"elementspath":{"eleLabel":"Elementenpad","eleTitle":"%1 element"},"contextmenu":{"options":"Contextmenu opties"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteArea":"Plakgebied","pasteMsg":"Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.","securityMsg":"Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.","title":"Plakken"},"button":{"selectedLabel":"%1 (Geselecteerd)"},"blockquote":{"toolbar":"Citaatblok"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"about":{"copy":"Copyright © $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor","help":"Bekijk de $1 voor hulp.","moreInfo":"Bezoek onze website voor licentieinformatie:","title":"Over CKEditor","userGuide":"CKEditor gebruiksaanwijzing"},"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","flash":"Flash","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Centreren","alignJustify":"Uitvullen","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>"}};
\ No newline at end of file
+CKEDITOR.lang['nl']={"wsc":{"btnIgnore":"Negeren","btnIgnoreAll":"Alles negeren","btnReplace":"Vervangen","btnReplaceAll":"Alles vervangen","btnUndo":"Ongedaan maken","changeTo":"Wijzig in","errorLoading":"Er is een fout opgetreden bij het laden van de dienst: %s.","ieSpellDownload":"De spellingscontrole is niet geïnstalleerd. Wilt u deze nu downloaden?","manyChanges":"Klaar met spellingscontrole: %1 woorden aangepast","noChanges":"Klaar met spellingscontrole: geen woorden aangepast","noMispell":"Klaar met spellingscontrole: geen fouten gevonden","noSuggestions":"- Geen suggesties -","notAvailable":"Excuses, deze dienst is momenteel niet beschikbaar.","notInDic":"Niet in het woordenboek","oneChange":"Klaar met spellingscontrole: één woord aangepast","progress":"Bezig met spellingscontrole...","title":"Spellingscontrole","toolbar":"Spellingscontrole"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"table":{"border":"Randdikte","caption":"Titel","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"stylescombo":{"label":"Stijl","panelTitle":"Opmaakstijlen","panelTitle1":"Blok stijlen","panelTitle2":"Inline stijlen","panelTitle3":"Object stijlen"},"specialchar":{"options":"Speciale tekens opties","title":"Selecteer speciaal teken","toolbar":"Speciaal teken invoegen"},"sourcearea":{"toolbar":"Broncode"},"scayt":{"btn_about":"Over SCAYT","btn_dictionaries":"Woordenboeken","btn_disable":"SCAYT uitschakelen","btn_enable":"SCAYT inschakelen","btn_langs":"Talen","btn_options":"Opties","text_title":"Controleer de spelling tijdens het typen"},"removeformat":{"toolbar":"Opmaak verwijderen"},"pastetext":{"button":"Plakken als platte tekst","title":"Plakken als platte tekst"},"pastefromword":{"confirmCleanup":"De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?","error":"Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout","title":"Plakken vanuit Word","toolbar":"Plakken vanuit Word"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"magicline":{"title":"Hier paragraaf invoeren"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"link":{"acccessKey":"Toegangstoets","advanced":"Geavanceerd","advisoryContentType":"Aanbevolen content-type","advisoryTitle":"Adviserende titel","anchor":{"toolbar":"Interne link","menu":"Eigenschappen interne link","title":"Eigenschappen interne link","name":"Naam interne link","errorName":"Geef de naam van de interne link op","remove":"Interne link verwijderen"},"anchorId":"Op kenmerk interne link","anchorName":"Op naam interne link","charset":"Karakterset van gelinkte bron","cssClasses":"Stylesheet-klassen","emailAddress":"E-mailadres","emailBody":"Inhoud bericht","emailSubject":"Onderwerp bericht","id":"Id","info":"Linkomschrijving","langCode":"Taalcode","langDir":"Schrijfrichting","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","menu":"Link wijzigen","name":"Naam","noAnchors":"(Geen interne links in document gevonden)","noEmail":"Geef een e-mailadres","noUrl":"Geef de link van de URL","other":"<ander>","popupDependent":"Afhankelijk (Netscape)","popupFeatures":"Instellingen popupvenster","popupFullScreen":"Volledig scherm (IE)","popupLeft":"Positie links","popupLocationBar":"Locatiemenu","popupMenuBar":"Menubalk","popupResizable":"Herschaalbaar","popupScrollBars":"Schuifbalken","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Positie boven","rel":"Relatie","selectAnchor":"Kies een interne link","styles":"Stijl","tabIndex":"Tabvolgorde","target":"Doelvenster","targetFrame":"<frame>","targetFrameName":"Naam doelframe","targetPopup":"<popupvenster>","targetPopupName":"Naam popupvenster","title":"Link","toAnchor":"Interne link in pagina","toEmail":"E-mail","toUrl":"URL","toolbar":"Link invoegen/wijzigen","type":"Linktype","unlink":"Link verwijderen","upload":"Upload"},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"image":{"alt":"Alternatieve tekst","border":"Rand","btnUpload":"Naar server verzenden","button2Img":"Wilt u de geselecteerde afbeeldingsknop vervangen door een eenvoudige afbeelding?","hSpace":"HSpace","img2Button":"Wilt u de geselecteerde afbeelding vervangen door een afbeeldingsknop?","infoTab":"Informatie afbeelding","linkTab":"Link","lockRatio":"Afmetingen vergrendelen","menu":"Eigenschappen afbeelding","resetSize":"Afmetingen resetten","title":"Eigenschappen afbeelding","titleButton":"Eigenschappen afbeeldingsknop","upload":"Upload","urlMissing":"De URL naar de afbeelding ontbreekt.","vSpace":"VSpace","validateBorder":"Rand moet een heel nummer zijn.","validateHSpace":"HSpace moet een heel nummer zijn.","validateVSpace":"VSpace moet een heel nummer zijn."},"horizontalrule":{"toolbar":"Horizontale lijn invoegen"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Kop 1","tag_h2":"Kop 2","tag_h3":"Kop 3","tag_h4":"Kop 4","tag_h5":"Kop 5","tag_h6":"Kop 6","tag_p":"Normaal","tag_pre":"Met opmaak"},"fakeobjects":{"anchor":"Interne link","flash":"Flash animatie","hiddenfield":"Verborgen veld","iframe":"IFrame","unknown":"Onbekend object"},"elementspath":{"eleLabel":"Elementenpad","eleTitle":"%1 element"},"contextmenu":{"options":"Contextmenu opties"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteArea":"Plakgebied","pasteMsg":"Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.","securityMsg":"Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.","title":"Plakken"},"button":{"selectedLabel":"%1 (Geselecteerd)"},"blockquote":{"toolbar":"Citaatblok"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"about":{"copy":"Copyright © $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor","help":"Bekijk de $1 voor hulp.","moreInfo":"Bezoek onze website voor licentieinformatie:","title":"Over CKEditor","userGuide":"CKEditor gebruiksaanwijzing"},"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","flash":"Flash","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Centreren","alignJustify":"Uitvullen","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>"}};
\ No newline at end of file
diff --git a/civicrm/bower_components/ckeditor/package.json b/civicrm/bower_components/ckeditor/package.json
index acecdf3f12..688c53937d 100644
--- a/civicrm/bower_components/ckeditor/package.json
+++ b/civicrm/bower_components/ckeditor/package.json
@@ -1,6 +1,6 @@
{
"name": "ckeditor",
- "version": "4.5.7",
+ "version": "4.5.8",
"description": "JavaScript WYSIWYG web text editor.",
"main": "ckeditor.js",
"repository": {
diff --git a/civicrm/bower_components/ckeditor/plugins/colorbutton/plugin.js b/civicrm/bower_components/ckeditor/plugins/colorbutton/plugin.js
index dda4d5cf94..dd73c22d12 100644
--- a/civicrm/bower_components/ckeditor/plugins/colorbutton/plugin.js
+++ b/civicrm/bower_components/ckeditor/plugins/colorbutton/plugin.js
@@ -2,13 +2,13 @@
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
-CKEDITOR.plugins.add("colorbutton",{requires:"panelbutton,floatpanel",lang:"af,ar,bg,bn,bs,ca,cs,cy,da,de,de-ch,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,tt,ug,uk,vi,zh,zh-cn",icons:"bgcolor,textcolor",hidpi:!0,init:function(c){function r(p,g,e,h){var k=new CKEDITOR.style(l["colorButton_"+g+"Style"]),m=CKEDITOR.tools.getNextId()+"_colorBox";c.ui.add(p,CKEDITOR.UI_PANELBUTTON,
-{label:e,title:e,modes:{wysiwyg:1},editorFocus:0,toolbar:"colors,"+h,allowedContent:k,requiredContent:k,panel:{css:CKEDITOR.skin.getPath("editor"),attributes:{role:"listbox","aria-label":f.panelTitle}},onBlock:function(a,b){b.autoSize=!0;b.element.addClass("cke_colorblock");b.element.setHtml(u(a,g,m));b.element.getDocument().getBody().setStyle("overflow","hidden");CKEDITOR.ui.fire("ready",this);var d=b.keys,e="rtl"==c.lang.dir;d[e?37:39]="next";d[40]="next";d[9]="next";d[e?39:37]="prev";d[38]="prev";
-d[CKEDITOR.SHIFT+9]="prev";d[32]="click"},refresh:function(){c.activeFilter.check(k)||this.setState(CKEDITOR.TRISTATE_DISABLED)},onOpen:function(){var a=c.getSelection(),a=a&&a.getStartElement(),a=c.elementPath(a),b;if(a){a=a.block||a.blockLimit||c.document.getBody();do b=a&&a.getComputedStyle("back"==g?"background-color":"color")||"transparent";while("back"==g&&"transparent"==b&&a&&(a=a.getParent()));b&&"transparent"!=b||(b="#ffffff");this._.panel._.iframe.getFrameDocument().getById(m).setStyle("background-color",
-b);return b}}})}function u(p,g,e){var h=[],k=l.colorButton_colors.split(","),m=c.plugins.colordialog&&!1!==l.colorButton_enableMore,a=k.length+(m?2:1),b=CKEDITOR.tools.addFunction(function(a,b){function d(a){this.removeListener("ok",d);this.removeListener("cancel",d);"ok"==a.name&&e(this.getContentElement("picker","selectedColor").getValue(),b)}var e=arguments.callee;if("?"==a)c.openDialog("colordialog",function(){this.on("ok",d);this.on("cancel",d)});else{c.focus();p.hide();c.fire("saveSnapshot");
-c.removeStyle(new CKEDITOR.style(l["colorButton_"+b+"Style"],{color:"inherit"}));if(a){var f=l["colorButton_"+b+"Style"];f.childRule="back"==b?function(a){return t(a)}:function(a){return!(a.is("a")||a.getElementsByTag("a").count())||t(a)};c.applyStyle(new CKEDITOR.style(f,{color:a}))}c.fire("saveSnapshot")}});h.push('\x3ca class\x3d"cke_colorauto" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',f.auto,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",null,'",g,"');return false;\" href\x3d\"javascript:void('",
-f.auto,'\')" role\x3d"option" aria-posinset\x3d"1" aria-setsize\x3d"',a,'"\x3e\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e\x3ctr\x3e\x3ctd\x3e\x3cspan class\x3d"cke_colorbox" id\x3d"',e,'"\x3e\x3c/span\x3e\x3c/td\x3e\x3ctd colspan\x3d7 align\x3dcenter\x3e',f.auto,'\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/a\x3e\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e');for(e=0;e<k.length;e++){0===e%8&&h.push("\x3c/tr\x3e\x3ctr\x3e");
-var d=k[e].split("/"),n=d[0],q=d[1]||n;d[1]||(n="#"+n.replace(/^(.)(.)(.)$/,"$1$1$2$2$3$3"));d=c.lang.colorbutton.colors[q]||q;h.push('\x3ctd\x3e\x3ca class\x3d"cke_colorbox" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',d,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",'",n,"','",g,"'); return false;\" href\x3d\"javascript:void('",d,'\')" role\x3d"option" aria-posinset\x3d"',e+2,'" aria-setsize\x3d"',a,'"\x3e\x3cspan class\x3d"cke_colorbox" style\x3d"background-color:#',q,'"\x3e\x3c/span\x3e\x3c/a\x3e\x3c/td\x3e')}m&&
-h.push('\x3c/tr\x3e\x3ctr\x3e\x3ctd colspan\x3d8 align\x3dcenter\x3e\x3ca class\x3d"cke_colormore" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',f.more,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",'?','",g,"');return false;\" href\x3d\"javascript:void('",f.more,"')\"",' role\x3d"option" aria-posinset\x3d"',a,'" aria-setsize\x3d"',a,'"\x3e',f.more,"\x3c/a\x3e\x3c/td\x3e");h.push("\x3c/tr\x3e\x3c/table\x3e");return h.join("")}function t(c){return"false"==c.getAttribute("contentEditable")||c.getAttribute("data-nostyle")}
-var l=c.config,f=c.lang.colorbutton;CKEDITOR.env.hc||(r("TextColor","fore",f.textColorTitle,10),r("BGColor","back",f.bgColorTitle,20))}});CKEDITOR.config.colorButton_colors="000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF";
+CKEDITOR.plugins.add("colorbutton",{requires:"panelbutton,floatpanel",lang:"af,ar,bg,bn,bs,ca,cs,cy,da,de,de-ch,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,tt,ug,uk,vi,zh,zh-cn",icons:"bgcolor,textcolor",hidpi:!0,init:function(c){function r(p,h,e,f){var l=new CKEDITOR.style(k["colorButton_"+h+"Style"]),m=CKEDITOR.tools.getNextId()+"_colorBox";c.ui.add(p,CKEDITOR.UI_PANELBUTTON,
+{label:e,title:e,modes:{wysiwyg:1},editorFocus:0,toolbar:"colors,"+f,allowedContent:l,requiredContent:l,panel:{css:CKEDITOR.skin.getPath("editor"),attributes:{role:"listbox","aria-label":g.panelTitle}},onBlock:function(a,b){b.autoSize=!0;b.element.addClass("cke_colorblock");b.element.setHtml(u(a,h,m));b.element.getDocument().getBody().setStyle("overflow","hidden");CKEDITOR.ui.fire("ready",this);var d=b.keys,e="rtl"==c.lang.dir;d[e?37:39]="next";d[40]="next";d[9]="next";d[e?39:37]="prev";d[38]="prev";
+d[CKEDITOR.SHIFT+9]="prev";d[32]="click"},refresh:function(){c.activeFilter.check(l)||this.setState(CKEDITOR.TRISTATE_DISABLED)},onOpen:function(){var a=c.getSelection(),a=a&&a.getStartElement(),a=c.elementPath(a),b;if(a){a=a.block||a.blockLimit||c.document.getBody();do b=a&&a.getComputedStyle("back"==h?"background-color":"color")||"transparent";while("back"==h&&"transparent"==b&&a&&(a=a.getParent()));b&&"transparent"!=b||(b="#ffffff");!1!==k.colorButton_enableAutomatic&&this._.panel._.iframe.getFrameDocument().getById(m).setStyle("background-color",
+b);return b}}})}function u(p,h,e){var f=[],l=k.colorButton_colors.split(","),m=c.plugins.colordialog&&!1!==k.colorButton_enableMore,a=l.length+(m?2:1),b=CKEDITOR.tools.addFunction(function(a,b){function d(a){this.removeListener("ok",d);this.removeListener("cancel",d);"ok"==a.name&&e(this.getContentElement("picker","selectedColor").getValue(),b)}var e=arguments.callee;if("?"==a)c.openDialog("colordialog",function(){this.on("ok",d);this.on("cancel",d)});else{c.focus();p.hide();c.fire("saveSnapshot");
+c.removeStyle(new CKEDITOR.style(k["colorButton_"+b+"Style"],{color:"inherit"}));if(a){var f=k["colorButton_"+b+"Style"];f.childRule="back"==b?function(a){return t(a)}:function(a){return!(a.is("a")||a.getElementsByTag("a").count())||t(a)};c.applyStyle(new CKEDITOR.style(f,{color:a}))}c.fire("saveSnapshot")}});!1!==k.colorButton_enableAutomatic&&f.push('\x3ca class\x3d"cke_colorauto" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',g.auto,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",null,'",h,"');return false;\" href\x3d\"javascript:void('",
+g.auto,'\')" role\x3d"option" aria-posinset\x3d"1" aria-setsize\x3d"',a,'"\x3e\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e\x3ctr\x3e\x3ctd\x3e\x3cspan class\x3d"cke_colorbox" id\x3d"',e,'"\x3e\x3c/span\x3e\x3c/td\x3e\x3ctd colspan\x3d7 align\x3dcenter\x3e',g.auto,"\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/a\x3e");f.push('\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e');for(e=0;e<l.length;e++){0===e%8&&f.push("\x3c/tr\x3e\x3ctr\x3e");
+var d=l[e].split("/"),n=d[0],q=d[1]||n;d[1]||(n="#"+n.replace(/^(.)(.)(.)$/,"$1$1$2$2$3$3"));d=c.lang.colorbutton.colors[q]||q;f.push('\x3ctd\x3e\x3ca class\x3d"cke_colorbox" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',d,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",'",n,"','",h,"'); return false;\" href\x3d\"javascript:void('",d,'\')" role\x3d"option" aria-posinset\x3d"',e+2,'" aria-setsize\x3d"',a,'"\x3e\x3cspan class\x3d"cke_colorbox" style\x3d"background-color:#',q,'"\x3e\x3c/span\x3e\x3c/a\x3e\x3c/td\x3e')}m&&
+f.push('\x3c/tr\x3e\x3ctr\x3e\x3ctd colspan\x3d8 align\x3dcenter\x3e\x3ca class\x3d"cke_colormore" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',g.more,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",'?','",h,"');return false;\" href\x3d\"javascript:void('",g.more,"')\"",' role\x3d"option" aria-posinset\x3d"',a,'" aria-setsize\x3d"',a,'"\x3e',g.more,"\x3c/a\x3e\x3c/td\x3e");f.push("\x3c/tr\x3e\x3c/table\x3e");return f.join("")}function t(c){return"false"==c.getAttribute("contentEditable")||c.getAttribute("data-nostyle")}
+var k=c.config,g=c.lang.colorbutton;CKEDITOR.env.hc||(r("TextColor","fore",g.textColorTitle,10),r("BGColor","back",g.bgColorTitle,20))}});CKEDITOR.config.colorButton_colors="000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF";
CKEDITOR.config.colorButton_foreStyle={element:"span",styles:{color:"#(color)"},overrides:[{element:"font",attributes:{color:null}}]};CKEDITOR.config.colorButton_backStyle={element:"span",styles:{"background-color":"#(color)"}};
\ No newline at end of file
diff --git a/civicrm/bower_components/ckeditor/plugins/language/lang/ast.js b/civicrm/bower_components/ckeditor/plugins/language/lang/ast.js
new file mode 100644
index 0000000000..fdfdd42df0
--- /dev/null
+++ b/civicrm/bower_components/ckeditor/plugins/language/lang/ast.js
@@ -0,0 +1,5 @@
+/*
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang("language","ast",{button:"Afitar llingua",remove:"Quitar llingua"});
\ No newline at end of file
diff --git a/civicrm/bower_components/ckeditor/plugins/table/dialogs/table.js b/civicrm/bower_components/ckeditor/plugins/table/dialogs/table.js
index 3045eb196d..081f38f303 100644
--- a/civicrm/bower_components/ckeditor/plugins/table/dialogs/table.js
+++ b/civicrm/bower_components/ckeditor/plugins/table/dialogs/table.js
@@ -2,20 +2,20 @@
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
-(function(){function v(a){for(var f=0,n=0,m=0,p,e=a.$.rows.length;m<e;m++){p=a.$.rows[m];for(var d=f=0,c,b=p.cells.length;d<b;d++)c=p.cells[d],f+=c.colSpan;f>n&&(n=f)}return n}function r(a){return function(){var f=this.getValue(),f=!!(CKEDITOR.dialog.validate.integer()(f)&&0<f);f||(alert(a),this.select());return f}}function q(a,f){var n=function(e){return new CKEDITOR.dom.element(e,a.document)},q=a.editable(),p=a.plugins.dialogadvtab;return{title:a.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?
-310:280,onLoad:function(){var e=this,a=e.getContentElement("advanced","advStyles");if(a)a.on("change",function(){var a=this.getStyle("width",""),b=e.getContentElement("info","txtWidth");b&&b.setValue(a,!0);a=this.getStyle("height","");(b=e.getContentElement("info","txtHeight"))&&b.setValue(a,!0)})},onShow:function(){var e=a.getSelection(),d=e.getRanges(),c,b=this.getContentElement("info","txtRows"),h=this.getContentElement("info","txtCols"),t=this.getContentElement("info","txtWidth"),g=this.getContentElement("info",
-"txtHeight");"tableProperties"==f&&((e=e.getSelectedElement())&&e.is("table")?c=e:0<d.length&&(CKEDITOR.env.webkit&&d[0].shrink(CKEDITOR.NODE_ELEMENT),c=a.elementPath(d[0].getCommonAncestor(!0)).contains("table",1)),this._.selectedElement=c);c?(this.setupContent(c),b&&b.disable(),h&&h.disable()):(b&&b.enable(),h&&h.enable());t&&t.onChange();g&&g.onChange()},onOk:function(){var e=a.getSelection(),d=this._.selectedElement&&e.createBookmarks(),c=this._.selectedElement||n("table"),b={};this.commitContent(b,
-c);if(b.info){b=b.info;if(!this._.selectedElement)for(var h=c.append(n("tbody")),f=parseInt(b.txtRows,10)||0,g=parseInt(b.txtCols,10)||0,k=0;k<f;k++)for(var l=h.append(n("tr")),m=0;m<g;m++)l.append(n("td")).appendBogus();f=b.selHeaders;if(!c.$.tHead&&("row"==f||"both"==f)){l=new CKEDITOR.dom.element(c.$.createTHead());h=c.getElementsByTag("tbody").getItem(0);h=h.getElementsByTag("tr").getItem(0);for(k=0;k<h.getChildCount();k++)g=h.getChild(k),g.type!=CKEDITOR.NODE_ELEMENT||g.data("cke-bookmark")||
-(g.renameNode("th"),g.setAttribute("scope","col"));l.append(h.remove())}if(null!==c.$.tHead&&"row"!=f&&"both"!=f){l=new CKEDITOR.dom.element(c.$.tHead);h=c.getElementsByTag("tbody").getItem(0);for(m=h.getFirst();0<l.getChildCount();){h=l.getFirst();for(k=0;k<h.getChildCount();k++)g=h.getChild(k),g.type==CKEDITOR.NODE_ELEMENT&&(g.renameNode("td"),g.removeAttribute("scope"));h.insertBefore(m)}l.remove()}if(!this.hasColumnHeaders&&("col"==f||"both"==f))for(l=0;l<c.$.rows.length;l++)g=new CKEDITOR.dom.element(c.$.rows[l].cells[0]),
-g.renameNode("th"),g.setAttribute("scope","row");if(this.hasColumnHeaders&&"col"!=f&&"both"!=f)for(k=0;k<c.$.rows.length;k++)l=new CKEDITOR.dom.element(c.$.rows[k]),"tbody"==l.getParent().getName()&&(g=new CKEDITOR.dom.element(l.$.cells[0]),g.renameNode("td"),g.removeAttribute("scope"));b.txtHeight?c.setStyle("height",b.txtHeight):c.removeStyle("height");b.txtWidth?c.setStyle("width",b.txtWidth):c.removeStyle("width");c.getAttribute("style")||c.removeAttribute("style")}if(this._.selectedElement)try{e.selectBookmarks(d)}catch(p){}else a.insertElement(c),
-setTimeout(function(){var e=new CKEDITOR.dom.element(c.$.rows[0].cells[0]),b=a.createRange();b.moveToPosition(e,CKEDITOR.POSITION_AFTER_START);b.select()},0)},contents:[{id:"info",label:a.lang.table.title,elements:[{type:"hbox",widths:[null,null],styles:["vertical-align:top"],children:[{type:"vbox",padding:0,children:[{type:"text",id:"txtRows","default":3,label:a.lang.table.rows,required:!0,controlStyle:"width:5em",validate:r(a.lang.table.invalidRows),setup:function(e){this.setValue(e.$.rows.length)},
-commit:m},{type:"text",id:"txtCols","default":2,label:a.lang.table.columns,required:!0,controlStyle:"width:5em",validate:r(a.lang.table.invalidCols),setup:function(e){this.setValue(v(e))},commit:m},{type:"html",html:"\x26nbsp;"},{type:"select",id:"selHeaders",requiredContent:"th","default":"",label:a.lang.table.headers,items:[[a.lang.table.headersNone,""],[a.lang.table.headersRow,"row"],[a.lang.table.headersColumn,"col"],[a.lang.table.headersBoth,"both"]],setup:function(e){var a=this.getDialog();
-a.hasColumnHeaders=!0;for(var c=0;c<e.$.rows.length;c++){var b=e.$.rows[c].cells[0];if(b&&"th"!=b.nodeName.toLowerCase()){a.hasColumnHeaders=!1;break}}null!==e.$.tHead?this.setValue(a.hasColumnHeaders?"both":"row"):this.setValue(a.hasColumnHeaders?"col":"")},commit:m},{type:"text",id:"txtBorder",requiredContent:"table[border]","default":a.filter.check("table[border]")?1:0,label:a.lang.table.border,controlStyle:"width:3em",validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidBorder),setup:function(a){this.setValue(a.getAttribute("border")||
-"")},commit:function(a,d){this.getValue()?d.setAttribute("border",this.getValue()):d.removeAttribute("border")}},{id:"cmbAlign",type:"select",requiredContent:"table[align]","default":"",label:a.lang.common.align,items:[[a.lang.common.notSet,""],[a.lang.common.alignLeft,"left"],[a.lang.common.alignCenter,"center"],[a.lang.common.alignRight,"right"]],setup:function(a){this.setValue(a.getAttribute("align")||"")},commit:function(a,d){this.getValue()?d.setAttribute("align",this.getValue()):d.removeAttribute("align")}}]},
-{type:"vbox",padding:0,children:[{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtWidth",requiredContent:"table{width}",controlStyle:"width:5em",label:a.lang.common.width,title:a.lang.common.cssLengthTooltip,"default":a.filter.check("table{width}")?500>q.getSize("width")?"100%":500:0,getValue:u,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",a.lang.common.width)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&&
-a.updateStyle("width",this.getValue())},setup:function(a){a=a.getStyle("width");this.setValue(a)},commit:m}]},{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtHeight",requiredContent:"table{height}",controlStyle:"width:5em",label:a.lang.common.height,title:a.lang.common.cssLengthTooltip,"default":"",getValue:u,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",a.lang.common.height)),onChange:function(){var a=this.getDialog().getContentElement("advanced",
-"advStyles");a&&a.updateStyle("height",this.getValue())},setup:function(a){(a=a.getStyle("height"))&&this.setValue(a)},commit:m}]},{type:"html",html:"\x26nbsp;"},{type:"text",id:"txtCellSpace",requiredContent:"table[cellspacing]",controlStyle:"width:3em",label:a.lang.table.cellSpace,"default":a.filter.check("table[cellspacing]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellSpacing),setup:function(a){this.setValue(a.getAttribute("cellSpacing")||"")},commit:function(a,d){this.getValue()?
-d.setAttribute("cellSpacing",this.getValue()):d.removeAttribute("cellSpacing")}},{type:"text",id:"txtCellPad",requiredContent:"table[cellpadding]",controlStyle:"width:3em",label:a.lang.table.cellPad,"default":a.filter.check("table[cellpadding]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellPadding),setup:function(a){this.setValue(a.getAttribute("cellPadding")||"")},commit:function(a,d){this.getValue()?d.setAttribute("cellPadding",this.getValue()):d.removeAttribute("cellPadding")}}]}]},
-{type:"html",align:"right",html:""},{type:"vbox",padding:0,children:[{type:"text",id:"txtCaption",requiredContent:"caption",label:a.lang.table.caption,setup:function(a){this.enable();a=a.getElementsByTag("caption");if(0<a.count()){a=a.getItem(0);var d=a.getFirst(CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT));d&&!d.equals(a.getBogus())?(this.disable(),this.setValue(a.getText())):(a=CKEDITOR.tools.trim(a.getText()),this.setValue(a))}},commit:function(e,d){if(this.isEnabled()){var c=this.getValue(),
-b=d.getElementsByTag("caption");if(c)0<b.count()?(b=b.getItem(0),b.setHtml("")):(b=new CKEDITOR.dom.element("caption",a.document),d.getChildCount()?b.insertBefore(d.getFirst()):b.appendTo(d)),b.append(new CKEDITOR.dom.text(c,a.document));else if(0<b.count())for(c=b.count()-1;0<=c;c--)b.getItem(c).remove()}}},{type:"text",id:"txtSummary",bidi:!0,requiredContent:"table[summary]",label:a.lang.table.summary,setup:function(a){this.setValue(a.getAttribute("summary")||"")},commit:function(a,d){this.getValue()?
-d.setAttribute("summary",this.getValue()):d.removeAttribute("summary")}}]}]},p&&p.createAdvancedTab(a,null,"table")]}}var u=CKEDITOR.tools.cssLength,m=function(a){var f=this.id;a.info||(a.info={});a.info[f]=this.getValue()};CKEDITOR.dialog.add("table",function(a){return q(a,"table")});CKEDITOR.dialog.add("tableProperties",function(a){return q(a,"tableProperties")})})();
\ No newline at end of file
+(function(){function v(a){for(var f=0,n=0,l=0,p,e=a.$.rows.length;l<e;l++){p=a.$.rows[l];for(var d=f=0,b,c=p.cells.length;d<c;d++)b=p.cells[d],f+=b.colSpan;f>n&&(n=f)}return n}function r(a){return function(){var f=this.getValue(),f=!!(CKEDITOR.dialog.validate.integer()(f)&&0<f);f||(alert(a),this.select());return f}}function q(a,f){var n=function(e){return new CKEDITOR.dom.element(e,a.document)},q=a.editable(),p=a.plugins.dialogadvtab;return{title:a.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?
+310:280,onLoad:function(){var e=this,a=e.getContentElement("advanced","advStyles");if(a)a.on("change",function(){var a=this.getStyle("width",""),c=e.getContentElement("info","txtWidth");c&&c.setValue(a,!0);a=this.getStyle("height","");(c=e.getContentElement("info","txtHeight"))&&c.setValue(a,!0)})},onShow:function(){var e=a.getSelection(),d=e.getRanges(),b,c=this.getContentElement("info","txtRows"),g=this.getContentElement("info","txtCols"),t=this.getContentElement("info","txtWidth"),m=this.getContentElement("info",
+"txtHeight");"tableProperties"==f&&((e=e.getSelectedElement())&&e.is("table")?b=e:0<d.length&&(CKEDITOR.env.webkit&&d[0].shrink(CKEDITOR.NODE_ELEMENT),b=a.elementPath(d[0].getCommonAncestor(!0)).contains("table",1)),this._.selectedElement=b);b?(this.setupContent(b),c&&c.disable(),g&&g.disable()):(c&&c.enable(),g&&g.enable());t&&t.onChange();m&&m.onChange()},onOk:function(){var e=a.getSelection(),d=this._.selectedElement&&e.createBookmarks(),b=this._.selectedElement||n("table"),c={};this.commitContent(c,
+b);if(c.info){c=c.info;if(!this._.selectedElement)for(var g=b.append(n("tbody")),f=parseInt(c.txtRows,10)||0,m=parseInt(c.txtCols,10)||0,k=0;k<f;k++)for(var h=g.append(n("tr")),l=0;l<m;l++)h.append(n("td")).appendBogus();f=c.selHeaders;if(!b.$.tHead&&("row"==f||"both"==f)){h=b.getElementsByTag("thead").getItem(0);g=b.getElementsByTag("tbody").getItem(0);m=g.getElementsByTag("tr").getItem(0);h||(h=new CKEDITOR.dom.element("thead"),h.insertBefore(g));for(k=0;k<m.getChildCount();k++)g=m.getChild(k),
+g.type!=CKEDITOR.NODE_ELEMENT||g.data("cke-bookmark")||(g.renameNode("th"),g.setAttribute("scope","col"));h.append(m.remove())}if(null!==b.$.tHead&&"row"!=f&&"both"!=f){h=new CKEDITOR.dom.element(b.$.tHead);g=b.getElementsByTag("tbody").getItem(0);for(l=g.getFirst();0<h.getChildCount();){m=h.getFirst();for(k=0;k<m.getChildCount();k++)g=m.getChild(k),g.type==CKEDITOR.NODE_ELEMENT&&(g.renameNode("td"),g.removeAttribute("scope"));m.insertBefore(l)}h.remove()}if(!this.hasColumnHeaders&&("col"==f||"both"==
+f))for(h=0;h<b.$.rows.length;h++)g=new CKEDITOR.dom.element(b.$.rows[h].cells[0]),g.renameNode("th"),g.setAttribute("scope","row");if(this.hasColumnHeaders&&"col"!=f&&"both"!=f)for(k=0;k<b.$.rows.length;k++)h=new CKEDITOR.dom.element(b.$.rows[k]),"tbody"==h.getParent().getName()&&(g=new CKEDITOR.dom.element(h.$.cells[0]),g.renameNode("td"),g.removeAttribute("scope"));c.txtHeight?b.setStyle("height",c.txtHeight):b.removeStyle("height");c.txtWidth?b.setStyle("width",c.txtWidth):b.removeStyle("width");
+b.getAttribute("style")||b.removeAttribute("style")}if(this._.selectedElement)try{e.selectBookmarks(d)}catch(p){}else a.insertElement(b),setTimeout(function(){var e=new CKEDITOR.dom.element(b.$.rows[0].cells[0]),c=a.createRange();c.moveToPosition(e,CKEDITOR.POSITION_AFTER_START);c.select()},0)},contents:[{id:"info",label:a.lang.table.title,elements:[{type:"hbox",widths:[null,null],styles:["vertical-align:top"],children:[{type:"vbox",padding:0,children:[{type:"text",id:"txtRows","default":3,label:a.lang.table.rows,
+required:!0,controlStyle:"width:5em",validate:r(a.lang.table.invalidRows),setup:function(e){this.setValue(e.$.rows.length)},commit:l},{type:"text",id:"txtCols","default":2,label:a.lang.table.columns,required:!0,controlStyle:"width:5em",validate:r(a.lang.table.invalidCols),setup:function(e){this.setValue(v(e))},commit:l},{type:"html",html:"\x26nbsp;"},{type:"select",id:"selHeaders",requiredContent:"th","default":"",label:a.lang.table.headers,items:[[a.lang.table.headersNone,""],[a.lang.table.headersRow,
+"row"],[a.lang.table.headersColumn,"col"],[a.lang.table.headersBoth,"both"]],setup:function(e){var a=this.getDialog();a.hasColumnHeaders=!0;for(var b=0;b<e.$.rows.length;b++){var c=e.$.rows[b].cells[0];if(c&&"th"!=c.nodeName.toLowerCase()){a.hasColumnHeaders=!1;break}}null!==e.$.tHead?this.setValue(a.hasColumnHeaders?"both":"row"):this.setValue(a.hasColumnHeaders?"col":"")},commit:l},{type:"text",id:"txtBorder",requiredContent:"table[border]","default":a.filter.check("table[border]")?1:0,label:a.lang.table.border,
+controlStyle:"width:3em",validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidBorder),setup:function(a){this.setValue(a.getAttribute("border")||"")},commit:function(a,d){this.getValue()?d.setAttribute("border",this.getValue()):d.removeAttribute("border")}},{id:"cmbAlign",type:"select",requiredContent:"table[align]","default":"",label:a.lang.common.align,items:[[a.lang.common.notSet,""],[a.lang.common.alignLeft,"left"],[a.lang.common.alignCenter,"center"],[a.lang.common.alignRight,"right"]],
+setup:function(a){this.setValue(a.getAttribute("align")||"")},commit:function(a,d){this.getValue()?d.setAttribute("align",this.getValue()):d.removeAttribute("align")}}]},{type:"vbox",padding:0,children:[{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtWidth",requiredContent:"table{width}",controlStyle:"width:5em",label:a.lang.common.width,title:a.lang.common.cssLengthTooltip,"default":a.filter.check("table{width}")?500>q.getSize("width")?"100%":500:0,getValue:u,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",
+a.lang.common.width)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&&a.updateStyle("width",this.getValue())},setup:function(a){a=a.getStyle("width");this.setValue(a)},commit:l}]},{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtHeight",requiredContent:"table{height}",controlStyle:"width:5em",label:a.lang.common.height,title:a.lang.common.cssLengthTooltip,"default":"",getValue:u,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",
+a.lang.common.height)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&&a.updateStyle("height",this.getValue())},setup:function(a){(a=a.getStyle("height"))&&this.setValue(a)},commit:l}]},{type:"html",html:"\x26nbsp;"},{type:"text",id:"txtCellSpace",requiredContent:"table[cellspacing]",controlStyle:"width:3em",label:a.lang.table.cellSpace,"default":a.filter.check("table[cellspacing]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellSpacing),
+setup:function(a){this.setValue(a.getAttribute("cellSpacing")||"")},commit:function(a,d){this.getValue()?d.setAttribute("cellSpacing",this.getValue()):d.removeAttribute("cellSpacing")}},{type:"text",id:"txtCellPad",requiredContent:"table[cellpadding]",controlStyle:"width:3em",label:a.lang.table.cellPad,"default":a.filter.check("table[cellpadding]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellPadding),setup:function(a){this.setValue(a.getAttribute("cellPadding")||"")},commit:function(a,
+d){this.getValue()?d.setAttribute("cellPadding",this.getValue()):d.removeAttribute("cellPadding")}}]}]},{type:"html",align:"right",html:""},{type:"vbox",padding:0,children:[{type:"text",id:"txtCaption",requiredContent:"caption",label:a.lang.table.caption,setup:function(a){this.enable();a=a.getElementsByTag("caption");if(0<a.count()){a=a.getItem(0);var d=a.getFirst(CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT));d&&!d.equals(a.getBogus())?(this.disable(),this.setValue(a.getText())):(a=CKEDITOR.tools.trim(a.getText()),
+this.setValue(a))}},commit:function(e,d){if(this.isEnabled()){var b=this.getValue(),c=d.getElementsByTag("caption");if(b)0<c.count()?(c=c.getItem(0),c.setHtml("")):(c=new CKEDITOR.dom.element("caption",a.document),d.append(c,!0)),c.append(new CKEDITOR.dom.text(b,a.document));else if(0<c.count())for(b=c.count()-1;0<=b;b--)c.getItem(b).remove()}}},{type:"text",id:"txtSummary",bidi:!0,requiredContent:"table[summary]",label:a.lang.table.summary,setup:function(a){this.setValue(a.getAttribute("summary")||
+"")},commit:function(a,d){this.getValue()?d.setAttribute("summary",this.getValue()):d.removeAttribute("summary")}}]}]},p&&p.createAdvancedTab(a,null,"table")]}}var u=CKEDITOR.tools.cssLength,l=function(a){var f=this.id;a.info||(a.info={});a.info[f]=this.getValue()};CKEDITOR.dialog.add("table",function(a){return q(a,"table")});CKEDITOR.dialog.add("tableProperties",function(a){return q(a,"tableProperties")})})();
\ No newline at end of file
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 4d30f1526c..d2cf82708e 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
function civicrmVersion( ) {
- return array( 'version' => '4.7.4',
+ return array( 'version' => '4.7.6',
'cms' => 'Wordpress',
- 'revision' => '558382f783' );
+ 'revision' => 'd6a55ced69' );
}
diff --git a/civicrm/civicrm.config.php b/civicrm/civicrm.config.php
index e073e71b42..83a2ec9b73 100644
--- a/civicrm/civicrm.config.php
+++ b/civicrm/civicrm.config.php
@@ -292,6 +292,8 @@ class Bootstrap {
$wpDirs = array(
$cmsRoot . '/*/uploads/civicrm',
$cmsRoot . '/*/plugins/civicrm',
+ $cmsRoot . '/*/uploads/sites/*/civicrm',
+ $cmsRoot . '/*/blogs.dir/*/files/civicrm',
);
$settings = $this->findFirstFile($wpDirs, 'civicrm.settings.php');
break;
diff --git a/civicrm/extern/authorizeIPN.php b/civicrm/extern/authorizeIPN.php
index 80c22e3eea..1463b8ce2e 100644
--- a/civicrm/extern/authorizeIPN.php
+++ b/civicrm/extern/authorizeIPN.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
diff --git a/civicrm/extern/cxn.php b/civicrm/extern/cxn.php
index 1cfd6c64a2..e8a975b947 100644
--- a/civicrm/extern/cxn.php
+++ b/civicrm/extern/cxn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/extern/ipn.php b/civicrm/extern/ipn.php
index 752bb1a1c4..7b9324b135 100644
--- a/civicrm/extern/ipn.php
+++ b/civicrm/extern/ipn.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -27,7 +27,7 @@
/**
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
@@ -52,6 +52,9 @@ else {
// @todo upgrade standard per Pro
}
try {
+ //CRM-18245
+ CRM_Utils_System::loadBootStrap();
+
$paypalIPN->main();
}
catch (CRM_Core_Exception $e) {
diff --git a/civicrm/extern/rest.php b/civicrm/extern/rest.php
index e29e51ffef..ecca594eb4 100644
--- a/civicrm/extern/rest.php
+++ b/civicrm/extern/rest.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/extern/soap.php b/civicrm/extern/soap.php
index 8b812f49c6..0f5bd2081a 100644
--- a/civicrm/extern/soap.php
+++ b/civicrm/extern/soap.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/extern/widget.php b/civicrm/extern/widget.php
index 4d7b04eb71..8b789bede1 100644
--- a/civicrm/extern/widget.php
+++ b/civicrm/extern/widget.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*/
require_once '../civicrm.config.php';
@@ -56,6 +56,10 @@ $output = '
var ' . $jsonvar . ' = ' . json_encode($data) . ';
';
-CRM_Core_Page_AJAX::setJsHeaders(60);
+// FIXME: Not using CRM_Core_Page_AJAX::setJsHeaders because CMS is not bootstrapped
+header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 60));
+header('Content-Type: application/javascript');
+header("Cache-Control: max-age=60, public");
+
echo $output;
CRM_Utils_System::civiExit();
diff --git a/civicrm/install/civicrm.php b/civicrm/install/civicrm.php
index 767a38ebd4..b9f8888fcc 100644
--- a/civicrm/install/civicrm.php
+++ b/civicrm/install/civicrm.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
* @param $filesDirectory
*/
diff --git a/civicrm/install/index.php b/civicrm/install/index.php
index 0295b7c6f7..17a134f03d 100644
--- a/civicrm/install/index.php
+++ b/civicrm/install/index.php
@@ -394,6 +394,18 @@ class InstallRequirements {
ts("An auto_increment_increment value greater than 1 is not currently supported. Please see issue CRM-7923 for further details and potential workaround."),
)
);
+ $testDetails = array(
+ ts("MySQL %1 Configuration", array(1 => $dbName)),
+ ts("Is the provided database name valid?"),
+ ts("The database name provided is not valid. Please use only 0-9, a-z, A-Z and _ as characters in the name."),
+ );
+ if (!CRM_Core_DAO::requireValidDBName($databaseConfig['database'])) {
+ $this->error($testDetails);
+ return FALSE;
+ }
+ else {
+ $this->testing($testDetails);
+ }
$this->requireMySQLThreadStack($databaseConfig['server'],
$databaseConfig['username'],
$databaseConfig['password'],
@@ -1159,7 +1171,8 @@ class InstallRequirements {
return;
}
else {
- if (@mysql_query("CREATE DATABASE $database")) {
+ $query = sprintf("CREATE DATABASE %s", mysql_real_escape_string($database));
+ if (@mysql_query($query)) {
$okay = ts("Able to create a new database.");
}
else {
@@ -1291,8 +1304,8 @@ class Installer extends InstallRequirements {
// skip if database already present
return;
}
-
- if (@mysql_query("CREATE DATABASE $database")) {
+ $query = sprintf("CREATE DATABASE %s", mysql_real_escape_string($database));
+ if (@mysql_query($query)) {
}
else {
$errorTitle = ts("Oops! Could not create database %1", array(1 => $database));
diff --git a/civicrm/js/jquery/jquery.dashboard.js b/civicrm/js/jquery/jquery.dashboard.js
index 1f2a9f0869..d1f68bb4e1 100644
--- a/civicrm/js/jquery/jquery.dashboard.js
+++ b/civicrm/js/jquery/jquery.dashboard.js
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/js/wysiwyg/crm.ckeditor.js b/civicrm/js/wysiwyg/crm.ckeditor.js
index 5130121f84..c684a5140c 100644
--- a/civicrm/js/wysiwyg/crm.ckeditor.js
+++ b/civicrm/js/wysiwyg/crm.ckeditor.js
@@ -68,6 +68,8 @@
$(item).addClass('crm-wysiwyg-enabled');
+ var isFullPage = $(item).hasClass('crm-wysiwyg-fullpage');
+
CKEDITOR.replace($(item)[0], {
filebrowserBrowseUrl: browseUrl + '&type=files',
filebrowserImageBrowseUrl: browseUrl + '&type=images',
@@ -76,6 +78,7 @@
filebrowserImageUploadUrl: uploadUrl + '&type=images',
filebrowserFlashUploadUrl: uploadUrl + '&type=flash',
allowedContent: true, // For CiviMail!
+ fullPage: isFullPage,
customConfig: CRM.config.CKEditorCustomConfig,
on: {
instanceReady: onReady
diff --git a/civicrm/packages/HTML/QuickForm.php b/civicrm/packages/HTML/QuickForm.php
index 99b6d11a78..29df71fdf0 100644
--- a/civicrm/packages/HTML/QuickForm.php
+++ b/civicrm/packages/HTML/QuickForm.php
@@ -1944,7 +1944,7 @@ class HTML_QuickForm extends HTML_Common
// …or should be skipped…
or CRM_Core_HTMLInputCoder::isSkippedField($fldName)
//CRM-17962 - do not encode if element is a wysiwyg editor
- or $this->_elements[$key]->_attributes['class'] = 'crm-form-wysiwyg'
+ or CRM_Utils_Array::value('class', $this->_elements[$key]->_attributes) == 'crm-form-wysiwyg'
) {
// …don’t filter, otherwise filter (else clause below)
} else {
diff --git a/civicrm/packages/VERSIONS.php b/civicrm/packages/VERSIONS.php
index 49a359c1a1..0d35e08153 100644
--- a/civicrm/packages/VERSIONS.php
+++ b/civicrm/packages/VERSIONS.php
@@ -7,7 +7,6 @@
* =================
* + Introduction
* + License Abbreviations
- * + How-To: PEAR install instructions
* + How-To: Manual upgrade of a forked package
* + Package List: PEAR
* + Package List: Manually installed
@@ -24,6 +23,13 @@
* file provides all the notes about how/where to download/upgrade third-party
* library.
*
+ * Note that the packages directory is generally deprecated for
+ * managing dependencies. Instead, one should update a config file
+ * in the main civicrm-core project:
+ *
+ * - For PHP dependencies, use composer.json
+ * - For client-side CSS/JS resources, use bower.json
+ * - For CLI JS tools, use package.json
*
* License Abbreviations
* =====================
@@ -44,23 +50,6 @@
* X11 X11 (a.k.a. MIT) license
*
*
- * How-To: PEAR install instructions
- * =================================
- *
- * pear config-set download_dir /tmp
- * pear config-set bin_dir packages/bin
- * pear config-set doc_dir packages/doc
- * pear config-set ext_dir packages/ext
- * pear config-set php_dir packages
- * pear config-set cache_dir packages/cache
- * pear config-set cfg_dir packages/cfg
- * pear config-set data_dir packages/data
- * pear config-set temp_dir packages/temp
- * pear config-set test_dir packages/test
- * pear config-set www_dir packages/www
- * pear install Archive_Tar # etc., in the main CiviCRM dir
- *
- *
* How-To: Manual upgrade of a forked package
* ==========================================
*
diff --git a/civicrm/settings/Address.setting.php b/civicrm/settings/Address.setting.php
index 6d09ad0ef0..e5e7824fde 100644
--- a/civicrm/settings/Address.setting.php
+++ b/civicrm/settings/Address.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Campaign.setting.php b/civicrm/settings/Campaign.setting.php
index 503fe45aab..0a705f0c5b 100644
--- a/civicrm/settings/Campaign.setting.php
+++ b/civicrm/settings/Campaign.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Contribute.setting.php b/civicrm/settings/Contribute.setting.php
index e0df612cdf..de45ebae61 100644
--- a/civicrm/settings/Contribute.setting.php
+++ b/civicrm/settings/Contribute.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Core.setting.php b/civicrm/settings/Core.setting.php
index 5b5a0ca24f..388f9387ab 100644
--- a/civicrm/settings/Core.setting.php
+++ b/civicrm/settings/Core.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Developer.setting.php b/civicrm/settings/Developer.setting.php
index f94312eff1..da6ac9cfab 100644
--- a/civicrm/settings/Developer.setting.php
+++ b/civicrm/settings/Developer.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Directory.setting.php b/civicrm/settings/Directory.setting.php
index 069d37e024..30f1e088f2 100644
--- a/civicrm/settings/Directory.setting.php
+++ b/civicrm/settings/Directory.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Event.setting.php b/civicrm/settings/Event.setting.php
index d7358097ef..82467ebfd2 100644
--- a/civicrm/settings/Event.setting.php
+++ b/civicrm/settings/Event.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Extension.setting.php b/civicrm/settings/Extension.setting.php
index c1a0432e45..bf43493ab0 100644
--- a/civicrm/settings/Extension.setting.php
+++ b/civicrm/settings/Extension.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Localization.setting.php b/civicrm/settings/Localization.setting.php
index 609e30d866..0864a3f605 100644
--- a/civicrm/settings/Localization.setting.php
+++ b/civicrm/settings/Localization.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
@@ -194,7 +194,7 @@ return array(
'multiple' => 1,
'class' => 'crm-select2',
),
- 'default' => array('1228'),
+ 'default' => array(),
'add' => '4.3',
'title' => 'Available Countries',
'is_domain' => 1,
@@ -216,7 +216,7 @@ return array(
'multiple' => 1,
'class' => 'crm-select2',
),
- 'default' => array('1228'),
+ 'default' => array(),
'add' => '4.3',
'title' => 'Available States and Provinces',
'is_domain' => 1,
diff --git a/civicrm/settings/Mailing.setting.php b/civicrm/settings/Mailing.setting.php
index 415219a0ca..1fb5a4f481 100644
--- a/civicrm/settings/Mailing.setting.php
+++ b/civicrm/settings/Mailing.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Map.setting.php b/civicrm/settings/Map.setting.php
index 3f1a1003af..8d4a5e0bfa 100644
--- a/civicrm/settings/Map.setting.php
+++ b/civicrm/settings/Map.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
* Settings metadata file
diff --git a/civicrm/settings/Member.setting.php b/civicrm/settings/Member.setting.php
index dc1a0e5427..ad9643b70a 100644
--- a/civicrm/settings/Member.setting.php
+++ b/civicrm/settings/Member.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Multisite.setting.php b/civicrm/settings/Multisite.setting.php
index 9406504e83..e4671baec7 100644
--- a/civicrm/settings/Multisite.setting.php
+++ b/civicrm/settings/Multisite.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Search.setting.php b/civicrm/settings/Search.setting.php
index 90faa869ee..b093f14e26 100644
--- a/civicrm/settings/Search.setting.php
+++ b/civicrm/settings/Search.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/settings/Url.setting.php b/civicrm/settings/Url.setting.php
index 886e218beb..62ee3bafa5 100644
--- a/civicrm/settings/Url.setting.php
+++ b/civicrm/settings/Url.setting.php
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -28,7 +28,7 @@
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
* $Id$
*
*/
diff --git a/civicrm/sql/civicrm.mysql b/civicrm/sql/civicrm.mysql
index 609fbd9bfa..3ba2e91189 100644
--- a/civicrm/sql/civicrm.mysql
+++ b/civicrm/sql/civicrm.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
@@ -30,7 +30,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
@@ -2305,7 +2305,7 @@ CREATE TABLE `civicrm_option_value` (
`id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Option ID',
`option_group_id` int unsigned NOT NULL COMMENT 'Group which this option belongs to.',
- `label` varchar(255) NOT NULL COMMENT 'Option string as displayed to users - e.g. the label in an HTML OPTION tag.',
+ `label` varchar(512) NOT NULL COMMENT 'Option string as displayed to users - e.g. the label in an HTML OPTION tag.',
`value` varchar(512) NOT NULL COMMENT 'The actual value stored (as a foreign key) in the data record. Functions which need lookup option_value.title should use civicrm_option_value.option_group_id plus civicrm_option_value.value as the key.',
`name` varchar(255) COMMENT 'Stores a fixed (non-translated) name for this option value. Lookup functions should use the name as the key for the option value row.',
`grouping` varchar(255) COMMENT 'Use to sort and/or set display properties for sub-set(s) of options within an option group. EXAMPLE: Use for college_interest field, to differentiate partners from non-partners.',
@@ -2962,7 +2962,7 @@ CREATE TABLE `civicrm_mailing_recipients` (
PRIMARY KEY ( `id` )
-, CONSTRAINT FK_civicrm_mailing_recipients_mailing_id FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_recipients_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_recipients_email_id FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_recipients_phone_id FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE CASCADE
+, CONSTRAINT FK_civicrm_mailing_recipients_mailing_id FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_recipients_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_recipients_email_id FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL, CONSTRAINT FK_civicrm_mailing_recipients_phone_id FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL
) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-- /*******************************************************
@@ -3009,7 +3009,7 @@ CREATE TABLE `civicrm_mailing_event_queue` (
PRIMARY KEY ( `id` )
-, CONSTRAINT FK_civicrm_mailing_event_queue_job_id FOREIGN KEY (`job_id`) REFERENCES `civicrm_mailing_job`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_event_queue_email_id FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_event_queue_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_event_queue_phone_id FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE CASCADE
+, CONSTRAINT FK_civicrm_mailing_event_queue_job_id FOREIGN KEY (`job_id`) REFERENCES `civicrm_mailing_job`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_event_queue_email_id FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL, CONSTRAINT FK_civicrm_mailing_event_queue_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE, CONSTRAINT FK_civicrm_mailing_event_queue_phone_id FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL
) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-- /*******************************************************
diff --git a/civicrm/sql/civicrm_acl.mysql b/civicrm/sql/civicrm_acl.mysql
index 2a61bb591f..6ad540f1b7 100644
--- a/civicrm/sql/civicrm_acl.mysql
+++ b/civicrm/sql/civicrm_acl.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
diff --git a/civicrm/sql/civicrm_case_sql.mysql b/civicrm/sql/civicrm_case_sql.mysql
index bfcc321595..623b7203c2 100644
--- a/civicrm/sql/civicrm_case_sql.mysql
+++ b/civicrm/sql/civicrm_case_sql.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index ed4c6c9f78..2dbc852c3d 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
@@ -297,7 +297,7 @@ INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
@@ -4311,7 +4311,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
@@ -4525,7 +4525,7 @@ INSERT INTO civicrm_currency (id, name, symbol, numeric_code, full_name) VALUES
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
@@ -6337,7 +6337,7 @@ INSERT INTO `civicrm_contact_type`
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
@@ -14122,7 +14122,10 @@ INSERT INTO civicrm_msg_template
{$event.confirm_email_text}
{else}
-Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}.
+ {ts}Thank you for your participation.{/ts}
+ {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to %1.{/ts}
+ {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}
+ {/if}.
{/if}
@@ -14460,7 +14463,9 @@ You were registered by: {$payer.name}
<p>{$event.confirm_email_text|htmlize}</p>
{else}
- <p>Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to <strong>{if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}</strong>.</p>
+ <p>{ts}Thank you for your participation.{/ts}
+ {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}
+ {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}.</p>
{/if}
@@ -14960,7 +14965,10 @@ You were registered by: {$payer.name}
{$event.confirm_email_text}
{else}
-Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}.
+ {ts}Thank you for your participation.{/ts}
+ {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to %1.{/ts}
+ {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}
+ {/if}.
{/if}
@@ -15298,7 +15306,9 @@ You were registered by: {$payer.name}
<p>{$event.confirm_email_text|htmlize}</p>
{else}
- <p>Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to <strong>{if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}</strong>.</p>
+ <p>{ts}Thank you for your participation.{/ts}
+ {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}
+ {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}.</p>
{/if}
@@ -23451,7 +23461,7 @@ VALUES
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
@@ -24267,4 +24277,4 @@ INSERT INTO `civicrm_report_instance`
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 = '4.7.4';
+UPDATE civicrm_domain SET version = '4.7.6';
diff --git a/civicrm/sql/civicrm_demo_processor.mysql b/civicrm/sql/civicrm_demo_processor.mysql
index ead9651db4..06079d84f9 100644
--- a/civicrm/sql/civicrm_demo_processor.mysql
+++ b/civicrm/sql/civicrm_demo_processor.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
diff --git a/civicrm/sql/civicrm_devel_config.mysql b/civicrm/sql/civicrm_devel_config.mysql
index 9a37370b0a..fe7d7fc300 100644
--- a/civicrm/sql/civicrm_devel_config.mysql
+++ b/civicrm/sql/civicrm_devel_config.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
diff --git a/civicrm/sql/civicrm_drop.mysql b/civicrm/sql/civicrm_drop.mysql
index 4ff57602a9..6171d4d7a2 100644
--- a/civicrm/sql/civicrm_drop.mysql
+++ b/civicrm/sql/civicrm_drop.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 868e1db248..9714d6c475 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -399,7 +399,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,'4.7.4',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,'4.7.6',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1477,7 +1477,7 @@ UNLOCK TABLES;
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
diff --git a/civicrm/sql/civicrm_navigation.mysql b/civicrm/sql/civicrm_navigation.mysql
index 71b1e846b1..494ae5c125 100644
--- a/civicrm/sql/civicrm_navigation.mysql
+++ b/civicrm/sql/civicrm_navigation.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
diff --git a/civicrm/sql/civicrm_sample.mysql b/civicrm/sql/civicrm_sample.mysql
index 9e39ff58a1..17d9cbadd1 100644
--- a/civicrm/sql/civicrm_sample.mysql
+++ b/civicrm/sql/civicrm_sample.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
@@ -255,7 +255,7 @@ VALUES
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
diff --git a/civicrm/sql/civicrm_sample_custom_data.mysql b/civicrm/sql/civicrm_sample_custom_data.mysql
index cdcf9185cb..c2589fabc8 100644
--- a/civicrm/sql/civicrm_sample_custom_data.mysql
+++ b/civicrm/sql/civicrm_sample_custom_data.mysql
@@ -1,7 +1,7 @@
-- +--------------------------------------------------------------------+
-- | CiviCRM version 4.7 |
-- +--------------------------------------------------------------------+
--- | Copyright CiviCRM LLC (c) 2004-2015 |
+-- | Copyright CiviCRM LLC (c) 2004-2016 |
-- +--------------------------------------------------------------------+
-- | This file is a part of CiviCRM. |
-- | |
diff --git a/civicrm/templates/CRM/ACL/Form/ACL.tpl b/civicrm/templates/CRM/ACL/Form/ACL.tpl
index c0000865ec..8adaf9ae0d 100644
--- a/civicrm/templates/CRM/ACL/Form/ACL.tpl
+++ b/civicrm/templates/CRM/ACL/Form/ACL.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/ACL/Form/ACLBasic.tpl b/civicrm/templates/CRM/ACL/Form/ACLBasic.tpl
index 705a00cf3d..79f9b85850 100644
--- a/civicrm/templates/CRM/ACL/Form/ACLBasic.tpl
+++ b/civicrm/templates/CRM/ACL/Form/ACLBasic.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/ACL/Form/EntityRole.tpl b/civicrm/templates/CRM/ACL/Form/EntityRole.tpl
index 935aa90240..b46ace6a25 100644
--- a/civicrm/templates/CRM/ACL/Form/EntityRole.tpl
+++ b/civicrm/templates/CRM/ACL/Form/EntityRole.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/ACL/Form/WordPress/Permissions.tpl b/civicrm/templates/CRM/ACL/Form/WordPress/Permissions.tpl
index 571ab47bb3..19942642ee 100644
--- a/civicrm/templates/CRM/ACL/Form/WordPress/Permissions.tpl
+++ b/civicrm/templates/CRM/ACL/Form/WordPress/Permissions.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/ACL/Header.tpl b/civicrm/templates/CRM/ACL/Header.tpl
index bb2448f887..c52e3cb928 100644
--- a/civicrm/templates/CRM/ACL/Header.tpl
+++ b/civicrm/templates/CRM/ACL/Header.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/ACL/Page/ACL.tpl b/civicrm/templates/CRM/ACL/Page/ACL.tpl
index 810ff98852..6ff811c225 100644
--- a/civicrm/templates/CRM/ACL/Page/ACL.tpl
+++ b/civicrm/templates/CRM/ACL/Page/ACL.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/ACL/Page/ACLBasic.tpl b/civicrm/templates/CRM/ACL/Page/ACLBasic.tpl
index ae22584c19..a2fc09cf78 100644
--- a/civicrm/templates/CRM/ACL/Page/ACLBasic.tpl
+++ b/civicrm/templates/CRM/ACL/Page/ACLBasic.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/ACL/Page/EntityRole.tpl b/civicrm/templates/CRM/ACL/Page/EntityRole.tpl
index 14e3318504..24be99764b 100644
--- a/civicrm/templates/CRM/ACL/Page/EntityRole.tpl
+++ b/civicrm/templates/CRM/ACL/Page/EntityRole.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Calendar/ICal.tpl b/civicrm/templates/CRM/Activity/Calendar/ICal.tpl
index 128196832e..cb30852f0e 100644
--- a/civicrm/templates/CRM/Activity/Calendar/ICal.tpl
+++ b/civicrm/templates/CRM/Activity/Calendar/ICal.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Activity.hlp b/civicrm/templates/CRM/Activity/Form/Activity.hlp
index 0a669bf4a2..a76827008c 100644
--- a/civicrm/templates/CRM/Activity/Form/Activity.hlp
+++ b/civicrm/templates/CRM/Activity/Form/Activity.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Activity.tpl b/civicrm/templates/CRM/Activity/Form/Activity.tpl
index 27b7dc37bc..00d47d0396 100644
--- a/civicrm/templates/CRM/Activity/Form/Activity.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Activity.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/ActivityJs.tpl b/civicrm/templates/CRM/Activity/Form/ActivityJs.tpl
index 923e0ccbef..b6fdcf31d9 100644
--- a/civicrm/templates/CRM/Activity/Form/ActivityJs.tpl
+++ b/civicrm/templates/CRM/Activity/Form/ActivityJs.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl b/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl
index 140a84869e..be77083c8b 100644
--- a/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl
+++ b/civicrm/templates/CRM/Activity/Form/ActivityLinks.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/ActivityView.tpl b/civicrm/templates/CRM/Activity/Form/ActivityView.tpl
index f8c36ad366..74c13e068b 100644
--- a/civicrm/templates/CRM/Activity/Form/ActivityView.tpl
+++ b/civicrm/templates/CRM/Activity/Form/ActivityView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Search.tpl b/civicrm/templates/CRM/Activity/Form/Search.tpl
index 2aa796344e..be13bf7381 100644
--- a/civicrm/templates/CRM/Activity/Form/Search.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Search/Common.tpl b/civicrm/templates/CRM/Activity/Form/Search/Common.tpl
index 1dbfecab61..a839d6bf69 100644
--- a/civicrm/templates/CRM/Activity/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Search/Common.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Activity/Form/Search/EmptyResults.tpl
index f99ccc8a6d..4d8f69e3d3 100644
--- a/civicrm/templates/CRM/Activity/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Search/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Selector.tpl b/civicrm/templates/CRM/Activity/Form/Selector.tpl
index d1c8f663fd..562f1abb29 100644
--- a/civicrm/templates/CRM/Activity/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task.tpl b/civicrm/templates/CRM/Activity/Form/Task.tpl
index 2c452e0fee..cc05fce923 100644
--- a/civicrm/templates/CRM/Activity/Form/Task.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/AddToTag.tpl b/civicrm/templates/CRM/Activity/Form/Task/AddToTag.tpl
index 625e726643..c28b85ddfd 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/AddToTag.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/AddToTag.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl b/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl
index a70a95096d..b87f90c921 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/Batch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/Delete.tpl b/civicrm/templates/CRM/Activity/Form/Task/Delete.tpl
index b000fd0c2d..33944039e6 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/Email.tpl b/civicrm/templates/CRM/Activity/Form/Task/Email.tpl
index 5766544343..26d6ff08e9 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/Email.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/FileOnCase.tpl b/civicrm/templates/CRM/Activity/Form/Task/FileOnCase.tpl
index addca92712..50e6890ac0 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/FileOnCase.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/FileOnCase.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/PickOption.tpl b/civicrm/templates/CRM/Activity/Form/Task/PickOption.tpl
index 124415ee86..41d6543c28 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/PickOption.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/PickOption.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Activity/Form/Task/PickProfile.tpl
index 9b6cd37f9b..95da06205e 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/PickProfile.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/Print.tpl b/civicrm/templates/CRM/Activity/Form/Task/Print.tpl
index 5818d5ae49..cec5644133 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl b/civicrm/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl
index c24d544e0c..283528d501 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/SMS.tpl b/civicrm/templates/CRM/Activity/Form/Task/SMS.tpl
index eb50207d49..0e9d755d8c 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/SMS.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/SMS.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl b/civicrm/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl
index 5d4537e8e5..bc0990db32 100644
--- a/civicrm/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl
+++ b/civicrm/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Activity/Import/Form/DataSource.hlp
index 6f488fd1c1..3e821a90c9 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Activity/Import/Form/DataSource.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Activity/Import/Form/DataSource.tpl
index 29a950fafc..dbfb6212c3 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/DataSource.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Import/Form/MapField.tpl b/civicrm/templates/CRM/Activity/Import/Form/MapField.tpl
index 6751b934c9..abe680bec6 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/MapField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Activity/Import/Form/MapTable.tpl
index 6a0abebe7e..eb946350ca 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/MapTable.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Import/Form/Preview.tpl b/civicrm/templates/CRM/Activity/Import/Form/Preview.tpl
index d638e933f5..1e9a74b70a 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Import/Form/Summary.tpl b/civicrm/templates/CRM/Activity/Import/Form/Summary.tpl
index fcda2e09b6..6fa86437d3 100644
--- a/civicrm/templates/CRM/Activity/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Activity/Import/Form/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Page/Tab.tpl b/civicrm/templates/CRM/Activity/Page/Tab.tpl
index 9be853d603..ec2e48c4c3 100644
--- a/civicrm/templates/CRM/Activity/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Activity/Page/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Page/UserDashboard.tpl b/civicrm/templates/CRM/Activity/Page/UserDashboard.tpl
index ca8b3f0fcb..32928a50ca 100644
--- a/civicrm/templates/CRM/Activity/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Activity/Page/UserDashboard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Selector/Activity.tpl b/civicrm/templates/CRM/Activity/Selector/Activity.tpl
index 8e571dadde..247894cd7d 100644
--- a/civicrm/templates/CRM/Activity/Selector/Activity.tpl
+++ b/civicrm/templates/CRM/Activity/Selector/Activity.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Activity/Selector/Selector.tpl b/civicrm/templates/CRM/Activity/Selector/Selector.tpl
index a78c73333b..cf252d8d17 100644
--- a/civicrm/templates/CRM/Activity/Selector/Selector.tpl
+++ b/civicrm/templates/CRM/Activity/Selector/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/CMSUser.tpl b/civicrm/templates/CRM/Admin/Form/CMSUser.tpl
index 3757feb460..d1eb91259a 100644
--- a/civicrm/templates/CRM/Admin/Form/CMSUser.tpl
+++ b/civicrm/templates/CRM/Admin/Form/CMSUser.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/ContactType.tpl b/civicrm/templates/CRM/Admin/Form/ContactType.tpl
index 685e5dc118..892d8dc82e 100644
--- a/civicrm/templates/CRM/Admin/Form/ContactType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/ContactType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Extensions.tpl b/civicrm/templates/CRM/Admin/Form/Extensions.tpl
index f418ca6e8f..6e0cfe7ba5 100644
--- a/civicrm/templates/CRM/Admin/Form/Extensions.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Extensions.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Job.tpl b/civicrm/templates/CRM/Admin/Form/Job.tpl
index 7d04c17cd8..1392dcfdd1 100644
--- a/civicrm/templates/CRM/Admin/Form/Job.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Job.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/LocationType.tpl b/civicrm/templates/CRM/Admin/Form/LocationType.tpl
index 5e7a0cb643..d52baa3974 100644
--- a/civicrm/templates/CRM/Admin/Form/LocationType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/LocationType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/MailSettings.tpl b/civicrm/templates/CRM/Admin/Form/MailSettings.tpl
index 228c6831c9..5e80fd6683 100644
--- a/civicrm/templates/CRM/Admin/Form/MailSettings.tpl
+++ b/civicrm/templates/CRM/Admin/Form/MailSettings.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Mapping.tpl b/civicrm/templates/CRM/Admin/Form/Mapping.tpl
index 57743f234f..5a4e6c2e0c 100644
--- a/civicrm/templates/CRM/Admin/Form/Mapping.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Mapping.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl b/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl
index 3bc17cd2c2..1b33dc60fe 100644
--- a/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl
+++ b/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Navigation.hlp b/civicrm/templates/CRM/Admin/Form/Navigation.hlp
index 86a158915d..5380a1cd73 100644
--- a/civicrm/templates/CRM/Admin/Form/Navigation.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Navigation.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Navigation.tpl b/civicrm/templates/CRM/Admin/Form/Navigation.tpl
index d7d296051b..e9c66010ff 100644
--- a/civicrm/templates/CRM/Admin/Form/Navigation.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Navigation.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/OptionGroup.tpl b/civicrm/templates/CRM/Admin/Form/OptionGroup.tpl
index 2ef3fa46e2..c9db7e198a 100644
--- a/civicrm/templates/CRM/Admin/Form/OptionGroup.tpl
+++ b/civicrm/templates/CRM/Admin/Form/OptionGroup.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Options.tpl b/civicrm/templates/CRM/Admin/Form/Options.tpl
index 8ad0f209df..bc560673ba 100644
--- a/civicrm/templates/CRM/Admin/Form/Options.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Options.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/ParticipantStatusType.tpl b/civicrm/templates/CRM/Admin/Form/ParticipantStatusType.tpl
index 379b827ea5..f13c9b0d1d 100644
--- a/civicrm/templates/CRM/Admin/Form/ParticipantStatusType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/ParticipantStatusType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/PaymentProcessor.tpl b/civicrm/templates/CRM/Admin/Form/PaymentProcessor.tpl
index 98822b18c9..6cae7e77ca 100644
--- a/civicrm/templates/CRM/Admin/Form/PaymentProcessor.tpl
+++ b/civicrm/templates/CRM/Admin/Form/PaymentProcessor.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/PaymentProcessorType.tpl b/civicrm/templates/CRM/Admin/Form/PaymentProcessorType.tpl
index 6e7f4acc51..83c4ab3ffd 100644
--- a/civicrm/templates/CRM/Admin/Form/PaymentProcessorType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/PaymentProcessorType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp b/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp
index 1029e1dd34..a1c11b15cf 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl
index 2cf43dcdfe..f958a37d97 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Campaign.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Campaign.tpl
index 264562f243..7a263b6a63 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Campaign.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Campaign.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.hlp b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.hlp
index 80174dd53c..295e6a16a5 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.hlp
@@ -1,8 +1,8 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.6 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl
index 264562f243..7a263b6a63 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Contribute.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Display.hlp b/civicrm/templates/CRM/Admin/Form/Preferences/Display.hlp
index c9aac2bc47..da233419e6 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Display.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Display.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Display.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Display.tpl
index 962187ddf9..72c137a983 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Event.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Event.tpl
index 264562f243..7a263b6a63 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Event.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Event.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Mailing.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Mailing.tpl
index 264562f243..7a263b6a63 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Mailing.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Mailing.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Member.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Member.tpl
index 264562f243..7a263b6a63 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Member.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Member.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Preferences/Multisite.tpl b/civicrm/templates/CRM/Admin/Form/Preferences/Multisite.tpl
index 264562f243..7a263b6a63 100644
--- a/civicrm/templates/CRM/Admin/Form/Preferences/Multisite.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Preferences/Multisite.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/PreferencesDate.tpl b/civicrm/templates/CRM/Admin/Form/PreferencesDate.tpl
index 67fbff4c9c..9ae5e7c158 100644
--- a/civicrm/templates/CRM/Admin/Form/PreferencesDate.tpl
+++ b/civicrm/templates/CRM/Admin/Form/PreferencesDate.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/RelationshipType.tpl b/civicrm/templates/CRM/Admin/Form/RelationshipType.tpl
index 989372b623..4759c483fd 100644
--- a/civicrm/templates/CRM/Admin/Form/RelationshipType.tpl
+++ b/civicrm/templates/CRM/Admin/Form/RelationshipType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl b/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl
index 557613bb54..b2aa991712 100644
--- a/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl
+++ b/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Component.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Component.hlp
index f9eb5fd488..77963ad662 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Component.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Component.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Component.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Component.tpl
index a4819eb690..e383cb4f65 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Component.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Component.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Date.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Date.hlp
index c1db66283a..4c2686f13b 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Date.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Date.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Date.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Date.tpl
index a587e5b33f..9ce2f55761 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Date.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Date.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Debugging.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Debugging.hlp
index 04bcd735d5..4f8467b43c 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Debugging.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Debugging.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Debugging.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Debugging.tpl
index 3f0766c1dc..3a77c30b32 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Debugging.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Debugging.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Event.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Event.tpl
index 830acf340f..7ea9a62367 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Event.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Event.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Localization.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Localization.hlp
index 453959f6ba..0f70dcf275 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Localization.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Localization.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl
index b715a3a032..8b45377aa2 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Localization.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Mail.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Mail.tpl
index cb0760f1f2..713032e9c0 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Mail.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Mail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Mapping.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Mapping.hlp
index 9cb9297a5f..ff267d9c0c 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Mapping.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Mapping.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Mapping.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Mapping.tpl
index 566e09e754..a432b13645 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Mapping.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Mapping.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
index b995a3fb04..e42d69b130 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Path.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Path.tpl
index 329d7217de..da89614abb 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Path.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Path.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl
index ab0d5926b7..6071bf7fda 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Smtp.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Smtp.tpl
index 175288bcf1..0daf737bb9 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Smtp.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Smtp.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/UF.tpl b/civicrm/templates/CRM/Admin/Form/Setting/UF.tpl
index 10d5837559..32de02897a 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/UF.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/UF.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl b/civicrm/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
index 4d70119fa5..76fcd5875c 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Url.hlp b/civicrm/templates/CRM/Admin/Form/Setting/Url.hlp
index c26e3d7659..55ec5b6698 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Url.hlp
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Url.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl b/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl
index 1c0b5e64dd..144dbc0d73 100644
--- a/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/Tag.tpl b/civicrm/templates/CRM/Admin/Form/Tag.tpl
index 068d9fbc71..fa60d2265a 100644
--- a/civicrm/templates/CRM/Admin/Form/Tag.tpl
+++ b/civicrm/templates/CRM/Admin/Form/Tag.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/WordReplacements.hlp b/civicrm/templates/CRM/Admin/Form/WordReplacements.hlp
index 93c535fbfb..9c0bc7cd0f 100644
--- a/civicrm/templates/CRM/Admin/Form/WordReplacements.hlp
+++ b/civicrm/templates/CRM/Admin/Form/WordReplacements.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Form/WordReplacements.tpl b/civicrm/templates/CRM/Admin/Form/WordReplacements.tpl
index a75fbabbd4..f20ea7415d 100644
--- a/civicrm/templates/CRM/Admin/Form/WordReplacements.tpl
+++ b/civicrm/templates/CRM/Admin/Form/WordReplacements.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/APIExplorer.hlp b/civicrm/templates/CRM/Admin/Page/APIExplorer.hlp
index cb9b555fe8..a5c23f152c 100644
--- a/civicrm/templates/CRM/Admin/Page/APIExplorer.hlp
+++ b/civicrm/templates/CRM/Admin/Page/APIExplorer.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl b/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl
index e709acf3c0..ae17f57af3 100644
--- a/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Access.tpl b/civicrm/templates/CRM/Admin/Page/Access.tpl
index 58ecc0c19c..2122f9aa64 100644
--- a/civicrm/templates/CRM/Admin/Page/Access.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Access.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Admin.tpl b/civicrm/templates/CRM/Admin/Page/Admin.tpl
index 4bb4175520..b556befb87 100644
--- a/civicrm/templates/CRM/Admin/Page/Admin.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Admin.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/CKEditorConfig.tpl b/civicrm/templates/CRM/Admin/Page/CKEditorConfig.tpl
index 0024b4d46b..0f435b1898 100644
--- a/civicrm/templates/CRM/Admin/Page/CKEditorConfig.tpl
+++ b/civicrm/templates/CRM/Admin/Page/CKEditorConfig.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/ConfigTaskList.tpl b/civicrm/templates/CRM/Admin/Page/ConfigTaskList.tpl
index 7a611c03e3..b10b1a6ef6 100644
--- a/civicrm/templates/CRM/Admin/Page/ConfigTaskList.tpl
+++ b/civicrm/templates/CRM/Admin/Page/ConfigTaskList.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/ContactType.hlp b/civicrm/templates/CRM/Admin/Page/ContactType.hlp
index 04f0b63a1a..f10c5fa07a 100644
--- a/civicrm/templates/CRM/Admin/Page/ContactType.hlp
+++ b/civicrm/templates/CRM/Admin/Page/ContactType.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/ContactType.tpl b/civicrm/templates/CRM/Admin/Page/ContactType.tpl
index 6cf85d8f6e..aa1362407b 100644
--- a/civicrm/templates/CRM/Admin/Page/ContactType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/ContactType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/EventTemplate.tpl b/civicrm/templates/CRM/Admin/Page/EventTemplate.tpl
index 482912eee4..7b0b045a9c 100644
--- a/civicrm/templates/CRM/Admin/Page/EventTemplate.tpl
+++ b/civicrm/templates/CRM/Admin/Page/EventTemplate.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Extensions.tpl b/civicrm/templates/CRM/Admin/Page/Extensions.tpl
index baca8382af..3eecc60172 100644
--- a/civicrm/templates/CRM/Admin/Page/Extensions.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Extensions.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Job.tpl b/civicrm/templates/CRM/Admin/Page/Job.tpl
index 88ace7fa81..08eaf90133 100644
--- a/civicrm/templates/CRM/Admin/Page/Job.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Job.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/JobLog.tpl b/civicrm/templates/CRM/Admin/Page/JobLog.tpl
index 9c78160a3d..b77b8f7ed2 100644
--- a/civicrm/templates/CRM/Admin/Page/JobLog.tpl
+++ b/civicrm/templates/CRM/Admin/Page/JobLog.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/LocationType.tpl b/civicrm/templates/CRM/Admin/Page/LocationType.tpl
index 6943670031..04206df2fb 100644
--- a/civicrm/templates/CRM/Admin/Page/LocationType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/LocationType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/MailSettings.tpl b/civicrm/templates/CRM/Admin/Page/MailSettings.tpl
index 5d2e494109..068af133ac 100644
--- a/civicrm/templates/CRM/Admin/Page/MailSettings.tpl
+++ b/civicrm/templates/CRM/Admin/Page/MailSettings.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Mapping.tpl b/civicrm/templates/CRM/Admin/Page/Mapping.tpl
index 5b17c6548a..cf7940377f 100644
--- a/civicrm/templates/CRM/Admin/Page/Mapping.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Mapping.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/MessageTemplates.hlp b/civicrm/templates/CRM/Admin/Page/MessageTemplates.hlp
index 0e724ef2c0..a77341d485 100644
--- a/civicrm/templates/CRM/Admin/Page/MessageTemplates.hlp
+++ b/civicrm/templates/CRM/Admin/Page/MessageTemplates.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl b/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl
index 55ffad67e9..4e845c2c41 100644
--- a/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Navigation.hlp b/civicrm/templates/CRM/Admin/Page/Navigation.hlp
index 133fe43f17..b38148d25b 100644
--- a/civicrm/templates/CRM/Admin/Page/Navigation.hlp
+++ b/civicrm/templates/CRM/Admin/Page/Navigation.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Navigation.tpl b/civicrm/templates/CRM/Admin/Page/Navigation.tpl
index 1c0ce8646a..a8107633d6 100644
--- a/civicrm/templates/CRM/Admin/Page/Navigation.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Navigation.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/OptionGroup.tpl b/civicrm/templates/CRM/Admin/Page/OptionGroup.tpl
index a9005e0285..c5eebb2300 100644
--- a/civicrm/templates/CRM/Admin/Page/OptionGroup.tpl
+++ b/civicrm/templates/CRM/Admin/Page/OptionGroup.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Options.hlp b/civicrm/templates/CRM/Admin/Page/Options.hlp
index e5b6ebef36..e5bcce2402 100644
--- a/civicrm/templates/CRM/Admin/Page/Options.hlp
+++ b/civicrm/templates/CRM/Admin/Page/Options.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Options.tpl b/civicrm/templates/CRM/Admin/Page/Options.tpl
index 104760f65e..971987da48 100644
--- a/civicrm/templates/CRM/Admin/Page/Options.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Options.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.hlp b/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.hlp
index 8700310668..1a89244be2 100644
--- a/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.hlp
+++ b/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.tpl
index 12c4c5793d..378ee9c8b2 100644
--- a/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/ParticipantStatusType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/PaymentProcessor.hlp b/civicrm/templates/CRM/Admin/Page/PaymentProcessor.hlp
index 43457607c9..704aae9957 100644
--- a/civicrm/templates/CRM/Admin/Page/PaymentProcessor.hlp
+++ b/civicrm/templates/CRM/Admin/Page/PaymentProcessor.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/PaymentProcessor.tpl b/civicrm/templates/CRM/Admin/Page/PaymentProcessor.tpl
index 940ba1597a..bf87ecce30 100644
--- a/civicrm/templates/CRM/Admin/Page/PaymentProcessor.tpl
+++ b/civicrm/templates/CRM/Admin/Page/PaymentProcessor.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/civicrm/templates/CRM/Admin/Page/PaymentProcessorType.tpl
index c2bf7fb735..50ea70f317 100644
--- a/civicrm/templates/CRM/Admin/Page/PaymentProcessorType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/PaymentProcessorType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/PreferencesDate.tpl b/civicrm/templates/CRM/Admin/Page/PreferencesDate.tpl
index 0c6d319d81..0613b4f967 100644
--- a/civicrm/templates/CRM/Admin/Page/PreferencesDate.tpl
+++ b/civicrm/templates/CRM/Admin/Page/PreferencesDate.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/RelationshipType.hlp b/civicrm/templates/CRM/Admin/Page/RelationshipType.hlp
index 53b61bfa6a..e698649a15 100644
--- a/civicrm/templates/CRM/Admin/Page/RelationshipType.hlp
+++ b/civicrm/templates/CRM/Admin/Page/RelationshipType.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/RelationshipType.tpl b/civicrm/templates/CRM/Admin/Page/RelationshipType.tpl
index 1e4f272647..d9ab8c945e 100644
--- a/civicrm/templates/CRM/Admin/Page/RelationshipType.tpl
+++ b/civicrm/templates/CRM/Admin/Page/RelationshipType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Reminders.tpl b/civicrm/templates/CRM/Admin/Page/Reminders.tpl
index f4da9a0537..6e8282394b 100644
--- a/civicrm/templates/CRM/Admin/Page/Reminders.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Reminders.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/ScheduleReminders.hlp b/civicrm/templates/CRM/Admin/Page/ScheduleReminders.hlp
index 01f342f61b..d8e397631b 100644
--- a/civicrm/templates/CRM/Admin/Page/ScheduleReminders.hlp
+++ b/civicrm/templates/CRM/Admin/Page/ScheduleReminders.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/ScheduleReminders.tpl b/civicrm/templates/CRM/Admin/Page/ScheduleReminders.tpl
index cca81aa175..98139de006 100644
--- a/civicrm/templates/CRM/Admin/Page/ScheduleReminders.tpl
+++ b/civicrm/templates/CRM/Admin/Page/ScheduleReminders.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Setting.tpl b/civicrm/templates/CRM/Admin/Page/Setting.tpl
index 0417ea147d..46321a06b2 100644
--- a/civicrm/templates/CRM/Admin/Page/Setting.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Setting.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Admin/Page/Tag.tpl b/civicrm/templates/CRM/Admin/Page/Tag.tpl
index e84b2df5e2..bb6dfd9289 100644
--- a/civicrm/templates/CRM/Admin/Page/Tag.tpl
+++ b/civicrm/templates/CRM/Admin/Page/Tag.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Badge/Form/Layout.tpl b/civicrm/templates/CRM/Badge/Form/Layout.tpl
index b74979dc00..3d5ca0748f 100644
--- a/civicrm/templates/CRM/Badge/Form/Layout.tpl
+++ b/civicrm/templates/CRM/Badge/Form/Layout.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Badge/Page/Layout.hlp b/civicrm/templates/CRM/Badge/Page/Layout.hlp
index 73446b5b48..a06f58c6f9 100644
--- a/civicrm/templates/CRM/Badge/Page/Layout.hlp
+++ b/civicrm/templates/CRM/Badge/Page/Layout.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Badge/Page/Layout.tpl b/civicrm/templates/CRM/Badge/Page/Layout.tpl
index ccbc1f298f..7b53f63c42 100644
--- a/civicrm/templates/CRM/Badge/Page/Layout.tpl
+++ b/civicrm/templates/CRM/Badge/Page/Layout.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Batch/Form/Batch.tpl b/civicrm/templates/CRM/Batch/Form/Batch.tpl
index 93094641b9..8ecd4cff22 100644
--- a/civicrm/templates/CRM/Batch/Form/Batch.tpl
+++ b/civicrm/templates/CRM/Batch/Form/Batch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Batch/Form/Entry.tpl b/civicrm/templates/CRM/Batch/Form/Entry.tpl
index 7d4c2b3d38..0e7b836913 100644
--- a/civicrm/templates/CRM/Batch/Form/Entry.tpl
+++ b/civicrm/templates/CRM/Batch/Form/Entry.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Batch/Form/Search.tpl b/civicrm/templates/CRM/Batch/Form/Search.tpl
index 4a5a5ed77b..1d38002fc3 100644
--- a/civicrm/templates/CRM/Batch/Form/Search.tpl
+++ b/civicrm/templates/CRM/Batch/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Batch/Page/Batch.tpl b/civicrm/templates/CRM/Batch/Page/Batch.tpl
index 6c015ce96a..b9b8971784 100644
--- a/civicrm/templates/CRM/Batch/Page/Batch.tpl
+++ b/civicrm/templates/CRM/Batch/Page/Batch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Block/Add.tpl b/civicrm/templates/CRM/Block/Add.tpl
index 720f888681..666a5aa4b0 100644
--- a/civicrm/templates/CRM/Block/Add.tpl
+++ b/civicrm/templates/CRM/Block/Add.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Block/Dashboard.tpl b/civicrm/templates/CRM/Block/Dashboard.tpl
index afbec178c2..5e1e15ee7e 100644
--- a/civicrm/templates/CRM/Block/Dashboard.tpl
+++ b/civicrm/templates/CRM/Block/Dashboard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Block/Event.tpl b/civicrm/templates/CRM/Block/Event.tpl
index d4c8623bd6..39d00bcf9c 100644
--- a/civicrm/templates/CRM/Block/Event.tpl
+++ b/civicrm/templates/CRM/Block/Event.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Block/FullTextSearch.tpl b/civicrm/templates/CRM/Block/FullTextSearch.tpl
index 75084e0763..5b8c93437d 100644
--- a/civicrm/templates/CRM/Block/FullTextSearch.tpl
+++ b/civicrm/templates/CRM/Block/FullTextSearch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Block/LangSwitch.tpl b/civicrm/templates/CRM/Block/LangSwitch.tpl
index f402b77c4a..7ce80763ef 100644
--- a/civicrm/templates/CRM/Block/LangSwitch.tpl
+++ b/civicrm/templates/CRM/Block/LangSwitch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Block/Mail.tpl b/civicrm/templates/CRM/Block/Mail.tpl
index 43be5a7185..8f8b654631 100644
--- a/civicrm/templates/CRM/Block/Mail.tpl
+++ b/civicrm/templates/CRM/Block/Mail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Block/RecentlyViewed.tpl b/civicrm/templates/CRM/Block/RecentlyViewed.tpl
index ff0098d29c..c4eb7fe41e 100644
--- a/civicrm/templates/CRM/Block/RecentlyViewed.tpl
+++ b/civicrm/templates/CRM/Block/RecentlyViewed.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Block/Subject.tpl b/civicrm/templates/CRM/Block/Subject.tpl
index d25b8f67ad..3f1a45e7f9 100644
--- a/civicrm/templates/CRM/Block/Subject.tpl
+++ b/civicrm/templates/CRM/Block/Subject.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Block/blocks.tpl b/civicrm/templates/CRM/Block/blocks.tpl
index a758fe8c7a..2105955bd4 100644
--- a/civicrm/templates/CRM/Block/blocks.tpl
+++ b/civicrm/templates/CRM/Block/blocks.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Campaign.tpl b/civicrm/templates/CRM/Campaign/Form/Campaign.tpl
index 231c7f7957..f5a0be2139 100644
--- a/civicrm/templates/CRM/Campaign/Form/Campaign.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Campaign.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Gotv.tpl b/civicrm/templates/CRM/Campaign/Form/Gotv.tpl
index 16bbcfce69..77fe025cae 100644
--- a/civicrm/templates/CRM/Campaign/Form/Gotv.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Gotv.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Petition.tpl b/civicrm/templates/CRM/Campaign/Form/Petition.tpl
index 98f4860510..c380b3c264 100644
--- a/civicrm/templates/CRM/Campaign/Form/Petition.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Petition.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Petition/Signature.tpl b/civicrm/templates/CRM/Campaign/Form/Petition/Signature.tpl
index c492db7b6b..b03dd36982 100644
--- a/civicrm/templates/CRM/Campaign/Form/Petition/Signature.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Petition/Signature.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/ResultOptions.tpl b/civicrm/templates/CRM/Campaign/Form/ResultOptions.tpl
index 404ab0de30..2eb12fb43d 100644
--- a/civicrm/templates/CRM/Campaign/Form/ResultOptions.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/ResultOptions.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Search.tpl b/civicrm/templates/CRM/Campaign/Form/Search.tpl
index aabafb93a2..9b03d611c2 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl
index ee3000049c..73b8e5234c 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl
index 894c312ebf..c766412fb7 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Campaign/Form/Search/EmptyResults.tpl
index 7e16eb695a..3cb5ddc03c 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl
index 64ba5a5e62..9f957ae073 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl b/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl
index 4352178dac..a64a455658 100644
--- a/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Selector.tpl b/civicrm/templates/CRM/Campaign/Form/Selector.tpl
index 592da7e6bf..cab96ccced 100644
--- a/civicrm/templates/CRM/Campaign/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Delete.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Delete.tpl
index 1fe56e8ad2..657a5432b7 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Delete.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl
index ed581701c6..3d1670fa37 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Questions.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Questions.tpl
index 2b380bd839..9b265ff3d3 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Questions.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Questions.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl
index 17e5252fc8..3945e7faf6 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Survey/Tab.tpl b/civicrm/templates/CRM/Campaign/Form/Survey/Tab.tpl
index ef1dc7ad2c..c9179dcda4 100644
--- a/civicrm/templates/CRM/Campaign/Form/Survey/Tab.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Survey/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Interview.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Interview.tpl
index 0be9238635..5dc1343295 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Interview.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Interview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Print.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Print.tpl
index 231688302f..34caaf3a72 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Release.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Release.tpl
index 184ea002a5..0d9ee7cb1a 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Release.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Release.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl
index 34aa42c752..bfd3dd852c 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/Task/Result.tpl b/civicrm/templates/CRM/Campaign/Form/Task/Result.tpl
index e7ff1b0eac..d21fe6309a 100644
--- a/civicrm/templates/CRM/Campaign/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Campaign/Form/Task/Result.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Form/addCampaignToComponent.hlp b/civicrm/templates/CRM/Campaign/Form/addCampaignToComponent.hlp
index 2f44239d6a..dae8524c6a 100644
--- a/civicrm/templates/CRM/Campaign/Form/addCampaignToComponent.hlp
+++ b/civicrm/templates/CRM/Campaign/Form/addCampaignToComponent.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Page/DashBoard.tpl b/civicrm/templates/CRM/Campaign/Page/DashBoard.tpl
index 382476b2e3..ecb39fea76 100644
--- a/civicrm/templates/CRM/Campaign/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/DashBoard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Page/Petition.tpl b/civicrm/templates/CRM/Campaign/Page/Petition.tpl
index e315c81e11..bcb027da85 100644
--- a/civicrm/templates/CRM/Campaign/Page/Petition.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/Petition.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Page/Petition/Confirm.tpl b/civicrm/templates/CRM/Campaign/Page/Petition/Confirm.tpl
index c2c18dd071..806c2a683a 100644
--- a/civicrm/templates/CRM/Campaign/Page/Petition/Confirm.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/Petition/Confirm.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Page/Petition/ThankYou.tpl b/civicrm/templates/CRM/Campaign/Page/Petition/ThankYou.tpl
index e13439c7da..336fade84a 100644
--- a/civicrm/templates/CRM/Campaign/Page/Petition/ThankYou.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/Petition/ThankYou.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Campaign/Page/Vote.tpl b/civicrm/templates/CRM/Campaign/Page/Vote.tpl
index 5c3783fd7b..319ea7f27d 100644
--- a/civicrm/templates/CRM/Campaign/Page/Vote.tpl
+++ b/civicrm/templates/CRM/Campaign/Page/Vote.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Audit/Audit.tpl b/civicrm/templates/CRM/Case/Audit/Audit.tpl
index d4f65db9c0..3fcd10b819 100644
--- a/civicrm/templates/CRM/Case/Audit/Audit.tpl
+++ b/civicrm/templates/CRM/Case/Audit/Audit.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Audit/Report.tpl b/civicrm/templates/CRM/Case/Audit/Report.tpl
index e82e80814b..eb024b500d 100644
--- a/civicrm/templates/CRM/Case/Audit/Report.tpl
+++ b/civicrm/templates/CRM/Case/Audit/Report.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Activity.tpl b/civicrm/templates/CRM/Case/Form/Activity.tpl
index d937eb43f1..1f1baa6c8b 100644
--- a/civicrm/templates/CRM/Case/Form/Activity.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStartDate.tpl b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStartDate.tpl
index 2dab26f6dc..b4549607da 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStartDate.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStartDate.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStatus.tpl b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStatus.tpl
index 1d5721f2b9..e7a64b1a6a 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStatus.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseStatus.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseType.tpl b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseType.tpl
index f8b2a0380f..679d660b49 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseType.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/ChangeCaseType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Activity/LinkCases.tpl b/civicrm/templates/CRM/Case/Form/Activity/LinkCases.tpl
index 5b4b4fe5c4..32a3fa0365 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/LinkCases.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/LinkCases.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Activity/OpenCase.tpl b/civicrm/templates/CRM/Case/Form/Activity/OpenCase.tpl
index d86c63fb8e..58f7e5c731 100644
--- a/civicrm/templates/CRM/Case/Form/Activity/OpenCase.tpl
+++ b/civicrm/templates/CRM/Case/Form/Activity/OpenCase.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/ActivityTab.tpl b/civicrm/templates/CRM/Case/Form/ActivityTab.tpl
index a0459e7c10..a4b52e1e41 100644
--- a/civicrm/templates/CRM/Case/Form/ActivityTab.tpl
+++ b/civicrm/templates/CRM/Case/Form/ActivityTab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/ActivityToCase.tpl b/civicrm/templates/CRM/Case/Form/ActivityToCase.tpl
index c171f14301..9b94500978 100644
--- a/civicrm/templates/CRM/Case/Form/ActivityToCase.tpl
+++ b/civicrm/templates/CRM/Case/Form/ActivityToCase.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/ActivityView.tpl b/civicrm/templates/CRM/Case/Form/ActivityView.tpl
index b9d24da200..7345bd9fc3 100644
--- a/civicrm/templates/CRM/Case/Form/ActivityView.tpl
+++ b/civicrm/templates/CRM/Case/Form/ActivityView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Case.hlp b/civicrm/templates/CRM/Case/Form/Case.hlp
index babac9c9da..50952df9bd 100644
--- a/civicrm/templates/CRM/Case/Form/Case.hlp
+++ b/civicrm/templates/CRM/Case/Form/Case.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Case.tpl b/civicrm/templates/CRM/Case/Form/Case.tpl
index 90f490e547..f4eba529a8 100644
--- a/civicrm/templates/CRM/Case/Form/Case.tpl
+++ b/civicrm/templates/CRM/Case/Form/Case.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/CaseView.tpl b/civicrm/templates/CRM/Case/Form/CaseView.tpl
index ba477db777..04270aa28e 100644
--- a/civicrm/templates/CRM/Case/Form/CaseView.tpl
+++ b/civicrm/templates/CRM/Case/Form/CaseView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/CustomData.tpl b/civicrm/templates/CRM/Case/Form/CustomData.tpl
index 4c30e91c38..2b7b18c002 100644
--- a/civicrm/templates/CRM/Case/Form/CustomData.tpl
+++ b/civicrm/templates/CRM/Case/Form/CustomData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/EditClient.tpl b/civicrm/templates/CRM/Case/Form/EditClient.tpl
index 65b5787a39..a81828491a 100644
--- a/civicrm/templates/CRM/Case/Form/EditClient.tpl
+++ b/civicrm/templates/CRM/Case/Form/EditClient.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Report.tpl b/civicrm/templates/CRM/Case/Form/Report.tpl
index c77ec56269..cfdfac6722 100644
--- a/civicrm/templates/CRM/Case/Form/Report.tpl
+++ b/civicrm/templates/CRM/Case/Form/Report.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Search.tpl b/civicrm/templates/CRM/Case/Form/Search.tpl
index af3d5e0c0d..560442d20a 100644
--- a/civicrm/templates/CRM/Case/Form/Search.tpl
+++ b/civicrm/templates/CRM/Case/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl
index 2b3eb84a63..913f2f6b5a 100644
--- a/civicrm/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Search/Common.tpl b/civicrm/templates/CRM/Case/Form/Search/Common.tpl
index 68652ea6e6..d2569c0ca1 100644
--- a/civicrm/templates/CRM/Case/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Case/Form/Search/Common.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Case/Form/Search/EmptyResults.tpl
index 39cdab1cf3..19f415d852 100644
--- a/civicrm/templates/CRM/Case/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Case/Form/Search/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Selector.tpl b/civicrm/templates/CRM/Case/Form/Selector.tpl
index 1d2c55caaf..b6cc8c692b 100644
--- a/civicrm/templates/CRM/Case/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Case/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Task.tpl b/civicrm/templates/CRM/Case/Form/Task.tpl
index 6a18ff1de2..085c6d0e78 100644
--- a/civicrm/templates/CRM/Case/Form/Task.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Task/Delete.tpl b/civicrm/templates/CRM/Case/Form/Task/Delete.tpl
index 4c86bf546c..389b28cd6c 100644
--- a/civicrm/templates/CRM/Case/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Task/Print.tpl b/civicrm/templates/CRM/Case/Form/Task/Print.tpl
index 108d816648..7a3fe442e8 100644
--- a/civicrm/templates/CRM/Case/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/Task/Restore.tpl b/civicrm/templates/CRM/Case/Form/Task/Restore.tpl
index 443867ca10..cc34acdff1 100644
--- a/civicrm/templates/CRM/Case/Form/Task/Restore.tpl
+++ b/civicrm/templates/CRM/Case/Form/Task/Restore.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Form/ViewRelatedCases.tpl b/civicrm/templates/CRM/Case/Form/ViewRelatedCases.tpl
index d95fc25e42..340a1656e9 100644
--- a/civicrm/templates/CRM/Case/Form/ViewRelatedCases.tpl
+++ b/civicrm/templates/CRM/Case/Form/ViewRelatedCases.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Page/CaseDetails.tpl b/civicrm/templates/CRM/Case/Page/CaseDetails.tpl
index bc361056cf..473c0fef61 100644
--- a/civicrm/templates/CRM/Case/Page/CaseDetails.tpl
+++ b/civicrm/templates/CRM/Case/Page/CaseDetails.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Page/ConfigureError.tpl b/civicrm/templates/CRM/Case/Page/ConfigureError.tpl
index 4181374142..3e47b8a2ac 100644
--- a/civicrm/templates/CRM/Case/Page/ConfigureError.tpl
+++ b/civicrm/templates/CRM/Case/Page/ConfigureError.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Page/CustomDataView.tpl b/civicrm/templates/CRM/Case/Page/CustomDataView.tpl
index 2c4d5fcacc..24b2fe3240 100644
--- a/civicrm/templates/CRM/Case/Page/CustomDataView.tpl
+++ b/civicrm/templates/CRM/Case/Page/CustomDataView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Page/DashBoard.tpl b/civicrm/templates/CRM/Case/Page/DashBoard.tpl
index 9a6fa0967a..0b1de32d84 100644
--- a/civicrm/templates/CRM/Case/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Case/Page/DashBoard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Page/DashboardSelector.tpl b/civicrm/templates/CRM/Case/Page/DashboardSelector.tpl
index 2546998e01..edb1a1b866 100644
--- a/civicrm/templates/CRM/Case/Page/DashboardSelector.tpl
+++ b/civicrm/templates/CRM/Case/Page/DashboardSelector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/Page/Tab.tpl b/civicrm/templates/CRM/Case/Page/Tab.tpl
index 84d8acee9c..d7313ec36b 100644
--- a/civicrm/templates/CRM/Case/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Case/Page/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Case/XMLProcessor/Report.tpl b/civicrm/templates/CRM/Case/XMLProcessor/Report.tpl
index d1f1deb4bc..e600efbde9 100644
--- a/civicrm/templates/CRM/Case/XMLProcessor/Report.tpl
+++ b/civicrm/templates/CRM/Case/XMLProcessor/Report.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Contact.hlp b/civicrm/templates/CRM/Contact/Form/Contact.hlp
index 2e9780b0a5..e469aaac6b 100644
--- a/civicrm/templates/CRM/Contact/Form/Contact.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Contact.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Contact.tpl b/civicrm/templates/CRM/Contact/Form/Contact.tpl
index 520d9d7e25..5d1af722cb 100644
--- a/civicrm/templates/CRM/Contact/Form/Contact.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Contact.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/CustomData.tpl b/civicrm/templates/CRM/Contact/Form/CustomData.tpl
index 5652298f5f..fdbc285055 100644
--- a/civicrm/templates/CRM/Contact/Form/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Form/CustomData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/DedupeFind.tpl b/civicrm/templates/CRM/Contact/Form/DedupeFind.tpl
index 5edb6792a6..457d84d1ed 100644
--- a/civicrm/templates/CRM/Contact/Form/DedupeFind.tpl
+++ b/civicrm/templates/CRM/Contact/Form/DedupeFind.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/DedupeRules.tpl b/civicrm/templates/CRM/Contact/Form/DedupeRules.tpl
index 6f6e7e273f..b5902e1cd2 100644
--- a/civicrm/templates/CRM/Contact/Form/DedupeRules.tpl
+++ b/civicrm/templates/CRM/Contact/Form/DedupeRules.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Domain.hlp b/civicrm/templates/CRM/Contact/Form/Domain.hlp
index df2f261749..89360c1949 100644
--- a/civicrm/templates/CRM/Contact/Form/Domain.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Domain.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Domain.tpl b/civicrm/templates/CRM/Contact/Form/Domain.tpl
index b76905124d..45c3b8d0d9 100644
--- a/civicrm/templates/CRM/Contact/Form/Domain.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Domain.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl
index 312a4e15fd..d0a66aa7db 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl
index c474d0dbb6..27471a8104 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomField.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomField.tpl
index 8a1bade7d3..6803ca5c91 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomField.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
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 09b9aef918..6fc4adc6e6 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/address_name.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/address_name.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
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 710ea192f5..7cf9fdf37d 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
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
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 fefc550aab..ad85c2015e 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
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Address/county.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Address/county.tpl
index e9c2243a83..e3830c36de 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/county.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/county.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
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 79e2afaa55..72d38e5cc0 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
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 c2ea212ee2..39533891de 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Address/street_address.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Address/street_address.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
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 213800d832..fd07a49728 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
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
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 6fed10e5ac..c89378d427 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
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl b/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl
index dbc3c2591a..6df37cc9ea 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl b/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
index 25290c16e4..c2070c931d 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl b/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl
index 1c5db1a73a..5d2f25703d 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
index 883ebf6ce8..bb594604ee 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
index 90adbb5d81..8c57bf7fe3 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Household.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Household.tpl
index 69595d8b27..a7fafbf5df 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Household.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Household.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/IM.tpl b/civicrm/templates/CRM/Contact/Form/Edit/IM.tpl
index a4bd50bd92..e80912f403 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/IM.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/IM.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Individual.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Individual.tpl
index 502f4167aa..4c97ead2d1 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Individual.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Individual.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl
index 32b1646d6e..0ace2be5c4 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/OpenID.tpl b/civicrm/templates/CRM/Contact/Form/Edit/OpenID.tpl
index a33a83db87..a9db6d89e7 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/OpenID.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/OpenID.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Organization.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Organization.tpl
index dae4db524f..3adff1745a 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Organization.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Organization.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Phone.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Phone.tpl
index fccc914ec9..18bec0d95a 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Phone.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Phone.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index 66eb4ba3c8..eb0e2d1f92 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Tagtree.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Tagtree.tpl
index c4c1f72515..8347fc06d0 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Tagtree.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Tagtree.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Edit/Website.tpl b/civicrm/templates/CRM/Contact/Form/Edit/Website.tpl
index d6cb171009..9c78e1e75f 100644
--- a/civicrm/templates/CRM/Contact/Form/Edit/Website.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Edit/Website.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/GroupContact.tpl b/civicrm/templates/CRM/Contact/Form/GroupContact.tpl
index 2bfa32cfa7..052bd19554 100644
--- a/civicrm/templates/CRM/Contact/Form/GroupContact.tpl
+++ b/civicrm/templates/CRM/Contact/Form/GroupContact.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Address.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Address.tpl
index 2b1ce26d65..ea8c1478cb 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Address.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Address.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl b/civicrm/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
index a561a9bfb0..2baab4dc9e 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/ContactInfo.tpl b/civicrm/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
index 60ca2ff3e9..8ff0ca9c70 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/ContactName.tpl b/civicrm/templates/CRM/Contact/Form/Inline/ContactName.tpl
index de0943ccd9..6c1281c30d 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/ContactName.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/ContactName.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/CustomData.tpl b/civicrm/templates/CRM/Contact/Form/Inline/CustomData.tpl
index 7ffa6633fd..6e89741f4d 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/CustomData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl
index 4b36009f8a..f0a615117f 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Email.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Email.tpl
index eac37a346d..0bb31c7b33 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Email.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/IM.tpl b/civicrm/templates/CRM/Contact/Form/Inline/IM.tpl
index c0c087e0e0..ae7dbff5df 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/IM.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/IM.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/OpenID.tpl b/civicrm/templates/CRM/Contact/Form/Inline/OpenID.tpl
index 0e99624120..0b7eb8e978 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/OpenID.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/OpenID.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Phone.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Phone.tpl
index 82b67534ae..31438f5804 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Phone.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Phone.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Inline/Website.tpl b/civicrm/templates/CRM/Contact/Form/Inline/Website.tpl
index 5f07e1cb34..6d22978d10 100644
--- a/civicrm/templates/CRM/Contact/Form/Inline/Website.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Inline/Website.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Merge.hlp b/civicrm/templates/CRM/Contact/Form/Merge.hlp
index dac3195302..98137d627a 100644
--- a/civicrm/templates/CRM/Contact/Form/Merge.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Merge.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Merge.tpl b/civicrm/templates/CRM/Contact/Form/Merge.tpl
index 4611605994..6e569d5e82 100644
--- a/civicrm/templates/CRM/Contact/Form/Merge.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Merge.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -227,7 +227,7 @@
// If the location was changed, lookup the type if it exists
if (type == 'locTypeId') {
locTypeId = element.value;
- typeTypeId = CRM.$( 'select#type_' + blockname + '_' + blockId + '_typeTypeId' ).val();
+ typeTypeId = CRM.$( 'select#location_' + blockname + '_' + blockId + '_typeTypeId' ).val();
}
// Otherwise the type was changed, lookup the location if it exists
diff --git a/civicrm/templates/CRM/Contact/Form/OnBehalfOf.tpl b/civicrm/templates/CRM/Contact/Form/OnBehalfOf.tpl
index 0ca2a1a8f3..15d459b0af 100644
--- a/civicrm/templates/CRM/Contact/Form/OnBehalfOf.tpl
+++ b/civicrm/templates/CRM/Contact/Form/OnBehalfOf.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/RelatedContact.tpl b/civicrm/templates/CRM/Contact/Form/RelatedContact.tpl
index cf1e402976..1b79d26bc3 100644
--- a/civicrm/templates/CRM/Contact/Form/RelatedContact.tpl
+++ b/civicrm/templates/CRM/Contact/Form/RelatedContact.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Relationship.tpl b/civicrm/templates/CRM/Contact/Form/Relationship.tpl
index 5356ce7186..7a687ce20d 100644
--- a/civicrm/templates/CRM/Contact/Form/Relationship.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Relationship.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Advanced.hlp b/civicrm/templates/CRM/Contact/Form/Search/Advanced.hlp
index 23430f3106..6d14c6c900 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Advanced.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Advanced.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl b/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl
index 85a111f1c3..fdc5caf217 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index 67b507c400..161ea79b66 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Basic.hlp b/civicrm/templates/CRM/Contact/Form/Search/Basic.hlp
index cb9364a91f..6f833264d6 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Basic.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Basic.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Basic.tpl b/civicrm/templates/CRM/Contact/Form/Search/Basic.tpl
index f14e763184..2da590e990 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Basic.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Basic.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl b/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
index 3f572a8981..a81154ffe9 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Builder.hlp b/civicrm/templates/CRM/Contact/Form/Search/Builder.hlp
index 6b24bbc221..58ea716b64 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Builder.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Builder.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl b/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl
index 7ffe0d8447..c041ae25e1 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Activity.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Activity.tpl
index f67a87d641..b8b4737ee2 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Activity.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Activity.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
index 97a7d1eeb7..b52a0d5ff1 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
index a55874a300..b97af59452 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Custom.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Custom.tpl
index 2ee34a710e..6bd978bb0f 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Custom.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Custom.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
index 796150f980..a05f38f86b 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.hlp b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.hlp
index 3a223d93a1..dc426b596d 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
index 75e3dc91b3..76e80927db 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Notes.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Notes.tpl
index b38215c2dc..ca31f96403 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Notes.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Notes.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl
index 9f9b21ac9c..a29048c4ad 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Task.tpl b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Task.tpl
index b21a674202..23bd7c55e5 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Criteria/Task.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Criteria/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom.tpl
index 13b4dbad0f..e74f5a2a20 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
index 35c270b37b..7d461d5e2a 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
index 8a0cb4d80c..b9fd7873cb 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
index 34e17b230d..db6d66d947 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl
index 6a99bb9d40..f504e7d12d 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl
index 554f6c8847..f52804c776 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.hlp b/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.hlp
index 45a4db8481..36ff283408 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
index 1bfdfbe757..a0d0b0ded6 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValues.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValues.tpl
index 86cca430bb..4a09dbe4ba 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValues.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValues.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
index a46b425068..64ab82e3cf 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
index 773b41e821..86f53aad76 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Custom/Sample.tpl b/civicrm/templates/CRM/Contact/Form/Search/Custom/Sample.tpl
index cb296deec3..e7db8c8dbf 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Custom/Sample.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Custom/Sample.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Contact/Form/Search/EmptyResults.tpl
index fbf54d60f3..b6ca74c522 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl b/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl
index 413dea7cc9..cf666dd86b 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/Intro.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/ResultTasks.tpl b/civicrm/templates/CRM/Contact/Form/Search/ResultTasks.tpl
index 7455e24c0f..61e3801047 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/ResultTasks.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/ResultTasks.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Search/table.tpl b/civicrm/templates/CRM/Contact/Form/Search/table.tpl
index e259798202..76c480da01 100644
--- a/civicrm/templates/CRM/Contact/Form/Search/table.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Search/table.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Selector.tpl b/civicrm/templates/CRM/Contact/Form/Selector.tpl
index 2c1b7acb3c..d1709e00e8 100644
--- a/civicrm/templates/CRM/Contact/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/ShareAddress.tpl b/civicrm/templates/CRM/Contact/Form/ShareAddress.tpl
index 0fab0e287c..11223c31e5 100644
--- a/civicrm/templates/CRM/Contact/Form/ShareAddress.tpl
+++ b/civicrm/templates/CRM/Contact/Form/ShareAddress.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task.tpl b/civicrm/templates/CRM/Contact/Form/Task.tpl
index 16f8e4e5f5..27167ad89e 100644
--- a/civicrm/templates/CRM/Contact/Form/Task.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl
index 0cb0ff4c5c..ee9baf09e7 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToHousehold.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToHousehold.tpl
index 4cd46f7d46..7e9f8e62c2 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToHousehold.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToHousehold.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToOrganization.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToOrganization.tpl
index cd1cd7473c..611955a95d 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToOrganization.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToOrganization.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AddToTag.tpl b/civicrm/templates/CRM/Contact/Form/Task/AddToTag.tpl
index 648c3b519e..c8daad822f 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AddToTag.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AddToTag.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/AlterPreferences.tpl b/civicrm/templates/CRM/Contact/Form/Task/AlterPreferences.tpl
index 0014a499b1..437c1be6b1 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/AlterPreferences.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/AlterPreferences.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl b/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl
index f572919afc..ceb77afef1 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Batch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Delete.tpl b/civicrm/templates/CRM/Contact/Form/Task/Delete.tpl
index 33b89c8b77..54a4ad5b0b 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Email.hlp b/civicrm/templates/CRM/Contact/Form/Task/Email.hlp
index 2a7c0f4a54..1ff137f1eb 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Email.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Task/Email.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Email.tpl b/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
index 76c2e87ad1..3dd9e0d201 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl b/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl
index 39f39503e1..dfbf9d2976 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/GMapsInput.tpl b/civicrm/templates/CRM/Contact/Form/Task/GMapsInput.tpl
index c06487fef8..e52336bc32 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/GMapsInput.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/GMapsInput.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/HookSample.tpl b/civicrm/templates/CRM/Contact/Form/Task/HookSample.tpl
index d21514f453..99fef1e401 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/HookSample.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/HookSample.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Label.tpl b/civicrm/templates/CRM/Contact/Form/Task/Label.tpl
index 350800db10..45e85086f2 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Label.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Label.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Map.tpl b/civicrm/templates/CRM/Contact/Form/Task/Map.tpl
index 8e2b178555..a07a8a719c 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Map.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Map.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Map/Google.tpl b/civicrm/templates/CRM/Contact/Form/Task/Map/Google.tpl
index d0322458a9..be11e271a9 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Map/Google.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Map/Google.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl b/civicrm/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
index 1a99b65abf..e28ad995f9 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/PDF.tpl b/civicrm/templates/CRM/Contact/Form/Task/PDF.tpl
index 1ab7863bf9..7cfaf92c87 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/PDF.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/PDF.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl b/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
index e4f543ee56..2a53210188 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Contact/Form/Task/PickProfile.tpl
index 0453786e18..e30544bb6f 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/PickProfile.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Print.tpl b/civicrm/templates/CRM/Contact/Form/Task/Print.tpl
index 29ba7729af..9ba8abb92f 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/ProximityCommon.tpl b/civicrm/templates/CRM/Contact/Form/Task/ProximityCommon.tpl
index ed462949d8..a6e4bf8fef 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/ProximityCommon.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/ProximityCommon.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl b/civicrm/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl
index 2fc10a49f2..a9e34bb74d 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl b/civicrm/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl
index d60e28158e..8a3a133038 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Result.tpl b/civicrm/templates/CRM/Contact/Form/Task/Result.tpl
index bb14b32cdc..7725439c77 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Result.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SMS.hlp b/civicrm/templates/CRM/Contact/Form/Task/SMS.hlp
index be6fda6f27..c018bf56f2 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SMS.hlp
+++ b/civicrm/templates/CRM/Contact/Form/Task/SMS.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl b/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl
index 84d3f1f937..41f7e365a5 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl b/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
index 52741f445e..94445b8e15 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl b/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl
index 9d8d410632..209303d93a 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/SaveSearch/Update.tpl b/civicrm/templates/CRM/Contact/Form/Task/SaveSearch/Update.tpl
index 3536e4c35c..b1d792b063 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/SaveSearch/Update.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/SaveSearch/Update.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Form/Task/Unhold.tpl b/civicrm/templates/CRM/Contact/Form/Task/Unhold.tpl
index 14281f949a..95e5509d9f 100644
--- a/civicrm/templates/CRM/Contact/Form/Task/Unhold.tpl
+++ b/civicrm/templates/CRM/Contact/Form/Task/Unhold.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Import/Form/CSV.tpl b/civicrm/templates/CRM/Contact/Import/Form/CSV.tpl
index 55006428ca..857d263cdb 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/CSV.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/CSV.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Contact/Import/Form/DataSource.hlp
index 7a03f17936..a623e98deb 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Contact/Import/Form/DataSource.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Contact/Import/Form/DataSource.tpl
index 28e5014e18..0ac7e57a16 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/DataSource.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Import/Form/MapField.tpl b/civicrm/templates/CRM/Contact/Import/Form/MapField.tpl
index 5e83d3fdf1..832a91fe9a 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/MapField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Contact/Import/Form/MapTable.tpl
index be6fb0f160..c7b5318905 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/MapTable.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Import/Form/Mapper.tpl b/civicrm/templates/CRM/Contact/Import/Form/Mapper.tpl
index 3f5f0d3f73..346227352c 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/Mapper.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/Mapper.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl b/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl
index c74f15191f..49a9eda8b9 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Import/Form/SQL.tpl b/civicrm/templates/CRM/Contact/Import/Form/SQL.tpl
index 059816bf9f..89ee5155ce 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/SQL.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/SQL.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Import/Form/Summary.tpl b/civicrm/templates/CRM/Contact/Import/Form/Summary.tpl
index a0e612b785..015e09a67a 100644
--- a/civicrm/templates/CRM/Contact/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Contact/Import/Form/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/ContactImage.tpl b/civicrm/templates/CRM/Contact/Page/ContactImage.tpl
index 91e4ac3dff..19b4f3d3f6 100644
--- a/civicrm/templates/CRM/Contact/Page/ContactImage.tpl
+++ b/civicrm/templates/CRM/Contact/Page/ContactImage.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/CustomSearch.hlp b/civicrm/templates/CRM/Contact/Page/CustomSearch.hlp
index 437eaae67d..1051f3b472 100644
--- a/civicrm/templates/CRM/Contact/Page/CustomSearch.hlp
+++ b/civicrm/templates/CRM/Contact/Page/CustomSearch.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/CustomSearch.tpl b/civicrm/templates/CRM/Contact/Page/CustomSearch.tpl
index 5b50a15bb4..d1c8860c3b 100644
--- a/civicrm/templates/CRM/Contact/Page/CustomSearch.tpl
+++ b/civicrm/templates/CRM/Contact/Page/CustomSearch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/DashBoard.tpl b/civicrm/templates/CRM/Contact/Page/DashBoard.tpl
index 531de6189a..827d8dd85f 100644
--- a/civicrm/templates/CRM/Contact/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DashBoard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/DashBoardDashlet.tpl b/civicrm/templates/CRM/Contact/Page/DashBoardDashlet.tpl
index 7e1338e952..b67f50e828 100644
--- a/civicrm/templates/CRM/Contact/Page/DashBoardDashlet.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DashBoardDashlet.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Dashboard.hlp b/civicrm/templates/CRM/Contact/Page/Dashboard.hlp
index c20f393a95..4bfa8edde6 100644
--- a/civicrm/templates/CRM/Contact/Page/Dashboard.hlp
+++ b/civicrm/templates/CRM/Contact/Page/Dashboard.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Dashlet.tpl b/civicrm/templates/CRM/Contact/Page/Dashlet.tpl
index c5f3ba9759..7fc60f81b1 100644
--- a/civicrm/templates/CRM/Contact/Page/Dashlet.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Dashlet.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeException.tpl b/civicrm/templates/CRM/Contact/Page/DedupeException.tpl
index d346dd1089..6edf9a79d0 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeException.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DedupeException.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl b/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl
index 83d71010f0..5742b30b02 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeMerge.tpl b/civicrm/templates/CRM/Contact/Page/DedupeMerge.tpl
index 88b7771d39..c2e6e3723f 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeMerge.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DedupeMerge.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeRules.hlp b/civicrm/templates/CRM/Contact/Page/DedupeRules.hlp
index af1ae15b73..5adb255c6f 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeRules.hlp
+++ b/civicrm/templates/CRM/Contact/Page/DedupeRules.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/DedupeRules.tpl b/civicrm/templates/CRM/Contact/Page/DedupeRules.tpl
index 48c95892e0..0af00ba228 100644
--- a/civicrm/templates/CRM/Contact/Page/DedupeRules.tpl
+++ b/civicrm/templates/CRM/Contact/Page/DedupeRules.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Actions.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Actions.tpl
index ccdb95700c..53e0cfc4ed 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Actions.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Actions.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl
index 879115b914..0b5dcd0a2b 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl b/civicrm/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl
index f7abcf1f18..6c596e2fdd 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/ContactInfo.tpl b/civicrm/templates/CRM/Contact/Page/Inline/ContactInfo.tpl
index a4f17f59de..72d72bd6a2 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/ContactInfo.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/ContactInfo.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/ContactName.tpl b/civicrm/templates/CRM/Contact/Page/Inline/ContactName.tpl
index 9296f50fee..39c2d9abde 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/ContactName.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/ContactName.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/CustomData.tpl b/civicrm/templates/CRM/Contact/Page/Inline/CustomData.tpl
index db280d1ae3..ebadc16c30 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/CustomData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl
index 5456926aea..64523accc4 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl
index a8d9908a61..cf255b165b 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/IM.tpl b/civicrm/templates/CRM/Contact/Page/Inline/IM.tpl
index 09c6834568..f383898bb6 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/IM.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/IM.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/OpenID.tpl b/civicrm/templates/CRM/Contact/Page/Inline/OpenID.tpl
index 7a7c818a13..9e03653322 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/OpenID.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/OpenID.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Phone.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Phone.tpl
index 87e72a744d..0e2871742f 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Phone.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Phone.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/Inline/Website.tpl b/civicrm/templates/CRM/Contact/Page/Inline/Website.tpl
index e1051ed80e..4f1c18527c 100644
--- a/civicrm/templates/CRM/Contact/Page/Inline/Website.tpl
+++ b/civicrm/templates/CRM/Contact/Page/Inline/Website.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/SavedSearch.tpl b/civicrm/templates/CRM/Contact/Page/SavedSearch.tpl
index c73a9d8217..e6293bac67 100644
--- a/civicrm/templates/CRM/Contact/Page/SavedSearch.tpl
+++ b/civicrm/templates/CRM/Contact/Page/SavedSearch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/ContactSmartGroup.tpl b/civicrm/templates/CRM/Contact/Page/View/ContactSmartGroup.tpl
index 09d2b08f8c..f7db9f6d09 100644
--- a/civicrm/templates/CRM/Contact/Page/View/ContactSmartGroup.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/ContactSmartGroup.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/CustomData.tpl b/civicrm/templates/CRM/Contact/Page/View/CustomData.tpl
index 68359ee16d..f7e99123a1 100644
--- a/civicrm/templates/CRM/Contact/Page/View/CustomData.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/CustomData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl b/civicrm/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl
index 491292c162..1a88ff06f9 100644
--- a/civicrm/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl b/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl
index 4401bc84e4..5b7025e521 100644
--- a/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Delete.tpl b/civicrm/templates/CRM/Contact/Page/View/Delete.tpl
index 1a7e5ac3d5..60df26dc8d 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Delete.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Email.tpl b/civicrm/templates/CRM/Contact/Page/View/Email.tpl
index e26eff9711..ef36fa6bc0 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Email.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Email.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Group.tpl b/civicrm/templates/CRM/Contact/Page/View/Group.tpl
index 7e02eedb28..b4c6da7a31 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Group.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Group.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl b/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl
index ebf7264057..2aec8d55d2 100644
--- a/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Log.tpl b/civicrm/templates/CRM/Contact/Page/View/Log.tpl
index 8f804887ea..3c4fbca10b 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Log.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Log.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Note.tpl b/civicrm/templates/CRM/Contact/Page/View/Note.tpl
index f30560f870..8c63162dfb 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Note.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Note.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -31,7 +31,7 @@
<tr><td class="label">{ts}Subject{/ts}</td><td>{$note.subject}</td></tr>
<tr><td class="label">{ts}Date:{/ts}</td><td>{$note.modified_date|crmDate}</td></tr>
<tr><td class="label">{ts}Privacy:{/ts}</td><td>{$note.privacy}</td></tr>
- <tr><td class="label"></td><td>{$note.note|nl2br}</td></tr>
+ <tr><td class="label">{ts}Note:{/ts}</td><td>{$note.note|nl2br}</td></tr>
{if $currentAttachmentInfo}
{include file="CRM/Form/attachment.tpl"}
diff --git a/civicrm/templates/CRM/Contact/Page/View/Print.tpl b/civicrm/templates/CRM/Contact/Page/View/Print.tpl
index f5149dcba0..65db3664fd 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Print.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Relationship.tpl b/civicrm/templates/CRM/Contact/Page/View/Relationship.tpl
index 1b5fbe3f00..55d5cb66b5 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Relationship.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Relationship.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/RelationshipSelector.tpl b/civicrm/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
index d6c36ff3b2..8c2b088d7e 100644
--- a/civicrm/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/SMS.tpl b/civicrm/templates/CRM/Contact/Page/View/SMS.tpl
index f20cf770db..c4a016fee1 100644
--- a/civicrm/templates/CRM/Contact/Page/View/SMS.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/SMS.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Summary.hlp b/civicrm/templates/CRM/Contact/Page/View/Summary.hlp
index df3ec9aa2a..54f6ec5c01 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Summary.hlp
+++ b/civicrm/templates/CRM/Contact/Page/View/Summary.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Summary.tpl b/civicrm/templates/CRM/Contact/Page/View/Summary.tpl
index 8553daf743..d81a00e0d0 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Summary.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/SummaryHook.tpl b/civicrm/templates/CRM/Contact/Page/View/SummaryHook.tpl
index db67a3dbaa..432a74f089 100644
--- a/civicrm/templates/CRM/Contact/Page/View/SummaryHook.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/SummaryHook.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Tag.tpl b/civicrm/templates/CRM/Contact/Page/View/Tag.tpl
index daaa029d6f..d22124fbd3 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Tag.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Tag.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/UserDashBoard.tpl b/civicrm/templates/CRM/Contact/Page/View/UserDashBoard.tpl
index bd41da14bf..0dbe8e2fb5 100644
--- a/civicrm/templates/CRM/Contact/Page/View/UserDashBoard.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/UserDashBoard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl b/civicrm/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
index 1ff6f166c0..8af31a3a5f 100644
--- a/civicrm/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Page/View/Useradd.tpl b/civicrm/templates/CRM/Contact/Page/View/Useradd.tpl
index 4679850798..280950c857 100644
--- a/civicrm/templates/CRM/Contact/Page/View/Useradd.tpl
+++ b/civicrm/templates/CRM/Contact/Page/View/Useradd.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contact/Selector.tpl b/civicrm/templates/CRM/Contact/Selector.tpl
index 3a40849a7a..95e7e03d15 100644
--- a/civicrm/templates/CRM/Contact/Selector.tpl
+++ b/civicrm/templates/CRM/Contact/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/AcceptCreditCard.tpl b/civicrm/templates/CRM/Contribute/Form/AcceptCreditCard.tpl
index a8d8cd0496..349184c68a 100644
--- a/civicrm/templates/CRM/Contribute/Form/AcceptCreditCard.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AcceptCreditCard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl
index 916ff1dea0..b9191d4b65 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
index 6671a5e5e8..41ee0b0766 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl
index e2351a4e81..d8c2098ed5 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/PaymentReminders.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/PaymentReminders.tpl
index f701fa994d..734c612772 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/PaymentReminders.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/PaymentReminders.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl
index 94323065ca..b1dd2a4afd 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.hlp b/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.hlp
index ea0459f076..ca8697f932 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl
index b28af1edfe..dac87b1e67 100644
--- a/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/CancelSubscription.tpl b/civicrm/templates/CRM/Contribute/Form/CancelSubscription.tpl
index 7f328e77f6..b0a1ffb2ff 100644
--- a/civicrm/templates/CRM/Contribute/Form/CancelSubscription.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/CancelSubscription.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
index 7bb797fd8c..6c48e96a64 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl
index f28e8d3ac1..4e279528e7 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
index c3a2dd54cf..5d2bda97e7 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -129,8 +129,7 @@
</div>
{/if}
-
- {if $onbehalfProfile|@count && $is_for_organization}
+ {if $onbehalfProfile|@count}
<div class="crm-group onBehalf_display-group label-left crm-profile-view">
{include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf'}
</div>
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
index ea39f40d4b..b10db3f9ff 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index 671184bf40..95bb045f4b 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
index cf2ac04fe2..e4f7042f63 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
index 441151f576..48999890d0 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl
index 1dde12a134..3dc089f469 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 5057e20003..7d63ffa9f0 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -188,7 +188,7 @@
</div>
{/if}
- {if $onbehalfProfile|@count && $is_for_organization}
+ {if $onbehalfProfile|@count}
<div class="crm-group onBehalf_display-group label-left crm-profile-view">
{include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf'}
</div>
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionCharts.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionCharts.tpl
index eaaa059f2f..9daf832bb9 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionCharts.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionCharts.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.hlp
index 2b14743447..eebcb014cc 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
index d986959ec8..7f32267c3a 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
index 1e1aa13feb..929ffb2a47 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp
index 9779d1e2c4..f2a5583d24 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl
index 2d99ff1868..7cee82c13c 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl
index 4e29b1f050..11ee6758a0 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp
index 19e0c68d15..df820c7b9d 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
index 0ee84fe4b1..a38c82050f 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp
index 99efad5d7d..1832acb9a7 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
index 1930322f61..27ce4d5523 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp
index 154d623839..ec3272556a 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl
index c4b3e08be7..37096f2faa 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp
index c317a3b9af..d9c8b5b15a 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
index 52bb725e6d..8ad1a29b29 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.hlp b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.hlp
index 5d7bc061ff..611f07068f 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
index 2e6e55bfd6..e2bf9965d5 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl b/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
index edd39ae6b3..a87d0960ab 100644
--- a/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl b/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl
index fe31cc8f75..4fa202a686 100644
--- a/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP.js.tpl b/civicrm/templates/CRM/Contribute/Form/PCP.js.tpl
index 6a5a707511..64f4c6c170 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP.js.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP.js.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP/Campaign.tpl b/civicrm/templates/CRM/Contribute/Form/PCP/Campaign.tpl
index ae0b400a5a..5c058fba96 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP/Campaign.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP/Campaign.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP/Delete.tpl b/civicrm/templates/CRM/Contribute/Form/PCP/Delete.tpl
index dd6c024b95..69c72179f6 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP/Delete.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP/PCP.tpl b/civicrm/templates/CRM/Contribute/Form/PCP/PCP.tpl
index c4e7855592..cd16af0507 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP/PCP.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP/PCP.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl b/civicrm/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
index 1137707e20..676a5c43a2 100644
--- a/civicrm/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/PaymentInstrument.tpl b/civicrm/templates/CRM/Contribute/Form/PaymentInstrument.tpl
index a414158cbd..3468b49ecc 100644
--- a/civicrm/templates/CRM/Contribute/Form/PaymentInstrument.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/PaymentInstrument.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Preview.tpl b/civicrm/templates/CRM/Contribute/Form/Preview.tpl
index 486458e7fb..cd7a6d8ba0 100644
--- a/civicrm/templates/CRM/Contribute/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Search.tpl b/civicrm/templates/CRM/Contribute/Form/Search.tpl
index 1deed2317b..044d14948d 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Contribute/Form/Search/AdvancedSearchPane.tpl
index bf7b2987d3..889fd3b1ea 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search/AdvancedSearchPane.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl b/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl
index 6f4c0c1788..d4ad3b71e5 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search/Common.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl b/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
index a01cad2e31..f068d30809 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Contribute/Form/Search/EmptyResults.tpl
index dbbe9a8d2d..014ea63be6 100644
--- a/civicrm/templates/CRM/Contribute/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Search/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/SearchContribution.tpl b/civicrm/templates/CRM/Contribute/Form/SearchContribution.tpl
index 921481c8cc..837e5fcccf 100644
--- a/civicrm/templates/CRM/Contribute/Form/SearchContribution.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/SearchContribution.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Selector.tpl b/civicrm/templates/CRM/Contribute/Form/Selector.tpl
index 8b0322074d..3b3382fc0f 100644
--- a/civicrm/templates/CRM/Contribute/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/SoftCredit.tpl b/civicrm/templates/CRM/Contribute/Form/SoftCredit.tpl
index 07dce25d87..b8feae6d5a 100644
--- a/civicrm/templates/CRM/Contribute/Form/SoftCredit.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/SoftCredit.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task.tpl b/civicrm/templates/CRM/Contribute/Form/Task.tpl
index 0f15bd3c8e..784648390c 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Batch.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Batch.tpl
index 9e0e703862..51ac6a0996 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Batch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Delete.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Delete.tpl
index 7e6fb6fdc5..36cee1bae3 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Email.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Email.tpl
index 5766544343..26d6ff08e9 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Email.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Invoice.hlp b/civicrm/templates/CRM/Contribute/Form/Task/Invoice.hlp
index 71cd5f68e2..76936c8767 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Invoice.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Invoice.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl
index 2c11f20b50..6ebd855946 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl b/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl
index d0c0a0d86f..7895f208fe 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.hlp b/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.hlp
index 3116b8f93e..fbecaeac96 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.hlp
+++ b/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl b/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl
index ee2efbeab1..e450d596b5 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Contribute/Form/Task/PickProfile.tpl
index ff54f32c90..4b95f4f5df 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/PickProfile.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Print.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Print.tpl
index 5faf378af6..4bd5cb8561 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Result.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Result.tpl
index 3e66b554ec..de6abae9b0 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Result.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/Task/Status.tpl b/civicrm/templates/CRM/Contribute/Form/Task/Status.tpl
index 87447e466c..d80170e6e6 100644
--- a/civicrm/templates/CRM/Contribute/Form/Task/Status.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Task/Status.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/UpdateBilling.tpl b/civicrm/templates/CRM/Contribute/Form/UpdateBilling.tpl
index b3120e56bb..77f5b6fa13 100644
--- a/civicrm/templates/CRM/Contribute/Form/UpdateBilling.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/UpdateBilling.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl b/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl
index 645af738ce..dc9f8b6f21 100644
--- a/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Contribute/Import/Form/DataSource.hlp
index ec9480ba7a..304679a246 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Contribute/Import/Form/DataSource.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Contribute/Import/Form/DataSource.tpl
index 56fee758ce..24fe690c2e 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/DataSource.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/MapField.tpl b/civicrm/templates/CRM/Contribute/Import/Form/MapField.tpl
index eb8c344e68..e9a41ab6ca 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/MapField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Contribute/Import/Form/MapTable.tpl
index e88ff61318..97ae76e8eb 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/MapTable.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/Preview.tpl b/civicrm/templates/CRM/Contribute/Import/Form/Preview.tpl
index 566559ece8..058a6a7827 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Import/Form/Summary.tpl b/civicrm/templates/CRM/Contribute/Import/Form/Summary.tpl
index bfdcc419ea..570f2a10f1 100644
--- a/civicrm/templates/CRM/Contribute/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Contribute/Import/Form/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionPage.hlp b/civicrm/templates/CRM/Contribute/Page/ContributionPage.hlp
index 7d7b1b7e56..b5a1bf4dc1 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionPage.hlp
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionPage.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl
index 7f0b5baa98..16f6b5798c 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionPage.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionRecur.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionRecur.tpl
index 8f433506a6..62681e98a8 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionSoft.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionSoft.tpl
index 68c8363495..a8798b3156 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionSoft.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionSoft.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionTotals.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionTotals.tpl
index 03b9112b4c..ec4839482e 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionTotals.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionTotals.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/ContributionType.tpl b/civicrm/templates/CRM/Contribute/Page/ContributionType.tpl
index 9775dd80e7..d341ad3ef8 100644
--- a/civicrm/templates/CRM/Contribute/Page/ContributionType.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ContributionType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/DashBoard.hlp b/civicrm/templates/CRM/Contribute/Page/DashBoard.hlp
index fb6ceb50ad..d257abdd68 100644
--- a/civicrm/templates/CRM/Contribute/Page/DashBoard.hlp
+++ b/civicrm/templates/CRM/Contribute/Page/DashBoard.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/DashBoard.tpl b/civicrm/templates/CRM/Contribute/Page/DashBoard.tpl
index d5eea1ac38..2b3b16ca0c 100644
--- a/civicrm/templates/CRM/Contribute/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/DashBoard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/ManagePremiums.tpl b/civicrm/templates/CRM/Contribute/Page/ManagePremiums.tpl
index 0e77ba225f..2d05a05753 100644
--- a/civicrm/templates/CRM/Contribute/Page/ManagePremiums.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/ManagePremiums.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/PaymentInfo.tpl b/civicrm/templates/CRM/Contribute/Page/PaymentInfo.tpl
index b1351997ef..8b2c3b9de7 100644
--- a/civicrm/templates/CRM/Contribute/Page/PaymentInfo.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/PaymentInfo.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/PcpUserDashboard.tpl b/civicrm/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
index 3eb92045b2..58aa798ae1 100644
--- a/civicrm/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/Premium.tpl b/civicrm/templates/CRM/Contribute/Page/Premium.tpl
index 55e6f8b1aa..b789442984 100644
--- a/civicrm/templates/CRM/Contribute/Page/Premium.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/Premium.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/SubscriptionStatus.tpl b/civicrm/templates/CRM/Contribute/Page/SubscriptionStatus.tpl
index c3f9a65a14..76898d0706 100644
--- a/civicrm/templates/CRM/Contribute/Page/SubscriptionStatus.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/SubscriptionStatus.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/Tab.hlp b/civicrm/templates/CRM/Contribute/Page/Tab.hlp
index 166532fb58..5cda403e5e 100644
--- a/civicrm/templates/CRM/Contribute/Page/Tab.hlp
+++ b/civicrm/templates/CRM/Contribute/Page/Tab.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/Tab.tpl b/civicrm/templates/CRM/Contribute/Page/Tab.tpl
index 79def63fd6..8820ee8c0c 100644
--- a/civicrm/templates/CRM/Contribute/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl b/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl
index ca70c11cb5..c1f0465e75 100644
--- a/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/AgeRange.tpl b/civicrm/templates/CRM/Core/AgeRange.tpl
index 6a180c7068..b42b43d344 100644
--- a/civicrm/templates/CRM/Core/AgeRange.tpl
+++ b/civicrm/templates/CRM/Core/AgeRange.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/BillingBlock.tpl b/civicrm/templates/CRM/Core/BillingBlock.tpl
index b6d0e67e4b..0d9171ac46 100644
--- a/civicrm/templates/CRM/Core/BillingBlock.tpl
+++ b/civicrm/templates/CRM/Core/BillingBlock.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/BillingBlockWrapper.tpl b/civicrm/templates/CRM/Core/BillingBlockWrapper.tpl
index 64a4ec356d..ff047ffac2 100644
--- a/civicrm/templates/CRM/Core/BillingBlockWrapper.tpl
+++ b/civicrm/templates/CRM/Core/BillingBlockWrapper.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/Calendar/GData.tpl b/civicrm/templates/CRM/Core/Calendar/GData.tpl
index 65094a8d86..77c99a7588 100644
--- a/civicrm/templates/CRM/Core/Calendar/GData.tpl
+++ b/civicrm/templates/CRM/Core/Calendar/GData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/Calendar/ICal.tpl b/civicrm/templates/CRM/Core/Calendar/ICal.tpl
index cd55791b77..89225af0fd 100644
--- a/civicrm/templates/CRM/Core/Calendar/ICal.tpl
+++ b/civicrm/templates/CRM/Core/Calendar/ICal.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/Calendar/Rss.tpl b/civicrm/templates/CRM/Core/Calendar/Rss.tpl
index a91cc7c85b..03937d48ac 100644
--- a/civicrm/templates/CRM/Core/Calendar/Rss.tpl
+++ b/civicrm/templates/CRM/Core/Calendar/Rss.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/Date.tpl b/civicrm/templates/CRM/Core/Date.tpl
index 103f836d88..fbed314f16 100644
--- a/civicrm/templates/CRM/Core/Date.tpl
+++ b/civicrm/templates/CRM/Core/Date.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/DateRange.tpl b/civicrm/templates/CRM/Core/DateRange.tpl
index e91127fb7f..17f17f3316 100644
--- a/civicrm/templates/CRM/Core/DateRange.tpl
+++ b/civicrm/templates/CRM/Core/DateRange.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp b/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp
index 93ad33fc2b..f66aad6436 100644
--- a/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp
+++ b/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl b/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl
index 8422107790..8a27e82f06 100644
--- a/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl
+++ b/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/Form/ShortCode.tpl b/civicrm/templates/CRM/Core/Form/ShortCode.tpl
index addbb59404..3981b6af92 100644
--- a/civicrm/templates/CRM/Core/Form/ShortCode.tpl
+++ b/civicrm/templates/CRM/Core/Form/ShortCode.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/I18n/Dialog.tpl b/civicrm/templates/CRM/Core/I18n/Dialog.tpl
index b84ca36274..fb222d0e0e 100644
--- a/civicrm/templates/CRM/Core/I18n/Dialog.tpl
+++ b/civicrm/templates/CRM/Core/I18n/Dialog.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/I18n/Form.tpl b/civicrm/templates/CRM/Core/I18n/Form.tpl
index 436e9e201e..f263fc50db 100644
--- a/civicrm/templates/CRM/Core/I18n/Form.tpl
+++ b/civicrm/templates/CRM/Core/I18n/Form.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Core/Page/RecurringEntityPreview.tpl b/civicrm/templates/CRM/Core/Page/RecurringEntityPreview.tpl
index 97f8a4eda9..359926c77d 100644
--- a/civicrm/templates/CRM/Core/Page/RecurringEntityPreview.tpl
+++ b/civicrm/templates/CRM/Core/Page/RecurringEntityPreview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/ChangeFieldType.tpl b/civicrm/templates/CRM/Custom/Form/ChangeFieldType.tpl
index 708c677c7f..85dae4615d 100644
--- a/civicrm/templates/CRM/Custom/Form/ChangeFieldType.tpl
+++ b/civicrm/templates/CRM/Custom/Form/ChangeFieldType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/ContactReference.tpl b/civicrm/templates/CRM/Custom/Form/ContactReference.tpl
index 545d05484a..82f6cfa794 100644
--- a/civicrm/templates/CRM/Custom/Form/ContactReference.tpl
+++ b/civicrm/templates/CRM/Custom/Form/ContactReference.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/CustomData.tpl b/civicrm/templates/CRM/Custom/Form/CustomData.tpl
index 197c3f4411..047e5ddc27 100644
--- a/civicrm/templates/CRM/Custom/Form/CustomData.tpl
+++ b/civicrm/templates/CRM/Custom/Form/CustomData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/CustomField.hlp b/civicrm/templates/CRM/Custom/Form/CustomField.hlp
index 6078949790..259b7215e6 100644
--- a/civicrm/templates/CRM/Custom/Form/CustomField.hlp
+++ b/civicrm/templates/CRM/Custom/Form/CustomField.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/CustomField.tpl b/civicrm/templates/CRM/Custom/Form/CustomField.tpl
index 43cf47a6ab..9c2a18effa 100644
--- a/civicrm/templates/CRM/Custom/Form/CustomField.tpl
+++ b/civicrm/templates/CRM/Custom/Form/CustomField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/DeleteField.tpl b/civicrm/templates/CRM/Custom/Form/DeleteField.tpl
index 64c4d31bb0..07c1fdef22 100644
--- a/civicrm/templates/CRM/Custom/Form/DeleteField.tpl
+++ b/civicrm/templates/CRM/Custom/Form/DeleteField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/DeleteFile.tpl b/civicrm/templates/CRM/Custom/Form/DeleteFile.tpl
index e79b4f5e5c..30bcf67a44 100644
--- a/civicrm/templates/CRM/Custom/Form/DeleteFile.tpl
+++ b/civicrm/templates/CRM/Custom/Form/DeleteFile.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/DeleteGroup.tpl b/civicrm/templates/CRM/Custom/Form/DeleteGroup.tpl
index efc82ade00..74a7073cc8 100644
--- a/civicrm/templates/CRM/Custom/Form/DeleteGroup.tpl
+++ b/civicrm/templates/CRM/Custom/Form/DeleteGroup.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/Field.hlp b/civicrm/templates/CRM/Custom/Form/Field.hlp
index e3d45f047d..f6757822c4 100644
--- a/civicrm/templates/CRM/Custom/Form/Field.hlp
+++ b/civicrm/templates/CRM/Custom/Form/Field.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/Field.tpl b/civicrm/templates/CRM/Custom/Form/Field.tpl
index 7e3f0a6c20..99763d4c1e 100644
--- a/civicrm/templates/CRM/Custom/Form/Field.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Field.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/Group.tpl b/civicrm/templates/CRM/Custom/Form/Group.tpl
index 21829d1902..0b4da2b861 100644
--- a/civicrm/templates/CRM/Custom/Form/Group.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Group.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/MoveField.tpl b/civicrm/templates/CRM/Custom/Form/MoveField.tpl
index f44a6bcc20..5b4233c0ba 100644
--- a/civicrm/templates/CRM/Custom/Form/MoveField.tpl
+++ b/civicrm/templates/CRM/Custom/Form/MoveField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/MultiValueSearch.js.tpl b/civicrm/templates/CRM/Custom/Form/MultiValueSearch.js.tpl
index 24062d9547..81cdb31940 100644
--- a/civicrm/templates/CRM/Custom/Form/MultiValueSearch.js.tpl
+++ b/civicrm/templates/CRM/Custom/Form/MultiValueSearch.js.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/Option.tpl b/civicrm/templates/CRM/Custom/Form/Option.tpl
index e2a801afb5..f648a71d03 100644
--- a/civicrm/templates/CRM/Custom/Form/Option.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Option.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/Optionfields.tpl b/civicrm/templates/CRM/Custom/Form/Optionfields.tpl
index 40d76d9603..0a7da8bfd0 100644
--- a/civicrm/templates/CRM/Custom/Form/Optionfields.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Optionfields.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/Preview.tpl b/civicrm/templates/CRM/Custom/Form/Preview.tpl
index b8bcfd0a30..cf06f7d524 100644
--- a/civicrm/templates/CRM/Custom/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Form/Search.tpl b/civicrm/templates/CRM/Custom/Form/Search.tpl
index 0f69732785..85d06e5359 100644
--- a/civicrm/templates/CRM/Custom/Form/Search.tpl
+++ b/civicrm/templates/CRM/Custom/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Custom/Import/Form/DataSource.hlp
index 874a193030..6975d72c65 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Custom/Import/Form/DataSource.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Custom/Import/Form/DataSource.tpl
index 0a02b24ec4..03b55e22ff 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Custom/Import/Form/DataSource.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Import/Form/MapField.tpl b/civicrm/templates/CRM/Custom/Import/Form/MapField.tpl
index e5978f6cd4..8dcf2f6024 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Custom/Import/Form/MapField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Import/Form/Preview.tpl b/civicrm/templates/CRM/Custom/Import/Form/Preview.tpl
index f9c316742f..9192d8d0aa 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Custom/Import/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Import/Form/Summary.tpl b/civicrm/templates/CRM/Custom/Import/Form/Summary.tpl
index c26bebbed2..a185124eb0 100644
--- a/civicrm/templates/CRM/Custom/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Custom/Import/Form/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl b/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl
index ddae280ad9..8b0f9d3c7d 100644
--- a/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl
+++ b/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Page/Field.tpl b/civicrm/templates/CRM/Custom/Page/Field.tpl
index fa710c8a45..a51536f169 100644
--- a/civicrm/templates/CRM/Custom/Page/Field.tpl
+++ b/civicrm/templates/CRM/Custom/Page/Field.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Page/Group.hlp b/civicrm/templates/CRM/Custom/Page/Group.hlp
index a965665bef..728d48e513 100644
--- a/civicrm/templates/CRM/Custom/Page/Group.hlp
+++ b/civicrm/templates/CRM/Custom/Page/Group.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Page/Group.tpl b/civicrm/templates/CRM/Custom/Page/Group.tpl
index ec2c8561b2..86765bf9d3 100644
--- a/civicrm/templates/CRM/Custom/Page/Group.tpl
+++ b/civicrm/templates/CRM/Custom/Page/Group.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Custom/Page/Option.tpl b/civicrm/templates/CRM/Custom/Page/Option.tpl
index 04ac693992..1e0f9d85f2 100644
--- a/civicrm/templates/CRM/Custom/Page/Option.tpl
+++ b/civicrm/templates/CRM/Custom/Page/Option.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Dashlet/Page/Activity.tpl b/civicrm/templates/CRM/Dashlet/Page/Activity.tpl
index 96dc9a021c..567d4b6d6e 100644
--- a/civicrm/templates/CRM/Dashlet/Page/Activity.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/Activity.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Dashlet/Page/AllCases.tpl b/civicrm/templates/CRM/Dashlet/Page/AllCases.tpl
index 9fffef3f3f..3374617329 100644
--- a/civicrm/templates/CRM/Dashlet/Page/AllCases.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/AllCases.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Dashlet/Page/Blog.tpl b/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
index f8b671e678..4f130dbe15 100644
--- a/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Dashlet/Page/CaseDashboard.tpl b/civicrm/templates/CRM/Dashlet/Page/CaseDashboard.tpl
index deff8bb0c0..0d60c3ca91 100644
--- a/civicrm/templates/CRM/Dashlet/Page/CaseDashboard.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/CaseDashboard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Dashlet/Page/GettingStarted.tpl b/civicrm/templates/CRM/Dashlet/Page/GettingStarted.tpl
index f69e1f5e05..b8ebbacf1d 100644
--- a/civicrm/templates/CRM/Dashlet/Page/GettingStarted.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/GettingStarted.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Dashlet/Page/MyCases.tpl b/civicrm/templates/CRM/Dashlet/Page/MyCases.tpl
index 4c825c91f0..c750efb860 100644
--- a/civicrm/templates/CRM/Dashlet/Page/MyCases.tpl
+++ b/civicrm/templates/CRM/Dashlet/Page/MyCases.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/EventFees.tpl b/civicrm/templates/CRM/Event/Form/EventFees.tpl
index fbef349fd5..2926ef215f 100644
--- a/civicrm/templates/CRM/Event/Form/EventFees.tpl
+++ b/civicrm/templates/CRM/Event/Form/EventFees.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Conference.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Conference.tpl
index 61e91f67f0..897c3182e9 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Conference.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Conference.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
index 158c177565..84874864a7 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Delete.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Delete.tpl
index 128dafaa95..198b1ce057 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Delete.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp b/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp
index f1fd865723..38e155a274 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index 3eeb52c4a7..017c8df8a4 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Fee.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Fee.tpl
index 48b830b94e..35e43269df 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Fee.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Fee.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Location.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Location.tpl
index adcfb1053e..6935b01d1c 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Location.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Location.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.hlp b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.hlp
index cdcd12a6ba..0efb548dcc 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.hlp
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
index e33d4753de..632db2fd1e 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
index 079ab6ec01..0074a01e17 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.hlp b/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.hlp
index 1732bb6635..9c1c1c8362 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.hlp
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.tpl b/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.tpl
index 778c427cb1..5ed5d27389 100644
--- a/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.tpl
+++ b/civicrm/templates/CRM/Event/Form/ManageEvent/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Participant.tpl b/civicrm/templates/CRM/Event/Form/Participant.tpl
index c37ce5f658..b9fdfda202 100644
--- a/civicrm/templates/CRM/Event/Form/Participant.tpl
+++ b/civicrm/templates/CRM/Event/Form/Participant.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -424,7 +424,7 @@
}
{/literal}
- CRM.buildCustomData( '{$customDataType}', 'null', 'null' );
+ CRM.buildCustomData( '{$customDataType}', null, null );
{if $eventID}
CRM.buildCustomData( '{$customDataType}', {$eventID}, {$eventNameCustomDataTypeID} );
{/if}
diff --git a/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index 608d496c72..51b5801737 100644
--- a/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/ParticipantView.tpl b/civicrm/templates/CRM/Event/Form/ParticipantView.tpl
index 4eee98ce4e..190adff703 100644
--- a/civicrm/templates/CRM/Event/Form/ParticipantView.tpl
+++ b/civicrm/templates/CRM/Event/Form/ParticipantView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
index b0a0a88563..83750d8e59 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl b/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl
index e828b246a5..161fc0fc20 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl b/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl
index b95a00be0c..6ba894f6b3 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl b/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
index 235126147f..d95cb818fa 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl b/civicrm/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl
index 5684c03ff7..eb04546b2f 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/ParticipantConfirm.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Registration/PreviewHeader.tpl b/civicrm/templates/CRM/Event/Form/Registration/PreviewHeader.tpl
index 3e92dea459..e387cb9f1d 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/PreviewHeader.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/PreviewHeader.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Registration/Register.tpl b/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
index 0f373d205e..428d7072f6 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl b/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl
index ad258fae17..5853655b1a 100644
--- a/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl
+++ b/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Search.tpl b/civicrm/templates/CRM/Event/Form/Search.tpl
index eb53eb1442..2f7803b0f5 100644
--- a/civicrm/templates/CRM/Event/Form/Search.tpl
+++ b/civicrm/templates/CRM/Event/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Event/Form/Search/AdvancedSearchPane.tpl
index a5dffd6110..1af1cc4fbc 100644
--- a/civicrm/templates/CRM/Event/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Event/Form/Search/AdvancedSearchPane.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Search/Common.tpl b/civicrm/templates/CRM/Event/Form/Search/Common.tpl
index f714ee2a38..51b94a0bb8 100644
--- a/civicrm/templates/CRM/Event/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Event/Form/Search/Common.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Event/Form/Search/EmptyResults.tpl
index fa1f9d0971..f56e0e5923 100644
--- a/civicrm/templates/CRM/Event/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Event/Form/Search/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Search/Results.hlp b/civicrm/templates/CRM/Event/Form/Search/Results.hlp
index 740d63ec3c..8804761853 100644
--- a/civicrm/templates/CRM/Event/Form/Search/Results.hlp
+++ b/civicrm/templates/CRM/Event/Form/Search/Results.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/SearchEvent.tpl b/civicrm/templates/CRM/Event/Form/SearchEvent.tpl
index 8cda702317..09b8081333 100644
--- a/civicrm/templates/CRM/Event/Form/SearchEvent.tpl
+++ b/civicrm/templates/CRM/Event/Form/SearchEvent.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Selector.tpl b/civicrm/templates/CRM/Event/Form/Selector.tpl
index b5ba16f297..a516dc805b 100644
--- a/civicrm/templates/CRM/Event/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Event/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/SelfSvcTransfer.tpl b/civicrm/templates/CRM/Event/Form/SelfSvcTransfer.tpl
index fc39e2e5f6..f1246dcb0d 100644
--- a/civicrm/templates/CRM/Event/Form/SelfSvcTransfer.tpl
+++ b/civicrm/templates/CRM/Event/Form/SelfSvcTransfer.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/SelfSvcUpdate.tpl b/civicrm/templates/CRM/Event/Form/SelfSvcUpdate.tpl
index 7e54c18378..0bb958bdf9 100644
--- a/civicrm/templates/CRM/Event/Form/SelfSvcUpdate.tpl
+++ b/civicrm/templates/CRM/Event/Form/SelfSvcUpdate.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task.tpl b/civicrm/templates/CRM/Event/Form/Task.tpl
index ce3da556e7..fc127072a4 100644
--- a/civicrm/templates/CRM/Event/Form/Task.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/AddToGroup.tpl b/civicrm/templates/CRM/Event/Form/Task/AddToGroup.tpl
index 542e39430c..a984bd18b5 100644
--- a/civicrm/templates/CRM/Event/Form/Task/AddToGroup.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/AddToGroup.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/Badge.tpl b/civicrm/templates/CRM/Event/Form/Task/Badge.tpl
index 5d546be90e..430300c801 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Badge.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Badge.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/Batch.tpl b/civicrm/templates/CRM/Event/Form/Task/Batch.tpl
index ad495a5ff9..1e6aabac10 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Batch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/Cancel.tpl b/civicrm/templates/CRM/Event/Form/Task/Cancel.tpl
index 3e3b90c99c..570114bc26 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Cancel.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Cancel.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/Delete.tpl b/civicrm/templates/CRM/Event/Form/Task/Delete.tpl
index 37388c3bf5..35cb204356 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/Email.tpl b/civicrm/templates/CRM/Event/Form/Task/Email.tpl
index 5766544343..26d6ff08e9 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Email.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/PDF.tpl b/civicrm/templates/CRM/Event/Form/Task/PDF.tpl
index 2a6d2594fc..4fc036c038 100644
--- a/civicrm/templates/CRM/Event/Form/Task/PDF.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/PDF.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.hlp b/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.hlp
index d5725a6a25..8e3d81e065 100644
--- a/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.hlp
+++ b/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.tpl b/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.tpl
index b8c7f7fb71..38ba2444a0 100644
--- a/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/ParticipantStatus.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Event/Form/Task/PickProfile.tpl
index 0bc8340e3e..701e48c13e 100644
--- a/civicrm/templates/CRM/Event/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/PickProfile.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/Print.tpl b/civicrm/templates/CRM/Event/Form/Task/Print.tpl
index 5b4dbf3299..8ffba20bad 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/Result.tpl b/civicrm/templates/CRM/Event/Form/Task/Result.tpl
index a7b1cb6374..2808f19258 100644
--- a/civicrm/templates/CRM/Event/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/Result.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/SaveSearch.tpl b/civicrm/templates/CRM/Event/Form/Task/SaveSearch.tpl
index 74f695bc70..83afa618b3 100644
--- a/civicrm/templates/CRM/Event/Form/Task/SaveSearch.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/SaveSearch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Form/Task/SaveSearch/Update.tpl b/civicrm/templates/CRM/Event/Form/Task/SaveSearch/Update.tpl
index ee6306d5b4..dd52c68332 100644
--- a/civicrm/templates/CRM/Event/Form/Task/SaveSearch/Update.tpl
+++ b/civicrm/templates/CRM/Event/Form/Task/SaveSearch/Update.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Event/Import/Form/DataSource.hlp
index 4c0cd0bba9..836dfbd771 100644
--- a/civicrm/templates/CRM/Event/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Event/Import/Form/DataSource.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Event/Import/Form/DataSource.tpl
index bd03b9f0a8..7a5ac723af 100644
--- a/civicrm/templates/CRM/Event/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/DataSource.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Import/Form/MapField.tpl b/civicrm/templates/CRM/Event/Import/Form/MapField.tpl
index ccd3f6fb3e..eee766eed6 100644
--- a/civicrm/templates/CRM/Event/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/MapField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Event/Import/Form/MapTable.tpl
index e81cc60973..3120e8fb5e 100644
--- a/civicrm/templates/CRM/Event/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/MapTable.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Import/Form/Preview.tpl b/civicrm/templates/CRM/Event/Import/Form/Preview.tpl
index 38a61ea8da..0cf99f11aa 100644
--- a/civicrm/templates/CRM/Event/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Import/Form/Summary.tpl b/civicrm/templates/CRM/Event/Import/Form/Summary.tpl
index 52cf8e9091..5c948d2afe 100644
--- a/civicrm/templates/CRM/Event/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Event/Import/Form/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/DashBoard.hlp b/civicrm/templates/CRM/Event/Page/DashBoard.hlp
index 68f4d16de2..265a98504b 100644
--- a/civicrm/templates/CRM/Event/Page/DashBoard.hlp
+++ b/civicrm/templates/CRM/Event/Page/DashBoard.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/DashBoard.tpl b/civicrm/templates/CRM/Event/Page/DashBoard.tpl
index 22061b4627..6a3a6570c8 100644
--- a/civicrm/templates/CRM/Event/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Event/Page/DashBoard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/EventInfo.tpl b/civicrm/templates/CRM/Event/Page/EventInfo.tpl
index 26f4bcbb51..198ae2388d 100644
--- a/civicrm/templates/CRM/Event/Page/EventInfo.tpl
+++ b/civicrm/templates/CRM/Event/Page/EventInfo.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/ICalendar.tpl b/civicrm/templates/CRM/Event/Page/ICalendar.tpl
index e91eb126ef..ed31e70b50 100644
--- a/civicrm/templates/CRM/Event/Page/ICalendar.tpl
+++ b/civicrm/templates/CRM/Event/Page/ICalendar.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/ManageEvent.hlp b/civicrm/templates/CRM/Event/Page/ManageEvent.hlp
index 9397e505f6..a3d031f938 100644
--- a/civicrm/templates/CRM/Event/Page/ManageEvent.hlp
+++ b/civicrm/templates/CRM/Event/Page/ManageEvent.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/ManageEvent.tpl b/civicrm/templates/CRM/Event/Page/ManageEvent.tpl
index 88b8462d58..03cb4dfecd 100644
--- a/civicrm/templates/CRM/Event/Page/ManageEvent.tpl
+++ b/civicrm/templates/CRM/Event/Page/ManageEvent.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/ParticipantListing/Name.tpl b/civicrm/templates/CRM/Event/Page/ParticipantListing/Name.tpl
index 77add37d95..b82d06c391 100644
--- a/civicrm/templates/CRM/Event/Page/ParticipantListing/Name.tpl
+++ b/civicrm/templates/CRM/Event/Page/ParticipantListing/Name.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/ParticipantListing/NameAndEmail.tpl b/civicrm/templates/CRM/Event/Page/ParticipantListing/NameAndEmail.tpl
index 0df73a86ef..51dd216e37 100644
--- a/civicrm/templates/CRM/Event/Page/ParticipantListing/NameAndEmail.tpl
+++ b/civicrm/templates/CRM/Event/Page/ParticipantListing/NameAndEmail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/ParticipantListing/NameStatusAndDate.tpl b/civicrm/templates/CRM/Event/Page/ParticipantListing/NameStatusAndDate.tpl
index ec4ff4ff33..7ac354f8d0 100644
--- a/civicrm/templates/CRM/Event/Page/ParticipantListing/NameStatusAndDate.tpl
+++ b/civicrm/templates/CRM/Event/Page/ParticipantListing/NameStatusAndDate.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/Tab.tpl b/civicrm/templates/CRM/Event/Page/Tab.tpl
index 6727b846d0..4305818b2e 100644
--- a/civicrm/templates/CRM/Event/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Event/Page/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/UserDashboard.tpl b/civicrm/templates/CRM/Event/Page/UserDashboard.tpl
index 0b0d628808..9ff4e7dfd3 100644
--- a/civicrm/templates/CRM/Event/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Event/Page/UserDashboard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Event/Page/iCalLinks.tpl b/civicrm/templates/CRM/Event/Page/iCalLinks.tpl
index d64ce910bc..8e46b470f7 100644
--- a/civicrm/templates/CRM/Event/Page/iCalLinks.tpl
+++ b/civicrm/templates/CRM/Event/Page/iCalLinks.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Export/Form/Map.tpl b/civicrm/templates/CRM/Export/Form/Map.tpl
index 49b4ba97f1..c8f21a4b0e 100644
--- a/civicrm/templates/CRM/Export/Form/Map.tpl
+++ b/civicrm/templates/CRM/Export/Form/Map.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Export/Form/Select.tpl b/civicrm/templates/CRM/Export/Form/Select.tpl
index ea20aad180..e2f457bb4b 100644
--- a/civicrm/templates/CRM/Export/Form/Select.tpl
+++ b/civicrm/templates/CRM/Export/Form/Select.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Export/Form/table.tpl b/civicrm/templates/CRM/Export/Form/table.tpl
index 0e2e16f102..773469e770 100644
--- a/civicrm/templates/CRM/Export/Form/table.tpl
+++ b/civicrm/templates/CRM/Export/Form/table.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/ExportFormat/IIF.tpl b/civicrm/templates/CRM/Financial/ExportFormat/IIF.tpl
index 42bbe65e40..0e4f5ae9bf 100644
--- a/civicrm/templates/CRM/Financial/ExportFormat/IIF.tpl
+++ b/civicrm/templates/CRM/Financial/ExportFormat/IIF.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl b/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl
index cfbe59a14b..a7a966218c 100644
--- a/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/Export.tpl b/civicrm/templates/CRM/Financial/Form/Export.tpl
index 8c78cb6c7b..9cb47a4efb 100644
--- a/civicrm/templates/CRM/Financial/Form/Export.tpl
+++ b/civicrm/templates/CRM/Financial/Form/Export.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialAccount.hlp b/civicrm/templates/CRM/Financial/Form/FinancialAccount.hlp
index f525085758..0430df5b04 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialAccount.hlp
+++ b/civicrm/templates/CRM/Financial/Form/FinancialAccount.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl b/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl
index 58cfa8da69..9f60213c3b 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl
+++ b/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl b/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl
index a91ef0039d..fa78647621 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl
+++ b/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialType.tpl b/civicrm/templates/CRM/Financial/Form/FinancialType.tpl
index 36be2f13ec..55456b0b34 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialType.tpl
+++ b/civicrm/templates/CRM/Financial/Form/FinancialType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/FinancialTypeAccount.tpl b/civicrm/templates/CRM/Financial/Form/FinancialTypeAccount.tpl
index 161d807e0e..921639d0cd 100644
--- a/civicrm/templates/CRM/Financial/Form/FinancialTypeAccount.tpl
+++ b/civicrm/templates/CRM/Financial/Form/FinancialTypeAccount.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/Payment.tpl b/civicrm/templates/CRM/Financial/Form/Payment.tpl
index 71877c9625..a82938b2e2 100644
--- a/civicrm/templates/CRM/Financial/Form/Payment.tpl
+++ b/civicrm/templates/CRM/Financial/Form/Payment.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/PaypalExpress.tpl b/civicrm/templates/CRM/Financial/Form/PaypalExpress.tpl
index c13c69b5eb..f238fe2a56 100644
--- a/civicrm/templates/CRM/Financial/Form/PaypalExpress.tpl
+++ b/civicrm/templates/CRM/Financial/Form/PaypalExpress.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/PaypalPro.tpl b/civicrm/templates/CRM/Financial/Form/PaypalPro.tpl
index 4fc8935b29..86343eca53 100644
--- a/civicrm/templates/CRM/Financial/Form/PaypalPro.tpl
+++ b/civicrm/templates/CRM/Financial/Form/PaypalPro.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Form/Search.tpl b/civicrm/templates/CRM/Financial/Form/Search.tpl
index cd6256b3f4..4627a6325d 100644
--- a/civicrm/templates/CRM/Financial/Form/Search.tpl
+++ b/civicrm/templates/CRM/Financial/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Page/Batch.tpl b/civicrm/templates/CRM/Financial/Page/Batch.tpl
index 72eb165d6b..cf5b7851cf 100644
--- a/civicrm/templates/CRM/Financial/Page/Batch.tpl
+++ b/civicrm/templates/CRM/Financial/Page/Batch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Page/BatchTransaction.tpl b/civicrm/templates/CRM/Financial/Page/BatchTransaction.tpl
index 9a86c36a78..4932ebd0b0 100644
--- a/civicrm/templates/CRM/Financial/Page/BatchTransaction.tpl
+++ b/civicrm/templates/CRM/Financial/Page/BatchTransaction.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialAccount.tpl b/civicrm/templates/CRM/Financial/Page/FinancialAccount.tpl
index c5316d6c4c..7ac260107b 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialAccount.tpl
+++ b/civicrm/templates/CRM/Financial/Page/FinancialAccount.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialBatch.hlp b/civicrm/templates/CRM/Financial/Page/FinancialBatch.hlp
index acec592cb6..a556932d55 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialBatch.hlp
+++ b/civicrm/templates/CRM/Financial/Page/FinancialBatch.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialBatch.tpl b/civicrm/templates/CRM/Financial/Page/FinancialBatch.tpl
index 65d43315fb..14ee973338 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialBatch.tpl
+++ b/civicrm/templates/CRM/Financial/Page/FinancialBatch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialType.tpl b/civicrm/templates/CRM/Financial/Page/FinancialType.tpl
index a7908531c1..0d2bad5359 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialType.tpl
+++ b/civicrm/templates/CRM/Financial/Page/FinancialType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Financial/Page/FinancialTypeAccount.tpl b/civicrm/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
index 4f4c6b4743..11d371440c 100644
--- a/civicrm/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
+++ b/civicrm/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Form/attachment.tpl b/civicrm/templates/CRM/Form/attachment.tpl
index b1847a8414..9e509bc995 100644
--- a/civicrm/templates/CRM/Form/attachment.tpl
+++ b/civicrm/templates/CRM/Form/attachment.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Form/basicForm.tpl b/civicrm/templates/CRM/Form/basicForm.tpl
index 0d5959007e..694385a8d3 100644
--- a/civicrm/templates/CRM/Form/basicForm.tpl
+++ b/civicrm/templates/CRM/Form/basicForm.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Form/body.tpl b/civicrm/templates/CRM/Form/body.tpl
index 06b90d2821..f793de5e6a 100644
--- a/civicrm/templates/CRM/Form/body.tpl
+++ b/civicrm/templates/CRM/Form/body.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Form/default.tpl b/civicrm/templates/CRM/Form/default.tpl
index 9c83d3e334..4015a352e7 100644
--- a/civicrm/templates/CRM/Form/default.tpl
+++ b/civicrm/templates/CRM/Form/default.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Form/element.tpl b/civicrm/templates/CRM/Form/element.tpl
index 16ca7527ca..2e3bee246b 100644
--- a/civicrm/templates/CRM/Form/element.tpl
+++ b/civicrm/templates/CRM/Form/element.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Form/error.tpl b/civicrm/templates/CRM/Form/error.tpl
index 8748253769..5dae697d71 100644
--- a/civicrm/templates/CRM/Form/error.tpl
+++ b/civicrm/templates/CRM/Form/error.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Form/label.tpl b/civicrm/templates/CRM/Form/label.tpl
index 7ea7f22d7c..14a59ae568 100644
--- a/civicrm/templates/CRM/Form/label.tpl
+++ b/civicrm/templates/CRM/Form/label.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Form/validate.tpl b/civicrm/templates/CRM/Form/validate.tpl
index 83f0326b70..1f2636afc6 100644
--- a/civicrm/templates/CRM/Form/validate.tpl
+++ b/civicrm/templates/CRM/Form/validate.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Friend/Form.tpl b/civicrm/templates/CRM/Friend/Form.tpl
index 17fbb316fa..b32849edb3 100644
--- a/civicrm/templates/CRM/Friend/Form.tpl
+++ b/civicrm/templates/CRM/Friend/Form.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Friend/Form/Contribute.tpl b/civicrm/templates/CRM/Friend/Form/Contribute.tpl
index 6cd9b780d6..b47cf8de88 100644
--- a/civicrm/templates/CRM/Friend/Form/Contribute.tpl
+++ b/civicrm/templates/CRM/Friend/Form/Contribute.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Friend/Form/Event.tpl b/civicrm/templates/CRM/Friend/Form/Event.tpl
index 62a0ca18a1..0194a82b43 100644
--- a/civicrm/templates/CRM/Friend/Form/Event.tpl
+++ b/civicrm/templates/CRM/Friend/Form/Event.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Friend/Form/Friend.tpl b/civicrm/templates/CRM/Friend/Form/Friend.tpl
index dd4e71d851..c86415153c 100644
--- a/civicrm/templates/CRM/Friend/Form/Friend.tpl
+++ b/civicrm/templates/CRM/Friend/Form/Friend.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Friend/Form/Pledge.tpl b/civicrm/templates/CRM/Friend/Form/Pledge.tpl
index adf5d491be..faef3376f1 100644
--- a/civicrm/templates/CRM/Friend/Form/Pledge.tpl
+++ b/civicrm/templates/CRM/Friend/Form/Pledge.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Grant.tpl b/civicrm/templates/CRM/Grant/Form/Grant.tpl
index 032fe4394f..22b92f9854 100644
--- a/civicrm/templates/CRM/Grant/Form/Grant.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Grant.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/GrantView.tpl b/civicrm/templates/CRM/Grant/Form/GrantView.tpl
index 8dd14900e2..9d9e3ff60e 100644
--- a/civicrm/templates/CRM/Grant/Form/GrantView.tpl
+++ b/civicrm/templates/CRM/Grant/Form/GrantView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Search.tpl b/civicrm/templates/CRM/Grant/Form/Search.tpl
index 8da2398636..24b6feb6a8 100644
--- a/civicrm/templates/CRM/Grant/Form/Search.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl
index 3fed2daa0e..dfc2ae3d3b 100644
--- a/civicrm/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Search/Common.tpl b/civicrm/templates/CRM/Grant/Form/Search/Common.tpl
index 7e5d1f0f70..753e3524e9 100644
--- a/civicrm/templates/CRM/Grant/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Search/Common.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Grant/Form/Search/EmptyResults.tpl
index 39f935a94f..c7263486ef 100644
--- a/civicrm/templates/CRM/Grant/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Search/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Selector.tpl b/civicrm/templates/CRM/Grant/Form/Selector.tpl
index 3e30a63df8..6dc1feacb7 100644
--- a/civicrm/templates/CRM/Grant/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Task.tpl b/civicrm/templates/CRM/Grant/Form/Task.tpl
index 8e73c53f2e..d5e2a45bdc 100644
--- a/civicrm/templates/CRM/Grant/Form/Task.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Task/Delete.tpl b/civicrm/templates/CRM/Grant/Form/Task/Delete.tpl
index a642f9d757..eb27224a24 100644
--- a/civicrm/templates/CRM/Grant/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Task/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Task/Print.tpl b/civicrm/templates/CRM/Grant/Form/Task/Print.tpl
index 015695b9e0..dc8f58d7b1 100644
--- a/civicrm/templates/CRM/Grant/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Form/Task/Update.tpl b/civicrm/templates/CRM/Grant/Form/Task/Update.tpl
index 380cadf054..24191dbc08 100644
--- a/civicrm/templates/CRM/Grant/Form/Task/Update.tpl
+++ b/civicrm/templates/CRM/Grant/Form/Task/Update.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Page/DashBoard.tpl b/civicrm/templates/CRM/Grant/Page/DashBoard.tpl
index 8956ee6b11..6bd9672927 100644
--- a/civicrm/templates/CRM/Grant/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Grant/Page/DashBoard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Grant/Page/Tab.tpl b/civicrm/templates/CRM/Grant/Page/Tab.tpl
index 4eeb4b1cf4..0eea6ee7e8 100644
--- a/civicrm/templates/CRM/Grant/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Grant/Page/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Group/Form/Delete.tpl b/civicrm/templates/CRM/Group/Form/Delete.tpl
index 1d97eaa873..ab75c49750 100644
--- a/civicrm/templates/CRM/Group/Form/Delete.tpl
+++ b/civicrm/templates/CRM/Group/Form/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Group/Form/Edit.tpl b/civicrm/templates/CRM/Group/Form/Edit.tpl
index 1a074a8bc0..04a0c91a02 100644
--- a/civicrm/templates/CRM/Group/Form/Edit.tpl
+++ b/civicrm/templates/CRM/Group/Form/Edit.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Group/Form/ParentGroups.tpl b/civicrm/templates/CRM/Group/Form/ParentGroups.tpl
index c8a840837d..667ead1ea4 100644
--- a/civicrm/templates/CRM/Group/Form/ParentGroups.tpl
+++ b/civicrm/templates/CRM/Group/Form/ParentGroups.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Group/Form/Search.tpl b/civicrm/templates/CRM/Group/Form/Search.tpl
index 6614b2bb94..147aefc35c 100644
--- a/civicrm/templates/CRM/Group/Form/Search.tpl
+++ b/civicrm/templates/CRM/Group/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -211,7 +211,7 @@
$.each( response.data, function( i, val ) {
appendHTML += '<tr id="row_'+val.group_id+'_'+parent_id+'" data-entity="group" data-id="'+val.group_id+'" class="crm-entity parent_is_'+parent_id+' crm-row-child">';
if ( val.is_parent ) {
- appendHTML += '<td class="crm-group-name crmf-title crm-editable ' + levelClass + '">' + '{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span>{literal}' + val.title + '</td>';
+ appendHTML += '<td class="crm-group-name crmf-title ' + levelClass + '">' + '{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span><div class="crm-editable">{literal}' + val.title + '</div></td>';
}
else {
appendHTML += '<td class="' + levelClass + '">' + '{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span><span class="crm-group-name crmf-title crm-editable">{literal}' + val.title + '</span></td>';
diff --git a/civicrm/templates/CRM/Group/Page/Group.hlp b/civicrm/templates/CRM/Group/Page/Group.hlp
index 456d91fd1a..03c298889b 100644
--- a/civicrm/templates/CRM/Group/Page/Group.hlp
+++ b/civicrm/templates/CRM/Group/Page/Group.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Group/Page/Group.tpl b/civicrm/templates/CRM/Group/Page/Group.tpl
index 701c57b8a8..0c5af86bb1 100644
--- a/civicrm/templates/CRM/Group/Page/Group.tpl
+++ b/civicrm/templates/CRM/Group/Page/Group.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Group/Page/GroupRows.tpl b/civicrm/templates/CRM/Group/Page/GroupRows.tpl
index 20f9753a76..f9b3c2b046 100644
--- a/civicrm/templates/CRM/Group/Page/GroupRows.tpl
+++ b/civicrm/templates/CRM/Group/Page/GroupRows.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Logging/ReportDetail.tpl b/civicrm/templates/CRM/Logging/ReportDetail.tpl
index 07b6ae37dc..379718a599 100644
--- a/civicrm/templates/CRM/Logging/ReportDetail.tpl
+++ b/civicrm/templates/CRM/Logging/ReportDetail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Logging/ReportSummary.tpl b/civicrm/templates/CRM/Logging/ReportSummary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Logging/ReportSummary.tpl
+++ b/civicrm/templates/CRM/Logging/ReportSummary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Approve.tpl b/civicrm/templates/CRM/Mailing/Form/Approve.tpl
index e41e9f1770..55dd8ff397 100644
--- a/civicrm/templates/CRM/Mailing/Form/Approve.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Approve.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Component.tpl b/civicrm/templates/CRM/Mailing/Form/Component.tpl
index 927cd7fcb8..2c50632b07 100644
--- a/civicrm/templates/CRM/Mailing/Form/Component.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Component.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Count.tpl b/civicrm/templates/CRM/Mailing/Form/Count.tpl
index c9ef6b01b6..707d4d50c8 100644
--- a/civicrm/templates/CRM/Mailing/Form/Count.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Count.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/ForwardMailing.tpl b/civicrm/templates/CRM/Mailing/Form/ForwardMailing.tpl
index 877f4de677..d69a4a5a4c 100644
--- a/civicrm/templates/CRM/Mailing/Form/ForwardMailing.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/ForwardMailing.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Group.hlp b/civicrm/templates/CRM/Mailing/Form/Group.hlp
index e912b712da..0403e41269 100644
--- a/civicrm/templates/CRM/Mailing/Form/Group.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Group.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Group.tpl b/civicrm/templates/CRM/Mailing/Form/Group.tpl
index 4481c13070..f37a5f2be8 100644
--- a/civicrm/templates/CRM/Mailing/Form/Group.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Group.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl b/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl
index 7f94bd13f7..64b5000b88 100644
--- a/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Optout.tpl b/civicrm/templates/CRM/Mailing/Form/Optout.tpl
index c5c8347433..919b116918 100644
--- a/civicrm/templates/CRM/Mailing/Form/Optout.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Optout.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Schedule.hlp b/civicrm/templates/CRM/Mailing/Form/Schedule.hlp
index e8c41652a8..c6afab9eea 100644
--- a/civicrm/templates/CRM/Mailing/Form/Schedule.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Schedule.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Schedule.tpl b/civicrm/templates/CRM/Mailing/Form/Schedule.tpl
index 3820ae4b88..68e703e63d 100644
--- a/civicrm/templates/CRM/Mailing/Form/Schedule.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Schedule.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Search.tpl b/civicrm/templates/CRM/Mailing/Form/Search.tpl
index c06ecf8468..a68d745fb9 100644
--- a/civicrm/templates/CRM/Mailing/Form/Search.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Selector.tpl b/civicrm/templates/CRM/Mailing/Form/Selector.tpl
index 201cb94924..978aca55d6 100644
--- a/civicrm/templates/CRM/Mailing/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Settings.hlp b/civicrm/templates/CRM/Mailing/Form/Settings.hlp
index 82b060e1bf..4e8f053653 100644
--- a/civicrm/templates/CRM/Mailing/Form/Settings.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Settings.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Settings.tpl b/civicrm/templates/CRM/Mailing/Form/Settings.tpl
index bedd0f5515..d1b2396f86 100644
--- a/civicrm/templates/CRM/Mailing/Form/Settings.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Settings.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Subscribe.tpl b/civicrm/templates/CRM/Mailing/Form/Subscribe.tpl
index c973bf927d..6fada1adb6 100644
--- a/civicrm/templates/CRM/Mailing/Form/Subscribe.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Subscribe.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Task.tpl b/civicrm/templates/CRM/Mailing/Form/Task.tpl
index 372f2a9297..b45d280d1e 100644
--- a/civicrm/templates/CRM/Mailing/Form/Task.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Task/Print.tpl b/civicrm/templates/CRM/Mailing/Form/Task/Print.tpl
index f1c55e39b0..e7eeca54b6 100644
--- a/civicrm/templates/CRM/Mailing/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Test.hlp b/civicrm/templates/CRM/Mailing/Form/Test.hlp
index 912ddbdbd2..ed45811a3f 100644
--- a/civicrm/templates/CRM/Mailing/Form/Test.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Test.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Test.tpl b/civicrm/templates/CRM/Mailing/Form/Test.tpl
index a3c680529e..8fe9de9014 100644
--- a/civicrm/templates/CRM/Mailing/Form/Test.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Test.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Unsubscribe.tpl b/civicrm/templates/CRM/Mailing/Form/Unsubscribe.tpl
index b27ece8ce4..fd3e90fa96 100644
--- a/civicrm/templates/CRM/Mailing/Form/Unsubscribe.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Unsubscribe.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Upload.hlp b/civicrm/templates/CRM/Mailing/Form/Upload.hlp
index 71cd5f68e2..76936c8767 100644
--- a/civicrm/templates/CRM/Mailing/Form/Upload.hlp
+++ b/civicrm/templates/CRM/Mailing/Form/Upload.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Form/Upload.tpl b/civicrm/templates/CRM/Mailing/Form/Upload.tpl
index d95e2126be..1dd5dbdd7e 100644
--- a/civicrm/templates/CRM/Mailing/Form/Upload.tpl
+++ b/civicrm/templates/CRM/Mailing/Form/Upload.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/MailingUI.hlp b/civicrm/templates/CRM/Mailing/MailingUI.hlp
index 02f939e31d..1140cdaf15 100644
--- a/civicrm/templates/CRM/Mailing/MailingUI.hlp
+++ b/civicrm/templates/CRM/Mailing/MailingUI.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -97,7 +97,7 @@
<p>
{ts}Track the number of times recipients click each link in this mailing.{/ts}
</p><p>
- {ts}NOTE: When this feature is enabled, all links in the message body will be automatically re-written to route through your CiviCRM server prior to redirecting to the target page.{/ts}
+ {ts}NOTE: When this feature is enabled, all links in the message body (including mailtos) will be automatically re-written to route through your CiviCRM website prior to redirecting to the target page.{/ts}
</p>
{/htxt}
diff --git a/civicrm/templates/CRM/Mailing/Page/Browse.hlp b/civicrm/templates/CRM/Mailing/Page/Browse.hlp
index 144b01b3a1..5f1c3ce67f 100644
--- a/civicrm/templates/CRM/Mailing/Page/Browse.hlp
+++ b/civicrm/templates/CRM/Mailing/Page/Browse.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Page/Browse.tpl b/civicrm/templates/CRM/Mailing/Page/Browse.tpl
index 2b1753ade7..fe864ef2af 100644
--- a/civicrm/templates/CRM/Mailing/Page/Browse.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Browse.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Page/Component.tpl b/civicrm/templates/CRM/Mailing/Page/Component.tpl
index 0a1bb06eac..490c761c84 100644
--- a/civicrm/templates/CRM/Mailing/Page/Component.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Component.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -49,7 +49,7 @@
<td class="crm-editable" data-field="name">{$row.name}</td>
<td>{$row.component_type}</td>
<td>{$row.subject}</td>
- <td>{$row.body_text}</td>
+ <td>{$row.body_text|escape}</td>
<td>{$row.body_html|escape}</td>
<td>{if $row.is_default eq 1}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Default{/ts}" />{/if} </td>
<td id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
diff --git a/civicrm/templates/CRM/Mailing/Page/Confirm.tpl b/civicrm/templates/CRM/Mailing/Page/Confirm.tpl
index d514a830bf..7f2831269f 100644
--- a/civicrm/templates/CRM/Mailing/Page/Confirm.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Confirm.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Page/Event.tpl b/civicrm/templates/CRM/Mailing/Page/Event.tpl
index 00baf97443..f5d44d62bb 100644
--- a/civicrm/templates/CRM/Mailing/Page/Event.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Event.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Page/Report.tpl b/civicrm/templates/CRM/Mailing/Page/Report.tpl
index be3974539c..ae8a5f786d 100644
--- a/civicrm/templates/CRM/Mailing/Page/Report.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Report.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Page/Resubscribe.tpl b/civicrm/templates/CRM/Mailing/Page/Resubscribe.tpl
index 012012cf27..29e5e9f591 100644
--- a/civicrm/templates/CRM/Mailing/Page/Resubscribe.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Resubscribe.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Mailing/Page/Tab.tpl b/civicrm/templates/CRM/Mailing/Page/Tab.tpl
index 017ae01a21..ba8bd16bc3 100644
--- a/civicrm/templates/CRM/Mailing/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Mailing/Page/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Membership.hlp b/civicrm/templates/CRM/Member/Form/Membership.hlp
index 6be66fe79b..a8fd1dbfe3 100644
--- a/civicrm/templates/CRM/Member/Form/Membership.hlp
+++ b/civicrm/templates/CRM/Member/Form/Membership.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Membership.tpl b/civicrm/templates/CRM/Member/Form/Membership.tpl
index 9fe3f798b0..051488b045 100644
--- a/civicrm/templates/CRM/Member/Form/Membership.tpl
+++ b/civicrm/templates/CRM/Member/Form/Membership.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/MembershipBlock.hlp b/civicrm/templates/CRM/Member/Form/MembershipBlock.hlp
index 57a2ca2bdc..29241b409d 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipBlock.hlp
+++ b/civicrm/templates/CRM/Member/Form/MembershipBlock.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl b/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl
index dc702afccc..36161ac89a 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipBlock.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/MembershipRelated.tpl b/civicrm/templates/CRM/Member/Form/MembershipRelated.tpl
index bb1fff88ec..9465c825b5 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipRelated.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipRelated.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl b/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl
index 851994f5ee..2b0d6179c7 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/MembershipStatus.tpl b/civicrm/templates/CRM/Member/Form/MembershipStatus.tpl
index fa3478af79..60af777cf9 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipStatus.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipStatus.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/MembershipType.tpl b/civicrm/templates/CRM/Member/Form/MembershipType.tpl
index 9ae20eff0f..c06bf90eac 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipType.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/MembershipView.tpl b/civicrm/templates/CRM/Member/Form/MembershipView.tpl
index 6502bd9dd5..371febb5f9 100644
--- a/civicrm/templates/CRM/Member/Form/MembershipView.tpl
+++ b/civicrm/templates/CRM/Member/Form/MembershipView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Search.hlp b/civicrm/templates/CRM/Member/Form/Search.hlp
index 41805c01c3..6f1c228e61 100644
--- a/civicrm/templates/CRM/Member/Form/Search.hlp
+++ b/civicrm/templates/CRM/Member/Form/Search.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Search.tpl b/civicrm/templates/CRM/Member/Form/Search.tpl
index 682157172b..7069942b43 100644
--- a/civicrm/templates/CRM/Member/Form/Search.tpl
+++ b/civicrm/templates/CRM/Member/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Member/Form/Search/AdvancedSearchPane.tpl
index bc0e840ba2..63f89e9ab8 100644
--- a/civicrm/templates/CRM/Member/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Member/Form/Search/AdvancedSearchPane.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Search/Common.tpl b/civicrm/templates/CRM/Member/Form/Search/Common.tpl
index b83dca3838..2a9b859b62 100644
--- a/civicrm/templates/CRM/Member/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Member/Form/Search/Common.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Member/Form/Search/EmptyResults.tpl
index da680551a3..985e37517f 100644
--- a/civicrm/templates/CRM/Member/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Member/Form/Search/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Selector.tpl b/civicrm/templates/CRM/Member/Form/Selector.tpl
index 77aaec2957..96ed6d7a35 100644
--- a/civicrm/templates/CRM/Member/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Member/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Task.tpl b/civicrm/templates/CRM/Member/Form/Task.tpl
index 4613033b47..7758b68eee 100644
--- a/civicrm/templates/CRM/Member/Form/Task.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Task/Batch.tpl b/civicrm/templates/CRM/Member/Form/Task/Batch.tpl
index 85f6c8a5fd..b2a5068b63 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Batch.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Batch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Task/Delete.tpl b/civicrm/templates/CRM/Member/Form/Task/Delete.tpl
index 05570061c4..d26e1367c9 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Task/Email.tpl b/civicrm/templates/CRM/Member/Form/Task/Email.tpl
index 5766544343..26d6ff08e9 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Email.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Email.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Task/Label.tpl b/civicrm/templates/CRM/Member/Form/Task/Label.tpl
index 006e2fb046..649fffc09f 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Label.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Label.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Task/PDFLetter.tpl b/civicrm/templates/CRM/Member/Form/Task/PDFLetter.tpl
index 18bf8499ef..1aba741301 100644
--- a/civicrm/templates/CRM/Member/Form/Task/PDFLetter.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/PDFLetter.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Task/PickProfile.tpl b/civicrm/templates/CRM/Member/Form/Task/PickProfile.tpl
index dbb17effd4..f6f3d2d3db 100644
--- a/civicrm/templates/CRM/Member/Form/Task/PickProfile.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/PickProfile.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Task/Print.tpl b/civicrm/templates/CRM/Member/Form/Task/Print.tpl
index 498421c361..4baf8b778a 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Form/Task/Result.tpl b/civicrm/templates/CRM/Member/Form/Task/Result.tpl
index 95cb0c9d70..bb3b637ef8 100644
--- a/civicrm/templates/CRM/Member/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Member/Form/Task/Result.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Import/Form/DataSource.hlp b/civicrm/templates/CRM/Member/Import/Form/DataSource.hlp
index fbc1be9f90..290aba474d 100644
--- a/civicrm/templates/CRM/Member/Import/Form/DataSource.hlp
+++ b/civicrm/templates/CRM/Member/Import/Form/DataSource.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Import/Form/DataSource.tpl b/civicrm/templates/CRM/Member/Import/Form/DataSource.tpl
index 598eda6d7a..905ad1a3d4 100644
--- a/civicrm/templates/CRM/Member/Import/Form/DataSource.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/DataSource.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Import/Form/MapField.tpl b/civicrm/templates/CRM/Member/Import/Form/MapField.tpl
index 4d8ef3dd06..aa9bbf7cc3 100644
--- a/civicrm/templates/CRM/Member/Import/Form/MapField.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/MapField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Import/Form/MapTable.tpl b/civicrm/templates/CRM/Member/Import/Form/MapTable.tpl
index 86dc8d6acc..96028a1504 100644
--- a/civicrm/templates/CRM/Member/Import/Form/MapTable.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/MapTable.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Import/Form/Preview.tpl b/civicrm/templates/CRM/Member/Import/Form/Preview.tpl
index dab4a7c47e..b50b1369b6 100644
--- a/civicrm/templates/CRM/Member/Import/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Import/Form/Summary.tpl b/civicrm/templates/CRM/Member/Import/Form/Summary.tpl
index e9b2018651..b18b97cf1d 100644
--- a/civicrm/templates/CRM/Member/Import/Form/Summary.tpl
+++ b/civicrm/templates/CRM/Member/Import/Form/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Page/DashBoard.hlp b/civicrm/templates/CRM/Member/Page/DashBoard.hlp
index 7f576f5ba9..4a6d0ddc40 100644
--- a/civicrm/templates/CRM/Member/Page/DashBoard.hlp
+++ b/civicrm/templates/CRM/Member/Page/DashBoard.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Page/DashBoard.tpl b/civicrm/templates/CRM/Member/Page/DashBoard.tpl
index 3246941342..e9454ec859 100644
--- a/civicrm/templates/CRM/Member/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Member/Page/DashBoard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl b/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl
index b90d55ffd2..22e99ae27a 100644
--- a/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl
+++ b/civicrm/templates/CRM/Member/Page/MembershipStatus.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Page/MembershipType.hlp b/civicrm/templates/CRM/Member/Page/MembershipType.hlp
index a40a38aef0..291de36077 100644
--- a/civicrm/templates/CRM/Member/Page/MembershipType.hlp
+++ b/civicrm/templates/CRM/Member/Page/MembershipType.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Page/MembershipType.tpl b/civicrm/templates/CRM/Member/Page/MembershipType.tpl
index a53ba625eb..f5a9767a99 100644
--- a/civicrm/templates/CRM/Member/Page/MembershipType.tpl
+++ b/civicrm/templates/CRM/Member/Page/MembershipType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Page/Tab.hlp b/civicrm/templates/CRM/Member/Page/Tab.hlp
index 509ab3c9bc..c1a0c18540 100644
--- a/civicrm/templates/CRM/Member/Page/Tab.hlp
+++ b/civicrm/templates/CRM/Member/Page/Tab.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Page/Tab.tpl b/civicrm/templates/CRM/Member/Page/Tab.tpl
index 7a5727ca28..8a7cfc9ac3 100644
--- a/civicrm/templates/CRM/Member/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Member/Page/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Member/Page/UserDashboard.tpl b/civicrm/templates/CRM/Member/Page/UserDashboard.tpl
index cdd31ff135..095fd7dc9b 100644
--- a/civicrm/templates/CRM/Member/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Member/Page/UserDashboard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Note/Form/Note.tpl b/civicrm/templates/CRM/Note/Form/Note.tpl
index a030708d95..886d5fd66d 100644
--- a/civicrm/templates/CRM/Note/Form/Note.tpl
+++ b/civicrm/templates/CRM/Note/Form/Note.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Form/Campaign.tpl b/civicrm/templates/CRM/PCP/Form/Campaign.tpl
index 18feb5f306..7a4bcf386f 100644
--- a/civicrm/templates/CRM/PCP/Form/Campaign.tpl
+++ b/civicrm/templates/CRM/PCP/Form/Campaign.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Form/Contribute.hlp b/civicrm/templates/CRM/PCP/Form/Contribute.hlp
index 0ae335cdab..b757497323 100644
--- a/civicrm/templates/CRM/PCP/Form/Contribute.hlp
+++ b/civicrm/templates/CRM/PCP/Form/Contribute.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Form/Contribute.tpl b/civicrm/templates/CRM/PCP/Form/Contribute.tpl
index aeab36baf6..22c775b5a1 100644
--- a/civicrm/templates/CRM/PCP/Form/Contribute.tpl
+++ b/civicrm/templates/CRM/PCP/Form/Contribute.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Form/Event.hlp b/civicrm/templates/CRM/PCP/Form/Event.hlp
index 68dacb4838..c9a2251943 100644
--- a/civicrm/templates/CRM/PCP/Form/Event.hlp
+++ b/civicrm/templates/CRM/PCP/Form/Event.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Form/Event.tpl b/civicrm/templates/CRM/PCP/Form/Event.tpl
index 4157976a9e..4e7ac18478 100644
--- a/civicrm/templates/CRM/PCP/Form/Event.tpl
+++ b/civicrm/templates/CRM/PCP/Form/Event.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Form/PCP.tpl b/civicrm/templates/CRM/PCP/Form/PCP.tpl
index 119b0a9edf..c2a9cdce39 100644
--- a/civicrm/templates/CRM/PCP/Form/PCP.tpl
+++ b/civicrm/templates/CRM/PCP/Form/PCP.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Form/PCP/Delete.tpl b/civicrm/templates/CRM/PCP/Form/PCP/Delete.tpl
index dd6c024b95..69c72179f6 100644
--- a/civicrm/templates/CRM/PCP/Form/PCP/Delete.tpl
+++ b/civicrm/templates/CRM/PCP/Form/PCP/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Form/PCP/PCP.tpl b/civicrm/templates/CRM/PCP/Form/PCP/PCP.tpl
index a6a1696c95..cae7841650 100644
--- a/civicrm/templates/CRM/PCP/Form/PCP/PCP.tpl
+++ b/civicrm/templates/CRM/PCP/Form/PCP/PCP.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Form/PCPAccount.tpl b/civicrm/templates/CRM/PCP/Form/PCPAccount.tpl
index 5cd5b6ee86..fd454bd1f2 100644
--- a/civicrm/templates/CRM/PCP/Form/PCPAccount.tpl
+++ b/civicrm/templates/CRM/PCP/Form/PCPAccount.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Page/Contribute.tpl b/civicrm/templates/CRM/PCP/Page/Contribute.tpl
index d441183a0f..0e972a3483 100644
--- a/civicrm/templates/CRM/PCP/Page/Contribute.tpl
+++ b/civicrm/templates/CRM/PCP/Page/Contribute.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Page/Event.tpl b/civicrm/templates/CRM/PCP/Page/Event.tpl
index 57387e5c83..cf2edc7fd3 100644
--- a/civicrm/templates/CRM/PCP/Page/Event.tpl
+++ b/civicrm/templates/CRM/PCP/Page/Event.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Page/PCP.hlp b/civicrm/templates/CRM/PCP/Page/PCP.hlp
index 918c8bd8ad..2c94180dc3 100644
--- a/civicrm/templates/CRM/PCP/Page/PCP.hlp
+++ b/civicrm/templates/CRM/PCP/Page/PCP.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Page/PCP.tpl b/civicrm/templates/CRM/PCP/Page/PCP.tpl
index 4343598faf..49dc210488 100644
--- a/civicrm/templates/CRM/PCP/Page/PCP.tpl
+++ b/civicrm/templates/CRM/PCP/Page/PCP.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/PCP/Page/PCPInfo.tpl b/civicrm/templates/CRM/PCP/Page/PCPInfo.tpl
index 1bf0d7cf2a..0af3e95f08 100644
--- a/civicrm/templates/CRM/PCP/Page/PCPInfo.tpl
+++ b/civicrm/templates/CRM/PCP/Page/PCPInfo.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Payment.tpl b/civicrm/templates/CRM/Pledge/Form/Payment.tpl
index ce7e013fed..cbc6191d53 100644
--- a/civicrm/templates/CRM/Pledge/Form/Payment.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Payment.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Pledge.tpl b/civicrm/templates/CRM/Pledge/Form/Pledge.tpl
index 70c5912c69..0e343ebaed 100644
--- a/civicrm/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Pledge.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl b/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl
index 0409bfbb70..24a657dc95 100644
--- a/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Search.tpl b/civicrm/templates/CRM/Pledge/Form/Search.tpl
index e1a2124a6f..2aad6bf45d 100644
--- a/civicrm/templates/CRM/Pledge/Form/Search.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Search/AdvancedSearchPane.tpl b/civicrm/templates/CRM/Pledge/Form/Search/AdvancedSearchPane.tpl
index c14add8172..cdd720f8c8 100644
--- a/civicrm/templates/CRM/Pledge/Form/Search/AdvancedSearchPane.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Search/AdvancedSearchPane.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Search/Common.tpl b/civicrm/templates/CRM/Pledge/Form/Search/Common.tpl
index 3348db38d1..87b71a3b9c 100644
--- a/civicrm/templates/CRM/Pledge/Form/Search/Common.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Search/Common.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Search/EmptyResults.tpl b/civicrm/templates/CRM/Pledge/Form/Search/EmptyResults.tpl
index 881a5fe772..f38214db83 100644
--- a/civicrm/templates/CRM/Pledge/Form/Search/EmptyResults.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Search/EmptyResults.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Selector.tpl b/civicrm/templates/CRM/Pledge/Form/Selector.tpl
index e335464c94..f02c92a3ab 100644
--- a/civicrm/templates/CRM/Pledge/Form/Selector.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Selector.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Task.tpl b/civicrm/templates/CRM/Pledge/Form/Task.tpl
index 80f1e4aa09..aa159bc17f 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/Delete.tpl b/civicrm/templates/CRM/Pledge/Form/Task/Delete.tpl
index 6cd042f678..16659a1a5c 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/Delete.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/Delete.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/Print.tpl b/civicrm/templates/CRM/Pledge/Form/Task/Print.tpl
index 0ae5e1e60f..aeb4dc9372 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/Print.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/Print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/Result.tpl b/civicrm/templates/CRM/Pledge/Form/Task/Result.tpl
index 40c5f55ec5..41135a59a1 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/Result.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/Result.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch.tpl b/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch.tpl
index 72eacbfeeb..40c78a7fb1 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch/Update.tpl b/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch/Update.tpl
index ee6306d5b4..dd52c68332 100644
--- a/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch/Update.tpl
+++ b/civicrm/templates/CRM/Pledge/Form/Task/SaveSearch/Update.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Page/DashBoard.tpl b/civicrm/templates/CRM/Pledge/Page/DashBoard.tpl
index 5a06b6fea2..9f2858e160 100644
--- a/civicrm/templates/CRM/Pledge/Page/DashBoard.tpl
+++ b/civicrm/templates/CRM/Pledge/Page/DashBoard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Page/Payment.hlp b/civicrm/templates/CRM/Pledge/Page/Payment.hlp
index 713f1e1e40..fd3f396fdb 100644
--- a/civicrm/templates/CRM/Pledge/Page/Payment.hlp
+++ b/civicrm/templates/CRM/Pledge/Page/Payment.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Page/Payment.tpl b/civicrm/templates/CRM/Pledge/Page/Payment.tpl
index b53737c2d6..d37f118610 100644
--- a/civicrm/templates/CRM/Pledge/Page/Payment.tpl
+++ b/civicrm/templates/CRM/Pledge/Page/Payment.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Page/Tab.hlp b/civicrm/templates/CRM/Pledge/Page/Tab.hlp
index bd50824f5f..1e634b86f8 100644
--- a/civicrm/templates/CRM/Pledge/Page/Tab.hlp
+++ b/civicrm/templates/CRM/Pledge/Page/Tab.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Page/Tab.tpl b/civicrm/templates/CRM/Pledge/Page/Tab.tpl
index 696f9b90c5..3ea227ea31 100644
--- a/civicrm/templates/CRM/Pledge/Page/Tab.tpl
+++ b/civicrm/templates/CRM/Pledge/Page/Tab.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Pledge/Page/UserDashboard.tpl b/civicrm/templates/CRM/Pledge/Page/UserDashboard.tpl
index 3aa409237b..e5a3dfaae1 100644
--- a/civicrm/templates/CRM/Pledge/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Pledge/Page/UserDashboard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/Calculate.tpl b/civicrm/templates/CRM/Price/Form/Calculate.tpl
index 3e3fee807b..2bb381f596 100644
--- a/civicrm/templates/CRM/Price/Form/Calculate.tpl
+++ b/civicrm/templates/CRM/Price/Form/Calculate.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/DeleteField.tpl b/civicrm/templates/CRM/Price/Form/DeleteField.tpl
index 164102b578..d4661d1ac9 100644
--- a/civicrm/templates/CRM/Price/Form/DeleteField.tpl
+++ b/civicrm/templates/CRM/Price/Form/DeleteField.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/DeleteSet.tpl b/civicrm/templates/CRM/Price/Form/DeleteSet.tpl
index 4f56b8cc75..091842b59c 100644
--- a/civicrm/templates/CRM/Price/Form/DeleteSet.tpl
+++ b/civicrm/templates/CRM/Price/Form/DeleteSet.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/Field.tpl b/civicrm/templates/CRM/Price/Form/Field.tpl
index a5c3da1d00..e0dd233613 100644
--- a/civicrm/templates/CRM/Price/Form/Field.tpl
+++ b/civicrm/templates/CRM/Price/Form/Field.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/LineItem.tpl b/civicrm/templates/CRM/Price/Form/LineItem.tpl
index dab57fbd7c..77775b87d6 100644
--- a/civicrm/templates/CRM/Price/Form/LineItem.tpl
+++ b/civicrm/templates/CRM/Price/Form/LineItem.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/Option.tpl b/civicrm/templates/CRM/Price/Form/Option.tpl
index bcec75b5d2..123be21b3e 100644
--- a/civicrm/templates/CRM/Price/Form/Option.tpl
+++ b/civicrm/templates/CRM/Price/Form/Option.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/OptionFields.tpl b/civicrm/templates/CRM/Price/Form/OptionFields.tpl
index 118b4ed0f9..b31bc23db4 100644
--- a/civicrm/templates/CRM/Price/Form/OptionFields.tpl
+++ b/civicrm/templates/CRM/Price/Form/OptionFields.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/ParticipantCount.tpl b/civicrm/templates/CRM/Price/Form/ParticipantCount.tpl
index da5fe83c2a..97660d6d75 100644
--- a/civicrm/templates/CRM/Price/Form/ParticipantCount.tpl
+++ b/civicrm/templates/CRM/Price/Form/ParticipantCount.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/Preview.tpl b/civicrm/templates/CRM/Price/Form/Preview.tpl
index 7953e5cdd9..4ae627b969 100644
--- a/civicrm/templates/CRM/Price/Form/Preview.tpl
+++ b/civicrm/templates/CRM/Price/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Form/PriceSet.tpl b/civicrm/templates/CRM/Price/Form/PriceSet.tpl
index f80af271c5..e717726749 100644
--- a/civicrm/templates/CRM/Price/Form/PriceSet.tpl
+++ b/civicrm/templates/CRM/Price/Form/PriceSet.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -102,17 +102,19 @@
</div>
{/if}
- {if !empty($extends) && $extends eq "Membership" && $element.html_type != 'Text'}
- <div id="allow_auto_renew">
- <div class='crm-section auto-renew'>
- <div class='label'></div>
- <div class ='content'>
- {if isset($form.auto_renew) }
- {$form.auto_renew.html} {$form.auto_renew.label}
- {/if}
+ {if !empty($extends) && $extends eq "Membership"}
+ {if (!empty($priceSet) && $element.id == $priceSet.auto_renew_membership_field) || (empty($priceSet) && $element.name == 'membership_amount')}
+ <div id="allow_auto_renew">
+ <div class='crm-section auto-renew'>
+ <div class='label'></div>
+ <div class ='content'>
+ {if isset($form.auto_renew) }
+ {$form.auto_renew.html} {$form.auto_renew.label}
+ {/if}
+ </div>
</div>
</div>
- </div>
+ {/if}
{/if}
<div class="clear"></div>
</div>
diff --git a/civicrm/templates/CRM/Price/Form/Set.tpl b/civicrm/templates/CRM/Price/Form/Set.tpl
index d7a0056182..a85bc2dd68 100644
--- a/civicrm/templates/CRM/Price/Form/Set.tpl
+++ b/civicrm/templates/CRM/Price/Form/Set.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Page/Field.hlp b/civicrm/templates/CRM/Price/Page/Field.hlp
index bb478b04b1..ef35af85e6 100644
--- a/civicrm/templates/CRM/Price/Page/Field.hlp
+++ b/civicrm/templates/CRM/Price/Page/Field.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Page/Field.tpl b/civicrm/templates/CRM/Price/Page/Field.tpl
index 14a11e55e4..85b40c88ee 100644
--- a/civicrm/templates/CRM/Price/Page/Field.tpl
+++ b/civicrm/templates/CRM/Price/Page/Field.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Page/LineItem.tpl b/civicrm/templates/CRM/Price/Page/LineItem.tpl
index 98dd1e794c..c61c50e261 100644
--- a/civicrm/templates/CRM/Price/Page/LineItem.tpl
+++ b/civicrm/templates/CRM/Price/Page/LineItem.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Page/Option.tpl b/civicrm/templates/CRM/Price/Page/Option.tpl
index feeabbb068..a96f73b758 100644
--- a/civicrm/templates/CRM/Price/Page/Option.tpl
+++ b/civicrm/templates/CRM/Price/Page/Option.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Page/Set.tpl b/civicrm/templates/CRM/Price/Page/Set.tpl
index ceac6fb7c9..9ec6f0984e 100644
--- a/civicrm/templates/CRM/Price/Page/Set.tpl
+++ b/civicrm/templates/CRM/Price/Page/Set.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Price/Page/table.tpl b/civicrm/templates/CRM/Price/Page/table.tpl
index f40b331b0f..1cfddf8d0e 100644
--- a/civicrm/templates/CRM/Price/Page/table.tpl
+++ b/civicrm/templates/CRM/Price/Page/table.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Profile/Form/Dynamic.tpl b/civicrm/templates/CRM/Profile/Form/Dynamic.tpl
index 6b33985267..d9b67821af 100644
--- a/civicrm/templates/CRM/Profile/Form/Dynamic.tpl
+++ b/civicrm/templates/CRM/Profile/Form/Dynamic.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Profile/Form/Edit.tpl b/civicrm/templates/CRM/Profile/Form/Edit.tpl
index 080ab1ef90..745d9cb856 100644
--- a/civicrm/templates/CRM/Profile/Form/Edit.tpl
+++ b/civicrm/templates/CRM/Profile/Form/Edit.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Profile/Form/GreetingType.tpl b/civicrm/templates/CRM/Profile/Form/GreetingType.tpl
index be6f30aebe..f7293c42e7 100644
--- a/civicrm/templates/CRM/Profile/Form/GreetingType.tpl
+++ b/civicrm/templates/CRM/Profile/Form/GreetingType.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Profile/Form/Search.tpl b/civicrm/templates/CRM/Profile/Form/Search.tpl
index 350b38e86e..321215876f 100644
--- a/civicrm/templates/CRM/Profile/Form/Search.tpl
+++ b/civicrm/templates/CRM/Profile/Form/Search.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Profile/Page/Dynamic.tpl b/civicrm/templates/CRM/Profile/Page/Dynamic.tpl
index efd7ac0560..fdfb912286 100644
--- a/civicrm/templates/CRM/Profile/Page/Dynamic.tpl
+++ b/civicrm/templates/CRM/Profile/Page/Dynamic.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Profile/Page/Listings.tpl b/civicrm/templates/CRM/Profile/Page/Listings.tpl
index 3597d3160e..5cd41bc03a 100644
--- a/civicrm/templates/CRM/Profile/Page/Listings.tpl
+++ b/civicrm/templates/CRM/Profile/Page/Listings.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl b/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
index 2b07f7f7bf..5f6f091b58 100644
--- a/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
+++ b/civicrm/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Profile/Page/Overlay.tpl b/civicrm/templates/CRM/Profile/Page/Overlay.tpl
index 24a0758d47..a37f2b53d0 100644
--- a/civicrm/templates/CRM/Profile/Page/Overlay.tpl
+++ b/civicrm/templates/CRM/Profile/Page/Overlay.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Profile/Page/View.tpl b/civicrm/templates/CRM/Profile/Page/View.tpl
index 4ff8bb3b50..6090f02139 100644
--- a/civicrm/templates/CRM/Profile/Page/View.tpl
+++ b/civicrm/templates/CRM/Profile/Page/View.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form.tpl b/civicrm/templates/CRM/Report/Form.tpl
index 55c726c1e5..c5613b08f0 100644
--- a/civicrm/templates/CRM/Report/Form.tpl
+++ b/civicrm/templates/CRM/Report/Form.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Actions.tpl b/civicrm/templates/CRM/Report/Form/Actions.tpl
index 01ff1224ca..1c9213045f 100644
--- a/civicrm/templates/CRM/Report/Form/Actions.tpl
+++ b/civicrm/templates/CRM/Report/Form/Actions.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Activity.tpl b/civicrm/templates/CRM/Report/Form/Activity.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Activity.tpl
+++ b/civicrm/templates/CRM/Report/Form/Activity.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/ActivitySummary.tpl b/civicrm/templates/CRM/Report/Form/ActivitySummary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/ActivitySummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/ActivitySummary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl b/civicrm/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl
index 989bc8d255..24542d0dff 100644
--- a/civicrm/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl
+++ b/civicrm/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Campaign/SurveyDetails.tpl b/civicrm/templates/CRM/Report/Form/Campaign/SurveyDetails.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Campaign/SurveyDetails.tpl
+++ b/civicrm/templates/CRM/Report/Form/Campaign/SurveyDetails.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Case/Demographics.tpl b/civicrm/templates/CRM/Report/Form/Case/Demographics.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Case/Demographics.tpl
+++ b/civicrm/templates/CRM/Report/Form/Case/Demographics.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Case/Detail.tpl b/civicrm/templates/CRM/Report/Form/Case/Detail.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Case/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Case/Detail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Case/Summary.tpl b/civicrm/templates/CRM/Report/Form/Case/Summary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Case/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Case/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Case/TimeSpent.tpl b/civicrm/templates/CRM/Report/Form/Case/TimeSpent.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Case/TimeSpent.tpl
+++ b/civicrm/templates/CRM/Report/Form/Case/TimeSpent.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contact/CurrentEmployer.tpl b/civicrm/templates/CRM/Report/Form/Contact/CurrentEmployer.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/CurrentEmployer.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/CurrentEmployer.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contact/Detail.tpl b/civicrm/templates/CRM/Report/Form/Contact/Detail.tpl
index 18ac5b6ac3..18d898178f 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/Detail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contact/Log.tpl b/civicrm/templates/CRM/Report/Form/Contact/Log.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/Log.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/Log.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contact/LoggingDetail.tpl b/civicrm/templates/CRM/Report/Form/Contact/LoggingDetail.tpl
index 22858f3586..c7000f7f05 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/LoggingDetail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/LoggingDetail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contact/LoggingSummary.tpl b/civicrm/templates/CRM/Report/Form/Contact/LoggingSummary.tpl
index 2e4008e7f1..37e6fbc8a9 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/LoggingSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/LoggingSummary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contact/Relationship.tpl b/civicrm/templates/CRM/Report/Form/Contact/Relationship.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/Relationship.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/Relationship.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contact/Summary.tpl b/civicrm/templates/CRM/Report/Form/Contact/Summary.tpl
index e110441837..b3c2f021d2 100644
--- a/civicrm/templates/CRM/Report/Form/Contact/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contact/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Bookkeeping.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Bookkeeping.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Bookkeeping.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Bookkeeping.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Detail.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Detail.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Detail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/History.tpl b/civicrm/templates/CRM/Report/Form/Contribute/History.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/History.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/History.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/HouseholdSummary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/HouseholdSummary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/HouseholdSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/HouseholdSummary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/LoggingDetail.tpl b/civicrm/templates/CRM/Report/Form/Contribute/LoggingDetail.tpl
index 22858f3586..c7000f7f05 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/LoggingDetail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/LoggingDetail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/LoggingSummary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/LoggingSummary.tpl
index 2e4008e7f1..37e6fbc8a9 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/LoggingSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/LoggingSummary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Lybunt.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Lybunt.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Lybunt.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Lybunt.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/OrganizationSummary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/OrganizationSummary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/OrganizationSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/OrganizationSummary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/PCP.tpl b/civicrm/templates/CRM/Report/Form/Contribute/PCP.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/PCP.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/PCP.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/RecurSummary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/RecurSummary.tpl
index 5baa63b4f6..6f7be78433 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/RecurSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/RecurSummary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Repeat.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Repeat.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Repeat.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Repeat.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/SoftCredit.tpl b/civicrm/templates/CRM/Report/Form/Contribute/SoftCredit.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/SoftCredit.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/SoftCredit.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Summary.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Summary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/Sybunt.tpl b/civicrm/templates/CRM/Report/Form/Contribute/Sybunt.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/Sybunt.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/Sybunt.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Contribute/TopDonor.tpl b/civicrm/templates/CRM/Report/Form/Contribute/TopDonor.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Contribute/TopDonor.tpl
+++ b/civicrm/templates/CRM/Report/Form/Contribute/TopDonor.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Criteria.tpl b/civicrm/templates/CRM/Report/Form/Criteria.tpl
index 08cd9bb9da..5f76e4df61 100644
--- a/civicrm/templates/CRM/Report/Form/Criteria.tpl
+++ b/civicrm/templates/CRM/Report/Form/Criteria.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/ErrorMessage.tpl b/civicrm/templates/CRM/Report/Form/ErrorMessage.tpl
index 8ae03ff4d2..94322d48bb 100644
--- a/civicrm/templates/CRM/Report/Form/ErrorMessage.tpl
+++ b/civicrm/templates/CRM/Report/Form/ErrorMessage.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Event/Income.tpl b/civicrm/templates/CRM/Report/Form/Event/Income.tpl
index 2adfd7d62f..79d92fc12c 100644
--- a/civicrm/templates/CRM/Report/Form/Event/Income.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/Income.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Event/IncomeCountSummary.tpl b/civicrm/templates/CRM/Report/Form/Event/IncomeCountSummary.tpl
index 924ac186f7..9353f93d73 100644
--- a/civicrm/templates/CRM/Report/Form/Event/IncomeCountSummary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/IncomeCountSummary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Event/ParticipantListCount.tpl b/civicrm/templates/CRM/Report/Form/Event/ParticipantListCount.tpl
index 924ac186f7..9353f93d73 100644
--- a/civicrm/templates/CRM/Report/Form/Event/ParticipantListCount.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/ParticipantListCount.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Event/ParticipantListing.tpl b/civicrm/templates/CRM/Report/Form/Event/ParticipantListing.tpl
index e110441837..b3c2f021d2 100644
--- a/civicrm/templates/CRM/Report/Form/Event/ParticipantListing.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/ParticipantListing.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Event/Summary.tpl b/civicrm/templates/CRM/Report/Form/Event/Summary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Event/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Event/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Fields.tpl b/civicrm/templates/CRM/Report/Form/Fields.tpl
index 33d936a517..7d8be39135 100644
--- a/civicrm/templates/CRM/Report/Form/Fields.tpl
+++ b/civicrm/templates/CRM/Report/Form/Fields.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Grant/Detail.tpl b/civicrm/templates/CRM/Report/Form/Grant/Detail.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Grant/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Grant/Detail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Grant/Statistics.tpl b/civicrm/templates/CRM/Report/Form/Grant/Statistics.tpl
index cac7cf44b4..1d44a46bde 100644
--- a/civicrm/templates/CRM/Report/Form/Grant/Statistics.tpl
+++ b/civicrm/templates/CRM/Report/Form/Grant/Statistics.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Layout/Graph.tpl b/civicrm/templates/CRM/Report/Form/Layout/Graph.tpl
index 947e238260..528a4da5f6 100644
--- a/civicrm/templates/CRM/Report/Form/Layout/Graph.tpl
+++ b/civicrm/templates/CRM/Report/Form/Layout/Graph.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Layout/Overlay.tpl b/civicrm/templates/CRM/Report/Form/Layout/Overlay.tpl
index b7d648a1f5..ac2e7e1547 100644
--- a/civicrm/templates/CRM/Report/Form/Layout/Overlay.tpl
+++ b/civicrm/templates/CRM/Report/Form/Layout/Overlay.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Layout/Table.tpl b/civicrm/templates/CRM/Report/Form/Layout/Table.tpl
index be9ae33625..11b766e52f 100644
--- a/civicrm/templates/CRM/Report/Form/Layout/Table.tpl
+++ b/civicrm/templates/CRM/Report/Form/Layout/Table.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Bounce.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Bounce.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Bounce.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Bounce.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Clicks.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Clicks.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Clicks.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Clicks.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Detail.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Detail.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Detail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Opened.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Opened.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Opened.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Opened.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Mailing/Summary.tpl b/civicrm/templates/CRM/Report/Form/Mailing/Summary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Mailing/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Mailing/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Member/ContributionDetail.tpl b/civicrm/templates/CRM/Report/Form/Member/ContributionDetail.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Member/ContributionDetail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Member/ContributionDetail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Member/Detail.tpl b/civicrm/templates/CRM/Report/Form/Member/Detail.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Member/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Member/Detail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Member/Lapse.tpl b/civicrm/templates/CRM/Report/Form/Member/Lapse.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Member/Lapse.tpl
+++ b/civicrm/templates/CRM/Report/Form/Member/Lapse.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Member/Summary.tpl b/civicrm/templates/CRM/Report/Form/Member/Summary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Member/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Member/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Membership/Summary.tpl b/civicrm/templates/CRM/Report/Form/Membership/Summary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Membership/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Membership/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Pledge/Detail.tpl b/civicrm/templates/CRM/Report/Form/Pledge/Detail.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Pledge/Detail.tpl
+++ b/civicrm/templates/CRM/Report/Form/Pledge/Detail.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Pledge/Pbnp.tpl b/civicrm/templates/CRM/Report/Form/Pledge/Pbnp.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Pledge/Pbnp.tpl
+++ b/civicrm/templates/CRM/Report/Form/Pledge/Pbnp.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Pledge/Summary.tpl b/civicrm/templates/CRM/Report/Form/Pledge/Summary.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Pledge/Summary.tpl
+++ b/civicrm/templates/CRM/Report/Form/Pledge/Summary.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Register.tpl b/civicrm/templates/CRM/Report/Form/Register.tpl
index 0d5fea9191..4704946d66 100644
--- a/civicrm/templates/CRM/Report/Form/Register.tpl
+++ b/civicrm/templates/CRM/Report/Form/Register.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Statistics.tpl b/civicrm/templates/CRM/Report/Form/Statistics.tpl
index 445d4e6f1c..3980b0ef74 100644
--- a/civicrm/templates/CRM/Report/Form/Statistics.tpl
+++ b/civicrm/templates/CRM/Report/Form/Statistics.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl b/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl
index a5b27c1a92..764db1bbb4 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl b/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl
index 1815992919..5108d90c09 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/GroupBy.tpl b/civicrm/templates/CRM/Report/Form/Tabs/GroupBy.tpl
index 619ce999e0..fe5b2cb250 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/GroupBy.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/GroupBy.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/Instance.tpl b/civicrm/templates/CRM/Report/Form/Tabs/Instance.tpl
index fa310c3fc4..eda7ed50f3 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/Instance.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/Instance.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/OrderBy.tpl b/civicrm/templates/CRM/Report/Form/Tabs/OrderBy.tpl
index 87f8cbd7a3..27d8555274 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/OrderBy.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/OrderBy.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/ReportOptions.tpl b/civicrm/templates/CRM/Report/Form/Tabs/ReportOptions.tpl
index d3b3e5d7a2..8bae60b802 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/ReportOptions.tpl
+++ b/civicrm/templates/CRM/Report/Form/Tabs/ReportOptions.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2015 |
+| Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Tabs/Settings.hlp b/civicrm/templates/CRM/Report/Form/Tabs/Settings.hlp
index 4d3b92a0eb..2a0d8da6e0 100644
--- a/civicrm/templates/CRM/Report/Form/Tabs/Settings.hlp
+++ b/civicrm/templates/CRM/Report/Form/Tabs/Settings.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Form/Walklist/Walklist.tpl b/civicrm/templates/CRM/Report/Form/Walklist/Walklist.tpl
index 746fd5731f..60490ddaec 100644
--- a/civicrm/templates/CRM/Report/Form/Walklist/Walklist.tpl
+++ b/civicrm/templates/CRM/Report/Form/Walklist/Walklist.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Page/InstanceList.tpl b/civicrm/templates/CRM/Report/Page/InstanceList.tpl
index 742af460b6..f9341c2a98 100644
--- a/civicrm/templates/CRM/Report/Page/InstanceList.tpl
+++ b/civicrm/templates/CRM/Report/Page/InstanceList.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Page/Options.tpl b/civicrm/templates/CRM/Report/Page/Options.tpl
index f7f31c7f94..48d0dd3ded 100644
--- a/civicrm/templates/CRM/Report/Page/Options.tpl
+++ b/civicrm/templates/CRM/Report/Page/Options.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Report/Page/TemplateList.tpl b/civicrm/templates/CRM/Report/Page/TemplateList.tpl
index 4b34b6ebf9..e625c09116 100644
--- a/civicrm/templates/CRM/Report/Page/TemplateList.tpl
+++ b/civicrm/templates/CRM/Report/Page/TemplateList.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/SMS/Form/Group.hlp b/civicrm/templates/CRM/SMS/Form/Group.hlp
index de02628867..45afd72a97 100644
--- a/civicrm/templates/CRM/SMS/Form/Group.hlp
+++ b/civicrm/templates/CRM/SMS/Form/Group.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/SMS/Form/Group.tpl b/civicrm/templates/CRM/SMS/Form/Group.tpl
index 9eda39fb9c..aef1f300d1 100644
--- a/civicrm/templates/CRM/SMS/Form/Group.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Group.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/SMS/Form/Provider.tpl b/civicrm/templates/CRM/SMS/Form/Provider.tpl
index 163ac9fe3b..48d644dbf1 100644
--- a/civicrm/templates/CRM/SMS/Form/Provider.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Provider.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/SMS/Form/Schedule.hlp b/civicrm/templates/CRM/SMS/Form/Schedule.hlp
index 5e6e45b531..7ef718efd0 100644
--- a/civicrm/templates/CRM/SMS/Form/Schedule.hlp
+++ b/civicrm/templates/CRM/SMS/Form/Schedule.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/SMS/Form/Schedule.tpl b/civicrm/templates/CRM/SMS/Form/Schedule.tpl
index 842e596e95..2c03ef5ddb 100644
--- a/civicrm/templates/CRM/SMS/Form/Schedule.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Schedule.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/SMS/Form/Task/SMS.tpl b/civicrm/templates/CRM/SMS/Form/Task/SMS.tpl
index 6ba817012c..92f3509814 100644
--- a/civicrm/templates/CRM/SMS/Form/Task/SMS.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Task/SMS.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/SMS/Form/Upload.hlp b/civicrm/templates/CRM/SMS/Form/Upload.hlp
index ece341a49a..f080e8b817 100644
--- a/civicrm/templates/CRM/SMS/Form/Upload.hlp
+++ b/civicrm/templates/CRM/SMS/Form/Upload.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/SMS/Form/Upload.tpl b/civicrm/templates/CRM/SMS/Form/Upload.tpl
index bf8c615162..878542766f 100644
--- a/civicrm/templates/CRM/SMS/Form/Upload.tpl
+++ b/civicrm/templates/CRM/SMS/Form/Upload.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/SMS/Page/Provider.tpl b/civicrm/templates/CRM/SMS/Page/Provider.tpl
index e84cf6361a..ad8faa7a3a 100644
--- a/civicrm/templates/CRM/SMS/Page/Provider.tpl
+++ b/civicrm/templates/CRM/SMS/Page/Provider.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Tag/Form/Tag.tpl b/civicrm/templates/CRM/Tag/Form/Tag.tpl
index b1454945b0..1cf656f931 100644
--- a/civicrm/templates/CRM/Tag/Form/Tag.tpl
+++ b/civicrm/templates/CRM/Tag/Form/Tag.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Tag/Form/Tagtree.hlp b/civicrm/templates/CRM/Tag/Form/Tagtree.hlp
index cd7d4874eb..e27da4da05 100644
--- a/civicrm/templates/CRM/Tag/Form/Tagtree.hlp
+++ b/civicrm/templates/CRM/Tag/Form/Tagtree.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Tag/Form/Tagtree.tpl b/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
index 627849c998..62d6957839 100644
--- a/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
+++ b/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl b/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl
index 0ce5d8f42d..55c251d33e 100644
--- a/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl
+++ b/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/UF/Form/Block.tpl b/civicrm/templates/CRM/UF/Form/Block.tpl
index 33dcd7519a..ccbd5c7583 100644
--- a/civicrm/templates/CRM/UF/Form/Block.tpl
+++ b/civicrm/templates/CRM/UF/Form/Block.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -120,7 +120,7 @@
{include file="CRM/Profile/Form/GreetingType.tpl"}
{elseif ($n eq 'group' && $form.group) || ($n eq 'tag' && $form.tag)}
{include file="CRM/Contact/Form/Edit/TagsAndGroups.tpl" type=$n title=null context="profile"}
- {elseif ( ( $field.data_type eq 'Date' ) or
+ {elseif ((( $field.data_type eq 'Date' ) AND !$prefix) or
( $n|substr:-5:5 eq '_date' ) ) AND
( $form.formName neq 'Confirm' ) AND
( $form.formName neq 'ThankYou' ) }
diff --git a/civicrm/templates/CRM/UF/Form/Field.tpl b/civicrm/templates/CRM/UF/Form/Field.tpl
index 10e00edd1e..3d640891d9 100644
--- a/civicrm/templates/CRM/UF/Form/Field.tpl
+++ b/civicrm/templates/CRM/UF/Form/Field.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/UF/Form/Group.hlp b/civicrm/templates/CRM/UF/Form/Group.hlp
index be9468a4fc..cbd92b60ec 100644
--- a/civicrm/templates/CRM/UF/Form/Group.hlp
+++ b/civicrm/templates/CRM/UF/Form/Group.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/UF/Form/Group.tpl b/civicrm/templates/CRM/UF/Form/Group.tpl
index f470403d00..64a04f03d4 100644
--- a/civicrm/templates/CRM/UF/Form/Group.tpl
+++ b/civicrm/templates/CRM/UF/Form/Group.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/UF/Form/Preview.tpl b/civicrm/templates/CRM/UF/Form/Preview.tpl
index 024fbf0273..691d45ccd6 100644
--- a/civicrm/templates/CRM/UF/Form/Preview.tpl
+++ b/civicrm/templates/CRM/UF/Form/Preview.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/UF/Page/Field.tpl b/civicrm/templates/CRM/UF/Page/Field.tpl
index 20c5e51093..d9135ee524 100644
--- a/civicrm/templates/CRM/UF/Page/Field.tpl
+++ b/civicrm/templates/CRM/UF/Page/Field.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/UF/Page/Group.hlp b/civicrm/templates/CRM/UF/Page/Group.hlp
index 71ced40cd7..cf2dff711a 100644
--- a/civicrm/templates/CRM/UF/Page/Group.hlp
+++ b/civicrm/templates/CRM/UF/Page/Group.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/UF/Page/Group.tpl b/civicrm/templates/CRM/UF/Page/Group.tpl
index 1c07ec71fc..a7096db679 100644
--- a/civicrm/templates/CRM/UF/Page/Group.tpl
+++ b/civicrm/templates/CRM/UF/Page/Group.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Upgrade/Base.tpl b/civicrm/templates/CRM/Upgrade/Base.tpl
index 400e770ac7..06b7eba76a 100644
--- a/civicrm/templates/CRM/Upgrade/Base.tpl
+++ b/civicrm/templates/CRM/Upgrade/Base.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/Widget/widget.tpl b/civicrm/templates/CRM/Widget/widget.tpl
index 966fefb7e2..24062feb7e 100644
--- a/civicrm/templates/CRM/Widget/widget.tpl
+++ b/civicrm/templates/CRM/Widget/widget.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/CMSUser.tpl b/civicrm/templates/CRM/common/CMSUser.tpl
index 72d65d4b0f..15d46ecb95 100644
--- a/civicrm/templates/CRM/common/CMSUser.tpl
+++ b/civicrm/templates/CRM/common/CMSUser.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/ReCAPTCHA.tpl b/civicrm/templates/CRM/common/ReCAPTCHA.tpl
index 26317f55fe..b7877b29ed 100644
--- a/civicrm/templates/CRM/common/ReCAPTCHA.tpl
+++ b/civicrm/templates/CRM/common/ReCAPTCHA.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/SectionNav.tpl b/civicrm/templates/CRM/common/SectionNav.tpl
index a0d7fb058a..a85f654446 100644
--- a/civicrm/templates/CRM/common/SectionNav.tpl
+++ b/civicrm/templates/CRM/common/SectionNav.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/SocialNetwork.tpl b/civicrm/templates/CRM/common/SocialNetwork.tpl
index 513f8f7bf8..d65015be99 100644
--- a/civicrm/templates/CRM/common/SocialNetwork.tpl
+++ b/civicrm/templates/CRM/common/SocialNetwork.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -35,10 +35,10 @@
<div class="crm-fb-tweet-buttons">
{if $emailMode eq true}
{*use images for email*}
- <a href="http://twitter.com/share?url={$url|escape:'url'}&text={$title}" id="crm_tweet">
+ <a href="https://twitter.com/share?url={$url|escape:'url'}&text={$title}" id="crm_tweet">
<img title="Twitter Tweet Button" src="{$config->userFrameworkResourceURL|replace:'https://':'http://'}/i/tweet.png" width="55px" height="20px" alt="Tweet Button">
</a>
- <a href="http://www.facebook.com/plugins/like.php?href={$url}" target="_blank">
+ <a href="https://www.facebook.com/plugins/like.php?href={$url}" target="_blank">
<img title="Facebook Like Button" src="{$config->userFrameworkResourceURL|replace:'https://':'http://'}/i/fblike.png" alt="Facebook Button" />
</a>
{else}
diff --git a/civicrm/templates/CRM/common/TabHeader.tpl b/civicrm/templates/CRM/common/TabHeader.tpl
index faf2a42658..bc55e02fe1 100644
--- a/civicrm/templates/CRM/common/TabHeader.tpl
+++ b/civicrm/templates/CRM/common/TabHeader.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/Tagset.tpl b/civicrm/templates/CRM/common/Tagset.tpl
index cb16566581..e44a899374 100644
--- a/civicrm/templates/CRM/common/Tagset.tpl
+++ b/civicrm/templates/CRM/common/Tagset.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/TrackingFields.tpl b/civicrm/templates/CRM/common/TrackingFields.tpl
index a225d2cd76..bb12689eaf 100644
--- a/civicrm/templates/CRM/common/TrackingFields.tpl
+++ b/civicrm/templates/CRM/common/TrackingFields.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/WizardHeader.tpl b/civicrm/templates/CRM/common/WizardHeader.tpl
index 2e9a6abc11..f21a4618a8 100644
--- a/civicrm/templates/CRM/common/WizardHeader.tpl
+++ b/civicrm/templates/CRM/common/WizardHeader.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/accesskeys.hlp b/civicrm/templates/CRM/common/accesskeys.hlp
index 6cee0a381d..0daf849b4b 100644
--- a/civicrm/templates/CRM/common/accesskeys.hlp
+++ b/civicrm/templates/CRM/common/accesskeys.hlp
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/accesskeys.tpl b/civicrm/templates/CRM/common/accesskeys.tpl
index 8fbb375746..bac4f026cb 100644
--- a/civicrm/templates/CRM/common/accesskeys.tpl
+++ b/civicrm/templates/CRM/common/accesskeys.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/additionalBlocks.tpl b/civicrm/templates/CRM/common/additionalBlocks.tpl
index 3f53a22cdb..c71c883d0c 100644
--- a/civicrm/templates/CRM/common/additionalBlocks.tpl
+++ b/civicrm/templates/CRM/common/additionalBlocks.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/backdrop.tpl b/civicrm/templates/CRM/common/backdrop.tpl
index 0da5579632..39e0729b72 100644
--- a/civicrm/templates/CRM/common/backdrop.tpl
+++ b/civicrm/templates/CRM/common/backdrop.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/batchCopy.tpl b/civicrm/templates/CRM/common/batchCopy.tpl
index 2389aeff2f..b72ab43b12 100644
--- a/civicrm/templates/CRM/common/batchCopy.tpl
+++ b/civicrm/templates/CRM/common/batchCopy.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/checkUsernameAvailable.tpl b/civicrm/templates/CRM/common/checkUsernameAvailable.tpl
index 6c6941b65a..bb9cd14361 100644
--- a/civicrm/templates/CRM/common/checkUsernameAvailable.tpl
+++ b/civicrm/templates/CRM/common/checkUsernameAvailable.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/civicrm.settings.php.template b/civicrm/templates/CRM/common/civicrm.settings.php.template
index 2b2060f170..cee15b1d74 100644
--- a/civicrm/templates/CRM/common/civicrm.settings.php.template
+++ b/civicrm/templates/CRM/common/civicrm.settings.php.template
@@ -3,7 +3,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/contactFooter.tpl b/civicrm/templates/CRM/common/contactFooter.tpl
index 0e5efc2ae4..8364740c46 100644
--- a/civicrm/templates/CRM/common/contactFooter.tpl
+++ b/civicrm/templates/CRM/common/contactFooter.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/customData.tpl b/civicrm/templates/CRM/common/customData.tpl
index 42ce145941..71a737553f 100644
--- a/civicrm/templates/CRM/common/customData.tpl
+++ b/civicrm/templates/CRM/common/customData.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/dashboard.tpl b/civicrm/templates/CRM/common/dashboard.tpl
index c66cb53869..7c922c7d53 100644
--- a/civicrm/templates/CRM/common/dashboard.tpl
+++ b/civicrm/templates/CRM/common/dashboard.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/debug.tpl b/civicrm/templates/CRM/common/debug.tpl
index 3b43a21a5e..a28149a299 100644
--- a/civicrm/templates/CRM/common/debug.tpl
+++ b/civicrm/templates/CRM/common/debug.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/displaySearchCriteria.tpl b/civicrm/templates/CRM/common/displaySearchCriteria.tpl
index b1083a7aa2..2f47523905 100644
--- a/civicrm/templates/CRM/common/displaySearchCriteria.tpl
+++ b/civicrm/templates/CRM/common/displaySearchCriteria.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/drupal.tpl b/civicrm/templates/CRM/common/drupal.tpl
index 0da5579632..39e0729b72 100644
--- a/civicrm/templates/CRM/common/drupal.tpl
+++ b/civicrm/templates/CRM/common/drupal.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/drupal6.tpl b/civicrm/templates/CRM/common/drupal6.tpl
index b434ac2b66..86cb017222 100644
--- a/civicrm/templates/CRM/common/drupal6.tpl
+++ b/civicrm/templates/CRM/common/drupal6.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/drupal8.tpl b/civicrm/templates/CRM/common/drupal8.tpl
index 0da5579632..39e0729b72 100644
--- a/civicrm/templates/CRM/common/drupal8.tpl
+++ b/civicrm/templates/CRM/common/drupal8.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/enableDisableApi.tpl b/civicrm/templates/CRM/common/enableDisableApi.tpl
index 83836f45bb..cda3f933a4 100644
--- a/civicrm/templates/CRM/common/enableDisableApi.tpl
+++ b/civicrm/templates/CRM/common/enableDisableApi.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/fatal.tpl b/civicrm/templates/CRM/common/fatal.tpl
index 6daa183d19..757cadd2cb 100644
--- a/civicrm/templates/CRM/common/fatal.tpl
+++ b/civicrm/templates/CRM/common/fatal.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/footer.tpl b/civicrm/templates/CRM/common/footer.tpl
index b1ce4f5895..fdc57cfd7f 100644
--- a/civicrm/templates/CRM/common/footer.tpl
+++ b/civicrm/templates/CRM/common/footer.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/formButtons.tpl b/civicrm/templates/CRM/common/formButtons.tpl
index b5e4692a13..16ef4aa99f 100644
--- a/civicrm/templates/CRM/common/formButtons.tpl
+++ b/civicrm/templates/CRM/common/formButtons.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/highLightImport.tpl b/civicrm/templates/CRM/common/highLightImport.tpl
index 699d1a7cc9..c237137081 100644
--- a/civicrm/templates/CRM/common/highLightImport.tpl
+++ b/civicrm/templates/CRM/common/highLightImport.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/info.tpl b/civicrm/templates/CRM/common/info.tpl
index 9e94db92a7..7261f27387 100644
--- a/civicrm/templates/CRM/common/info.tpl
+++ b/civicrm/templates/CRM/common/info.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/jcalendar.tpl b/civicrm/templates/CRM/common/jcalendar.tpl
index ec555b9fdc..014c5a62ea 100644
--- a/civicrm/templates/CRM/common/jcalendar.tpl
+++ b/civicrm/templates/CRM/common/jcalendar.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/joomla.tpl b/civicrm/templates/CRM/common/joomla.tpl
index 8b86e9f4a6..303ae03ca4 100644
--- a/civicrm/templates/CRM/common/joomla.tpl
+++ b/civicrm/templates/CRM/common/joomla.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/jsortable.tpl b/civicrm/templates/CRM/common/jsortable.tpl
index 136236f3d6..0ba4ff34ef 100644
--- a/civicrm/templates/CRM/common/jsortable.tpl
+++ b/civicrm/templates/CRM/common/jsortable.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/l10n.js.tpl b/civicrm/templates/CRM/common/l10n.js.tpl
index 23930385d7..46720e5354 100644
--- a/civicrm/templates/CRM/common/l10n.js.tpl
+++ b/civicrm/templates/CRM/common/l10n.js.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/localNav.tpl b/civicrm/templates/CRM/common/localNav.tpl
index f8b190f7aa..a3f27cd084 100644
--- a/civicrm/templates/CRM/common/localNav.tpl
+++ b/civicrm/templates/CRM/common/localNav.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/logButton.tpl b/civicrm/templates/CRM/common/logButton.tpl
index 44090b91ac..4a9da7e55a 100644
--- a/civicrm/templates/CRM/common/logButton.tpl
+++ b/civicrm/templates/CRM/common/logButton.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/navigation.js.tpl b/civicrm/templates/CRM/common/navigation.js.tpl
index b39e8703f5..fdce48e01b 100644
--- a/civicrm/templates/CRM/common/navigation.js.tpl
+++ b/civicrm/templates/CRM/common/navigation.js.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/openFlashChart.tpl b/civicrm/templates/CRM/common/openFlashChart.tpl
index 729fccc729..f28bdc07c3 100644
--- a/civicrm/templates/CRM/common/openFlashChart.tpl
+++ b/civicrm/templates/CRM/common/openFlashChart.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/pager.tpl b/civicrm/templates/CRM/common/pager.tpl
index 129e2d67d4..186f888fee 100644
--- a/civicrm/templates/CRM/common/pager.tpl
+++ b/civicrm/templates/CRM/common/pager.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/pagerAToZ.tpl b/civicrm/templates/CRM/common/pagerAToZ.tpl
index b3f207055f..90661644ae 100644
--- a/civicrm/templates/CRM/common/pagerAToZ.tpl
+++ b/civicrm/templates/CRM/common/pagerAToZ.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/paymentBlock.tpl b/civicrm/templates/CRM/common/paymentBlock.tpl
index 8710e439b6..73e05bba0e 100644
--- a/civicrm/templates/CRM/common/paymentBlock.tpl
+++ b/civicrm/templates/CRM/common/paymentBlock.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/print.tpl b/civicrm/templates/CRM/common/print.tpl
index 79ff6bf729..199af5f4e5 100644
--- a/civicrm/templates/CRM/common/print.tpl
+++ b/civicrm/templates/CRM/common/print.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/printBody.tpl b/civicrm/templates/CRM/common/printBody.tpl
index 82976196be..5093bfa173 100644
--- a/civicrm/templates/CRM/common/printBody.tpl
+++ b/civicrm/templates/CRM/common/printBody.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/publicFooter.tpl b/civicrm/templates/CRM/common/publicFooter.tpl
index 1920f55d03..17b8f30894 100644
--- a/civicrm/templates/CRM/common/publicFooter.tpl
+++ b/civicrm/templates/CRM/common/publicFooter.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/recentlyViewed.tpl b/civicrm/templates/CRM/common/recentlyViewed.tpl
index 7a688c1a9e..26664c228c 100644
--- a/civicrm/templates/CRM/common/recentlyViewed.tpl
+++ b/civicrm/templates/CRM/common/recentlyViewed.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/searchResultTasks.tpl b/civicrm/templates/CRM/common/searchResultTasks.tpl
index df62553b0b..8c976586af 100644
--- a/civicrm/templates/CRM/common/searchResultTasks.tpl
+++ b/civicrm/templates/CRM/common/searchResultTasks.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/showHide.tpl b/civicrm/templates/CRM/common/showHide.tpl
index f8dccb2dad..df3a0a6d2d 100644
--- a/civicrm/templates/CRM/common/showHide.tpl
+++ b/civicrm/templates/CRM/common/showHide.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/showHideByFieldValue.tpl b/civicrm/templates/CRM/common/showHideByFieldValue.tpl
index 913e831879..fe1dafa239 100644
--- a/civicrm/templates/CRM/common/showHideByFieldValue.tpl
+++ b/civicrm/templates/CRM/common/showHideByFieldValue.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/snippet.tpl b/civicrm/templates/CRM/common/snippet.tpl
index ad16f9417c..76fc7fe2c7 100644
--- a/civicrm/templates/CRM/common/snippet.tpl
+++ b/civicrm/templates/CRM/common/snippet.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/status.tpl b/civicrm/templates/CRM/common/status.tpl
index 36d3f420f8..b4a95d5624 100644
--- a/civicrm/templates/CRM/common/status.tpl
+++ b/civicrm/templates/CRM/common/status.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/success.tpl b/civicrm/templates/CRM/common/success.tpl
index a37bfd3836..993c73e8bf 100644
--- a/civicrm/templates/CRM/common/success.tpl
+++ b/civicrm/templates/CRM/common/success.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/unittests.tpl b/civicrm/templates/CRM/common/unittests.tpl
index 0da5579632..39e0729b72 100644
--- a/civicrm/templates/CRM/common/unittests.tpl
+++ b/civicrm/templates/CRM/common/unittests.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/upgradeCleanup.tpl b/civicrm/templates/CRM/common/upgradeCleanup.tpl
index dd4719b6ce..e2d6c33386 100644
--- a/civicrm/templates/CRM/common/upgradeCleanup.tpl
+++ b/civicrm/templates/CRM/common/upgradeCleanup.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/templates/CRM/common/version.tpl b/civicrm/templates/CRM/common/version.tpl
index 5ca7df98c4..81dd1e5ccd 100644
--- a/civicrm/templates/CRM/common/version.tpl
+++ b/civicrm/templates/CRM/common/version.tpl
@@ -1 +1 @@
-4.7.4
\ No newline at end of file
+4.7.6
\ No newline at end of file
diff --git a/civicrm/templates/CRM/common/wordpress.tpl b/civicrm/templates/CRM/common/wordpress.tpl
index b7b58cc50c..7d5ed8af88 100644
--- a/civicrm/templates/CRM/common/wordpress.tpl
+++ b/civicrm/templates/CRM/common/wordpress.tpl
@@ -2,7 +2,7 @@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 3cd8ea2f91..253e6f10c6 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderIniteb3bb96c653f131999e870853329d5ef::getLoader();
+return ComposerAutoloaderInite227dd8b21e2dc3aa42fc3597b7eb0eb::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 9b379c53ee..b7d45ca37d 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 ComposerAutoloaderIniteb3bb96c653f131999e870853329d5ef
+class ComposerAutoloaderInite227dd8b21e2dc3aa42fc3597b7eb0eb
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderIniteb3bb96c653f131999e870853329d5ef
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderIniteb3bb96c653f131999e870853329d5ef', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInite227dd8b21e2dc3aa42fc3597b7eb0eb', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderIniteb3bb96c653f131999e870853329d5ef', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInite227dd8b21e2dc3aa42fc3597b7eb0eb', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
@@ -46,14 +46,14 @@ class ComposerAutoloaderIniteb3bb96c653f131999e870853329d5ef
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequireeb3bb96c653f131999e870853329d5ef($file);
+ composerRequiree227dd8b21e2dc3aa42fc3597b7eb0eb($file);
}
return $loader;
}
}
-function composerRequireeb3bb96c653f131999e870853329d5ef($file)
+function composerRequiree227dd8b21e2dc3aa42fc3597b7eb0eb($file)
{
require $file;
}
diff --git a/includes/civicrm.basepage.php b/includes/civicrm.basepage.php
index 41fe1865f3..1e9f49a9d0 100644
--- a/includes/civicrm.basepage.php
+++ b/includes/civicrm.basepage.php
@@ -61,8 +61,6 @@ class CiviCRM_For_WordPress_Basepage {
// store reference to Civi object
$this->civi = civi_wp();
- return $this;
-
}
diff --git a/includes/civicrm.shortcodes.modal.php b/includes/civicrm.shortcodes.modal.php
index c250d4ea5e..2d5191baed 100644
--- a/includes/civicrm.shortcodes.modal.php
+++ b/includes/civicrm.shortcodes.modal.php
@@ -61,8 +61,6 @@ class CiviCRM_For_WordPress_Shortcodes_Modal {
// store reference to Civi object
$this->civi = civi_wp();
- return $this;
-
}
diff --git a/includes/civicrm.shortcodes.php b/includes/civicrm.shortcodes.php
index 9e2281a4b0..7330e5c51e 100644
--- a/includes/civicrm.shortcodes.php
+++ b/includes/civicrm.shortcodes.php
@@ -70,8 +70,6 @@ class CiviCRM_For_WordPress_Shortcodes {
// store reference to Civi object
$this->civi = civi_wp();
- return $this;
-
}
diff --git a/includes/civicrm.users.php b/includes/civicrm.users.php
index 3e01243987..1953e2243d 100644
--- a/includes/civicrm.users.php
+++ b/includes/civicrm.users.php
@@ -61,8 +61,6 @@ class CiviCRM_For_WordPress_Users {
// store reference to Civi object
$this->civi = civi_wp();
- return $this;
-
}
--
GitLab