Merge branch '2019.01-rc' into bug/6334-escape-get-app

[friendica.git] / src / Protocol / Diaspora.php

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 152bc385d8f9758922839c6ec7fcc0d3c27fb154..ed583503411799c6b0735d1fd85d21148fed1029 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2298,7 +2298,7 @@ class Diaspora
         */
        private static function receiveRequestMakeFriend(array $importer, array $contact)
        {
-               $a = get_app();
+               $a = \get_app();
 
                if ($contact["rel"] == Contact::SHARING) {
                        DBA::update(
@@ -3057,7 +3057,7 @@ class Diaspora
         */
        public static function transmit(array $owner, array $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
        {
-               $a = get_app();
+               $a = \get_app();
 
                $enabled = intval(Config::get("system", "diaspora_enabled"));
                if (!$enabled) {