Merge branch 'master' into develop

diff --cc advancedcontentfilter/advancedcontentfilter.php
Simple merge

diff --cc buffer/buffer.php
Simple merge

diff --cc curweather/curweather.php
index 4c24007,d1ef63b..6d7edc0
--- 1/curweather/curweather.php
--- 2/curweather/curweather.php
+++ b/curweather/curweather.php
@@@ -9,12 -9,10 +9,10 @@@
   *
   */
  
- require_once 'include/text.php';
- 
  use Friendica\App;
 -use Friendica\Core\Addon;
  use Friendica\Core\Cache;
  use Friendica\Core\Config;
 +use Friendica\Core\Hook;
  use Friendica\Core\L10n;
  use Friendica\Core\PConfig;
  use Friendica\Core\Renderer;

diff --cc forumdirectory/forumdirectory.php
index c07f072,526a35f..a66e85d
--- 1/forumdirectory/forumdirectory.php
--- 2/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@@ -20,13 -20,9 +20,9 @@@ use Friendica\Model\Profile
  use Friendica\Util\Strings;
  use Friendica\Util\Temporal;
  
- require_once 'boot.php';
- require_once 'include/dba.php';
- require_once 'include/text.php';
- 
  function forumdirectory_install()
  {
 -      Addon::registerHook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
 +      Hook::register('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
  }
  
  function forumdirectory_uninstall()

diff --cc fromgplus/fromgplus.php
index 28cb760,b8217fc..245766d
--- 1/fromgplus/fromgplus.php
--- 2/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@@ -23,12 -23,10 +23,10 @@@ use Friendica\Model\Item
  
  require_once 'mod/share.php';
  require_once 'mod/parse_url.php';
- require_once 'include/text.php';
- 
  function fromgplus_install() {
 -      Addon::registerHook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
 -      Addon::registerHook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
 -      Addon::registerHook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
 +      Hook::register('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
 +      Hook::register('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
 +      Hook::register('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
  }
  
  function fromgplus_uninstall() {

diff --cc ifttt/ifttt.php
index a189149,d7eb510..3bb55f3
--- 1/ifttt/ifttt.php
--- 2/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@@ -7,11 -7,8 +7,8 @@@
   * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
   */
  require_once 'mod/item.php';
- require_once 'include/items.php';
- require_once 'include/text.php';
- 
  use Friendica\App;
 -use Friendica\Core\Addon;
 +use Friendica\Core\Hook;
  use Friendica\Core\L10n;
  use Friendica\Core\Logger;
  use Friendica\Core\PConfig;

diff --cc impressum/impressum.php
Simple merge

diff --cc jappixmini/jappixmini.php
index 13e0cf4,28e238d..f11e9b1
--- 1/jappixmini/jappixmini.php
--- 2/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@@ -200,23 -200,23 +200,23 @@@ function jappixmini_init(
        if ($role == "pub") {
                $r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
                if (!count($r)) {
 -                      killme();
 +                      exit();
                }
  
-               $encrypt_func = openssl_public_encrypt;
-               $decrypt_func = openssl_public_decrypt;
+               $encrypt_func = 'openssl_public_encrypt';
+               $decrypt_func = 'openssl_public_decrypt';
                $key = $r[0]["pubkey"];
        } else if ($role == "prv") {
                $r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
                if (!count($r)) {
 -                      killme();
 +                      exit();
                }
  
-               $encrypt_func = openssl_private_encrypt;
-               $decrypt_func = openssl_private_decrypt;
+               $encrypt_func = 'openssl_private_encrypt';
+               $decrypt_func = 'openssl_private_decrypt';
                $key = $r[0]["prvkey"];
        } else {
 -              killme();
 +              exit();
        }
  
        $uid = $r[0]["uid"];

diff --cc leistungsschutzrecht/leistungsschutzrecht.php
Simple merge

diff --cc public_server/public_server.php
Simple merge

diff --cc pumpio/pumpio.php
Simple merge

diff --cc statusnet/statusnet.php
Simple merge

diff --cc testdrive/testdrive.php
Simple merge

diff --cc twitter/twitter.php
Simple merge

diff --cc widgets/widgets.php
Simple merge

diff --cc wppost/wppost.php
Simple merge