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

Ensure Config::load() in scripts

Browse source
This commit is contained in:
Hypolite Petovan 2018-03-07 12:35:16 -05:00
parent 354bec58c0
commit 7e765199e8
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/auth_ejabberd.php
View file

@ -34,6 +34,7 @@
use Friendica\App; use Friendica\App;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Core\Config;
use Friendica\Util\ExAuth; use Friendica\Util\ExAuth;
if (sizeof($_SERVER["argv"]) == 0) { if (sizeof($_SERVER["argv"]) == 0) {
@ -60,6 +61,8 @@ BaseObject::setApp($a);
dba::connect($db_host, $db_user, $db_pass, $db_data); dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
Config::load();
$oAuth = new ExAuth(); $oAuth = new ExAuth();
$oAuth->readStdin(); $oAuth->readStdin();

2
scripts/dbstructure.php
View file

@ -19,6 +19,8 @@ BaseObject::setApp($a);
dba::connect($db_host, $db_user, $db_pass, $db_data); dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
Config::load();
if ($_SERVER["argc"] == 2) { if ($_SERVER["argc"] == 2) {
switch ($_SERVER["argv"][1]) { switch ($_SERVER["argv"][1]) {
case "dryrun": case "dryrun":

8
util/typo.php
View file

@ -18,11 +18,9 @@ include 'boot.php';
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));
BaseObject::setApp($a); BaseObject::setApp($a);
if (x($a->config, 'php_path')) { @include '.htconfig.php';
$phpath = $a->config['php_path'];
} else { $phpath = $a->getConfigValue('config', 'php_path', 'php');
$phpath = 'php';
}
echo 'Directory: src' . PHP_EOL; echo 'Directory: src' . PHP_EOL;
$Iterator = new RecursiveDirectoryIterator('src'); $Iterator = new RecursiveDirectoryIterator('src');