Merge branch 'develop' into utf8mb4

[friendica.git] / object / BaseObject.php

diff --git a/object/BaseObject.php b/object/BaseObject.php
index 14f0d8fd083a398c6a7af1953d2551c9cd1b782b..2666dc1de572816a01ec53d4522288392e8c5424 100644 (file)
--- a/object/BaseObject.php
+++ b/object/BaseObject.php
@@ -21,8 +21,7 @@ class BaseObject {
                if(self::$app)
                        return self::$app;
 
-               global $a;
-               self::$app = $a;
+               self::$app = get_app();
 
                return self::$app;
        }