friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1127 from nupplaphil/bug/friendica-10312 

[securemail,phpmailer] Increase priority for securemail over phpmailer
pull/1130/head
Michael Vogel 2021-05-29 21:14:06 +02:00 committed by GitHub
parent f014d84798 bb8c01eba7
commit 431607509d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpmailer/phpmailer.php
View File

@ -20,7 +20,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'a
function phpmailer_install() function phpmailer_install()
{ {
Hook::register('load_config' , __FILE__, 'phpmailer_load_config'); Hook::register('load_config' , __FILE__, 'phpmailer_load_config');
Hook::register('emailer_send_prepare', __FILE__, 'phpmailer_emailer_send_prepare'); Hook::register('emailer_send_prepare', __FILE__, 'phpmailer_emailer_send_prepare', 5);
} }
function phpmailer_load_config(App $a, ConfigFileLoader $loader) function phpmailer_load_config(App $a, ConfigFileLoader $loader)

4
securemail/securemail.php
View File

@ -19,9 +19,9 @@ require_once __DIR__ . '/vendor/autoload.php';
function securemail_install() function securemail_install()
{ {
Hook::register('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings'); Hook::register('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post'); Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post', 10);
Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare'); Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare', 10);
Logger::log('installed securemail'); Logger::log('installed securemail');
} }