Make EMailer util dynamic

diff --git a/include/enotify.php b/include/enotify.php
index 144460693d1fc58ec2aea0df3bf1e5cc172f5fcf..75ad7ef1fa11a2d6edccce035a5625a83f7272f8 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -610,7 +610,7 @@ function notification($params)
                ]);
 
                // use the Emailer class to send the message
-               return Emailer::send([
+               return DI::emailer()->send([
                        'uid' => $params['uid'],
                        'fromName' => $sender_name,
                        'fromEmail' => $sender_email,

diff --git a/mod/item.php b/mod/item.php
index a9c5d43580794d660e7fa2a83099c994bd36c6a4..a5ff594a0c282bd29d4de14d8cc33ab423b55ffa 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -816,7 +816,7 @@ function item_post(App $a) {
                                        'htmlVersion' => $message,
                                        'textVersion' => HTML::toPlaintext($html.$disclaimer)
                                ];
-                               Emailer::send($params);
+                               DI::emailer()->send($params);
                        }
                }
        }

diff --git a/src/DI.php b/src/DI.php
index 3034bd971c6c371f06a905d342b2a6be6565710f..6eb1ed4b633c17d73c2f67cef8495f5063cdd8c4 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -363,4 +363,12 @@ abstract class DI
        {
                return self::$dice->create(Util\Profiler::class);
        }
+
+       /**
+        * @return Util\Emailer
+        */
+       public static function emailer()
+       {
+               return self::$dice->create(Util\Emailer::class);
+       }
 }

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 41835b6609b7abe210cb91836645d71d1df2ee3f..776d3592163582d77193b0027d2ffbbe1291f986 100644 (file)
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -31,7 +31,7 @@ class Emailer
         * @return bool
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function send(array $params)
+       public function send(array $params)
        {
                $params['sent'] = false;