MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Ensure BaseObject::setApp() whenever App is instantiated

Browse source
This commit is contained in:
Hypolite Petovan 2018-03-07 12:34:47 -05:00
commit 354bec58c0
7 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/maintenance.php
View file

@ -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");

7
util/typo.php
View file

@ -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'];