From 19fd0a22d7cbafd4d1e536c63f73ace0962db681 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 4 Jan 2020 23:59:19 +0100 Subject: [PATCH 1/2] Remove get_server() in favor of Config::get() --- testdrive/testdrive.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index 5f5dceaae..58b8b8926 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -10,6 +10,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; +use Friendica\Core\Search; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; @@ -102,6 +103,6 @@ function testdrive_enotify(&$a, &$b) { $b['itemlink'] = DI::baseUrl()->get(); $b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename')); $b['subject'] = L10n::t('Your Friendica test account is about to expire.'); - $b['body'] = L10n::t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".Config::get('system', 'url')."]".Config::get('config', 'sitename')."[/url]", get_server()); + $b['body'] = L10n::t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".Config::get('system', 'url')."]".Config::get('config', 'sitename')."[/url]", Config::get('system', 'directory', Search::DEFAULT_DIRECTORY)); } } From b6fd3f71f00e317323cd7c117113c4d3a8153000 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 5 Jan 2020 00:04:04 +0100 Subject: [PATCH 2/2] Remove get_server() in favor of Search::getGlobalDirectory() --- testdrive/testdrive.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index 58b8b8926..aef4b455a 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -103,6 +103,6 @@ function testdrive_enotify(&$a, &$b) { $b['itemlink'] = DI::baseUrl()->get(); $b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename')); $b['subject'] = L10n::t('Your Friendica test account is about to expire.'); - $b['body'] = L10n::t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".Config::get('system', 'url')."]".Config::get('config', 'sitename')."[/url]", Config::get('system', 'directory', Search::DEFAULT_DIRECTORY)); + $b['body'] = L10n::t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".Config::get('system', 'url')."]".Config::get('config', 'sitename')."[/url]", Search::getGlobalDirectory()); } }