Avoid undefined class variables

diff --git a/boot.php b/boot.php
index 5b82c8b8f28d43cf0f2d7bf224375e9f6d2c2d3b..899a6bd119ca4b8cbbb2bd9b13a95c49ea723892 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -510,6 +510,11 @@ function startup() {
  */
 function get_app() {
        global $a;
+
+       if (empty($a)) {
+               $a = new App(dirname(__DIR__));
+       }
+
        return $a;
 }
 

diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php
index 3918a45e15d9c4370ce10f4039d32ff6a2adaf93..14f5dcfe0c797271ab5d09720223c2a8675d82a8 100755 (executable)
--- a/include/auth_ejabberd.php
+++ b/include/auth_ejabberd.php
@@ -49,7 +49,7 @@ require_once("boot.php");
 
 global $a;
 
-if (is_null($a)) {
+if (empty($a)) {
        $a = new App(dirname(__DIR__));
 }
 

diff --git a/include/cli_startup.php b/include/cli_startup.php
index 41d7c1895461f0f78a09deae41b4e87984655fcd..645e5eddd8544e8c29b50478834ec1de34dee874 100644 (file)
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -10,7 +10,7 @@ require_once('boot.php');
 function cli_startup() {
        global $a;
 
-       if (is_null($a)) {
+       if (empty($a)) {
                $a = new App(dirname(__DIR__));
        }
 

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 8ab96b700caab58ceabcc60f7dbc1ff3010d5d84..b8cf8e57ac4881f846cc03a4ec9f94c5c5cc1edf 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1760,7 +1760,7 @@ function db_definition() {
 function dbstructure_run(&$argv, &$argc) {
        global $a;
 
-       if (is_null($a)) {
+       if (empty($a)) {
                $a = new App(dirname(__DIR__));
        }
 

diff --git a/include/poller.php b/include/poller.php
index 9868120ec851a34e3355831a6aa074702ca7d474..b8f0d7189fdf76f761966c255e79d6e3ef800956 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -23,7 +23,9 @@ function poller_run($argv, $argc){
 
        $poller_up_start = microtime(true);
 
-       $a = new App(dirname(__DIR__));
+       if (empty($a)) {
+               $a = new App(dirname(__DIR__));
+       }
 
        require_once ".htconfig.php";
        require_once "include/dba.php";

diff --git a/include/shadowupdate.php b/include/shadowupdate.php
index a2b44b3512183129df0e5cba6c9e477efea0ebb5..c41b2312214bb1eed9e019c7ac266b9f412e9793 100644 (file)
--- a/include/shadowupdate.php
+++ b/include/shadowupdate.php
@@ -9,7 +9,7 @@ require_once("include/threads.php");
 function shadowupdate_run(&$argv, &$argc){
        global $a;
 
-       if (is_null($a)) {
+       if (empty($a)) {
                $a = new App(dirname(__DIR__));
        }
 

diff --git a/index.php b/index.php
index 90045868e7d2f21eb32596a5ebfc20dbfbfada7e..c94675a59ae65a887fe181c1350f714555d3e8d4 100644 (file)
--- a/index.php
+++ b/index.php
@@ -20,7 +20,9 @@ use Friendica\Core\Config;
 require_once 'boot.php';
 require_once 'object/BaseObject.php';
 
-$a = new App(__DIR__);
+if (empty($a)) {
+       $a = new App(__DIR__);
+}
 BaseObject::set_app($a);
 
 // We assume that the index.php is called by a frontend process

diff --git a/util/db_update.php b/util/db_update.php
index 885a156caae432a61e233bbaeea75fc5b07f6151..d9bb0abf2ec577b5cdfc8db91a308ace31631cbf 100644 (file)
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -11,7 +11,9 @@ use Friendica\App;
  */
 require_once("boot.php");
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
 @include(".htconfig.php");
 
 $lang = get_browser_language();

diff --git a/util/maintenance.php b/util/maintenance.php
index 50540ecc2839911accc9cbb88786bd9c36246f79..39c2acb0e1f13a304d0c966ce7ec10bafb064992 100644 (file)
--- a/util/maintenance.php
+++ b/util/maintenance.php
@@ -5,7 +5,10 @@ use Friendica\Core\Config;
 
 require_once("boot.php");
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
+
 @include(".htconfig.php");
 
 $lang = get_browser_language();

diff --git a/util/typo.php b/util/typo.php
index d837bcefc981cb7f257504417fa7c98a572b0dfd..313033f3e5a1885ac740790dda476504ccb1ee12 100755 (executable)
--- a/util/typo.php
+++ b/util/typo.php
@@ -13,7 +13,9 @@ ini_set('log_errors', '0');
 
 include 'boot.php';
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
 
 if (x($a->config, 'php_path')) {
        $phpath = $a->config['php_path'];