From 6d1ac2028147e791c4a371a594802ee5c7af24e7 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 3 Feb 2021 17:29:09 -0500 Subject: [PATCH] [various] Fix Notification class paths - Address https://github.com/friendica/friendica/issues/9896 - Follow-up to https://github.com/friendica/friendica/pull/9860 --- public_server/public_server.php | 4 ++-- testdrive/testdrive.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public_server/public_server.php b/public_server/public_server.php index 472a442f9..482a8a0c6 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -58,7 +58,7 @@ function public_server_cron($a, $b) if (DBA::isResult($r)) { foreach ($r as $rr) { notification([ - 'type' => Notification/Type::SYSTEM, + 'type' => Notification\Type::SYSTEM, 'uid' => $rr['uid'], 'system_type' => 'public_server_expire', 'source_name' => DI::l10n()->t('Administrator'), @@ -112,7 +112,7 @@ function public_server_cron($a, $b) function public_server_enotify(&$a, &$b) { - if (!empty($b['params']) && $b['params']['type'] == Type::SYSTEM + if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') { $b['itemlink'] = DI::baseUrl()->get(); $b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename')); diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index e0e0fb57b..7c3af59e0 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -58,7 +58,7 @@ function testdrive_cron($a,$b) { if(count($r)) { foreach($r as $rr) { notification([ - 'type' => Notification/Type::SYSTEM, + 'type' => Notification\Type::SYSTEM, 'uid' => $rr['uid'], 'system_type' => 'testdrive_expire', 'source_name' => DI::l10n()->t('Administrator'), @@ -83,7 +83,7 @@ function testdrive_cron($a,$b) { } function testdrive_enotify(&$a, &$b) { - if (!empty($b['params']) && $b['params']['type'] == Type::SYSTEM + if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'testdrive_expire') { $b['itemlink'] = DI::baseUrl()->get(); $b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename'));