Explorar el Código

Ensure BaseObject::setApp() whenever App is instantiated

tags/2018.05
Hypolite Petovan hace 2 años
padre
commit
354bec58c0
Se han modificado 7 ficheros con 16 adiciones y 9 borrados
  1. +2
    -0
      boot.php
  2. +1
    -3
      index.php
  3. +2
    -0
      scripts/auth_ejabberd.php
  4. +1
    -0
      scripts/dbstructure.php
  5. +2
    -0
      scripts/worker.php
  6. +4
    -3
      util/maintenance.php
  7. +4
    -3
      util/typo.php

+ 2
- 0
boot.php Ver fichero

@@ -20,6 +20,7 @@
require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';

use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Addon;
use Friendica\Core\Cache;
use Friendica\Core\Config;
@@ -536,6 +537,7 @@ function get_app()

if (empty($a)) {
$a = new App(dirname(__DIR__));
BaseObject::setApp($a);
}

return $a;


+ 1
- 3
index.php Ver fichero

@@ -24,9 +24,7 @@ use Friendica\Module\Login;

require_once 'boot.php';

if (empty($a)) {
$a = new App(__DIR__);
}
$a = new App(__DIR__);
BaseObject::setApp($a);

// We assume that the index.php is called by a frontend process


+ 2
- 0
scripts/auth_ejabberd.php Ver fichero

@@ -33,6 +33,7 @@
*/

use Friendica\App;
use Friendica\BaseObject;
use Friendica\Util\ExAuth;

if (sizeof($_SERVER["argv"]) == 0) {
@@ -53,6 +54,7 @@ require_once "boot.php";
require_once "include/dba.php";

$a = new App(dirname(__DIR__));
BaseObject::setApp($a);

@include ".htconfig.php";
dba::connect($db_host, $db_user, $db_pass, $db_data);


+ 1
- 0
scripts/dbstructure.php Ver fichero

@@ -13,6 +13,7 @@ require_once "boot.php";
require_once "include/dba.php";

$a = new App(dirname(__DIR__));
BaseObject::setApp($a);

@include ".htconfig.php";
dba::connect($db_host, $db_user, $db_pass, $db_data);


+ 2
- 0
scripts/worker.php Ver fichero

@@ -6,6 +6,7 @@
*/

use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Worker;
@@ -26,6 +27,7 @@ require_once "boot.php";
require_once "include/dba.php";

$a = new App(dirname(__DIR__));
BaseObject::setApp($a);

require_once ".htconfig.php";
dba::connect($db_host, $db_user, $db_pass, $db_data);


+ 4
- 3
util/maintenance.php Ver fichero

@@ -2,16 +2,17 @@
/**
* @file util/maintenance.php
*/

use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Config;
use Friendica\Core\L10n;

require_once 'boot.php';
require_once 'include/dba.php';

if (empty($a)) {
$a = new App(dirname(__DIR__));
}
$a = new App(dirname(__DIR__));
BaseObject::setApp($a);

@include(".htconfig.php");



+ 4
- 3
util/typo.php Ver fichero

@@ -5,7 +5,9 @@
// Run this from cmdline in basedir and quickly see if we've
// got any parse errors in our application files.


use Friendica\App;
use Friendica\BaseObject;

error_reporting(E_ERROR | E_WARNING | E_PARSE);
ini_set('display_errors', '1');
@@ -13,9 +15,8 @@ ini_set('log_errors', '0');

include 'boot.php';

if (empty($a)) {
$a = new App(dirname(__DIR__));
}
$a = new App(dirname(__DIR__));
BaseObject::setApp($a);

if (x($a->config, 'php_path')) {
$phpath = $a->config['php_path'];


Cargando…
Cancelar
Guardar