Merge pull request #451 from annando/emailer

Addons hadn't been changed for the moved emailer class

diff --git a/dav/friendica/main.php b/dav/friendica/main.php
index 05f6f71406164b5fcf22764e2352980605e4cebb..006dce957f1212f9c97b39a46cd53e583cf0ebb0 100644 (file)
--- a/dav/friendica/main.php
+++ b/dav/friendica/main.php
@@ -1,4 +1,5 @@
 <?php
+use Friendica\Util\Emailer;
 
 require_once('include/security.php');
 
@@ -285,7 +286,6 @@ function dav_cron(&$a, &$b)
                                                'textVersion'          => $text_text,
                                                'additionalMailHeader' => "",
                                        );
-                                       require_once('include/Emailer.php');
                                        Emailer::send($params);
                                }
                                break;

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 3f2cdc890ab0fa6f565a587996f026d7c9d934ea..594a7540d90f28942f18833efa421b3b6ca0ca51 100644 (file)
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -9,7 +9,7 @@
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> (Port to Friendica)
  */
 
-require_once('include/Emailer.php');
+use Friendica\Util\Emailer;
 
 function notifyall_install() {
        logger("installed notifyall");

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 953766962092a5472ad0656de5b49624d8572fb7..011e60da8f9303d6c6a1d273933b8f8f045b45fc 100644 (file)
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -8,8 +8,7 @@
 
 use Friendica\App;
 use Friendica\Core\PConfig;
-
-require_once 'include/Emailer.php';
+use Friendica\Util\Emailer;
 
 /* because the fraking openpgp-php is in composer, require libs in composer
  * and then don't use autoloader to load classes... */