Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accumulated backports for Mosaico support #9555

Closed
wants to merge 19 commits into from
Closed

Accumulated backports for Mosaico support #9555

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1ec5bd0
CRM-19690 - TokenProcessor - Backport from v4.7 to v4.6
totten Dec 6, 2016
e1e95d7
CRM-19690 - CRM_Mailing_TokensTest - Define negative test scenario
totten Dec 22, 2016
d5c4958
CRM-19690 - MailingJob - Extract findPendingTasks().
totten Dec 7, 2016
6fbbc4b
CRM-19690 - Mailing - Make getTemplates and getVerpAndUrlsAndHeaders …
totten Nov 29, 2016
5c92978
CRM-19690 - CRM_Utils_Token::getAnonymousTokenDetails() - Add missing…
totten Nov 29, 2016
3c65d1d
CRM-19690 - CRM_Mailing_MailingSystemTest - Improve CiviMail test cov…
totten Dec 16, 2016
6ce1c8e
CRM-19690 - CRM_Mailing_MailingSystemTest - Improve CiviMail test cov…
totten Dec 17, 2016
7fb0e12
CRM-19690 - MailingJob::findPendingTasks() - Tweak style
totten Dec 22, 2016
d6c1e51
CRM-19690 - crmMailingBlockRecipients - Provide selector for more dow…
totten Dec 13, 2016
530ee4d
CRM-19826 - CRM_Extension_System - Fix extra slash in `vendor` URLs
totten Dec 20, 2016
8769c52
CRM-19690 - crmMailing - Pick editor layout using template_type
totten Nov 28, 2016
720633b
CRM-19690 - Task_AdhocMailing - Use highest-priority template type
totten Jan 17, 2017
2cdf7a3
CRM-19690 - Enable FlexMailer (if present)
totten Dec 3, 2016
86344a2
CRM-19690 - Enable FlexMailer (if present) - Fixup for v4.6
totten Dec 17, 2016
d9df759
hook_civicrm_container - Backport
totten Jan 5, 2017
92a49a3
CRM_Utils_String - startsWith(), endsWith(), filterByWildcards()
totten Feb 10, 2016
c829601
Civi\Test - Backport helper test classes from 4.7.
totten Jan 5, 2017
30ef9dd
CRM-17860 - civicrm.settings.php.template - Load test DB if requested
totten Jan 5, 2017
528b869
CRM_Extension_Browser - Allow different cache files for different feeds
totten Jan 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CRM-19690 - CRM_Utils_Token::getAnonymousTokenDetails() - Add missing… 
… `static`

This function is only called once, and it previously lacked test coverage,
so the `static` warning previously snuck through. Fix it!
  • Loading branch information
@totten
totten committed Jan 18, 2017
commit 5c92978d99bb5d77436671ebe17fb1c190a4dd1f
2 changes: 1 addition & 1 deletion CRM/Utils/Token.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ public static function getTokenDetails(
* @return array
* contactDetails with hooks swapped out
*/
public function getAnonymousTokenDetails($contactIDs = array(
public static function getAnonymousTokenDetails($contactIDs = array(
0,
),
$returnProperties = NULL,
Expand Down