bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Move Composer autoload require out of boot.php

Browse source
This commit is contained in:
Hypolite Petovan 2018-12-24 09:56:48 -05:00
parent acaee626f5
commit ed7bada71e
6 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/auth_ejabberd.php
View file

@ -49,7 +49,7 @@ $directory = realpath($directory . DIRECTORY_SEPARATOR . "..");
chdir($directory); chdir($directory);
require_once "boot.php"; require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));

2
bin/console.php
View file

@ -1,7 +1,7 @@
#!/usr/bin/env php #!/usr/bin/env php
<?php <?php
include_once dirname(__DIR__) . '/boot.php'; require dirname(__DIR__) . '/vendor/autoload.php';
$a = new Friendica\App(dirname(__DIR__)); $a = new Friendica\App(dirname(__DIR__));
\Friendica\BaseObject::setApp($a); \Friendica\BaseObject::setApp($a);

2
bin/daemon.php
View file

@ -30,7 +30,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
chdir($directory); chdir($directory);
} }
require_once "boot.php"; require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));

2
bin/worker.php
View file

@ -26,7 +26,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
chdir($directory); chdir($directory);
} }
require_once "boot.php"; require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));

2
boot.php
View file

@ -17,8 +17,6 @@
* easily as email does today. * easily as email does today.
*/ */
require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
use Friendica\App; use Friendica\App;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Core\Addon; use Friendica\Core\Addon;

6
index.php
View file

@ -4,12 +4,10 @@
* Friendica * Friendica
*/ */
use Friendica\App; require dirname(__DIR__) . '/vendor/autoload.php';
require_once 'boot.php';
// We assume that the index.php is called by a frontend process // We assume that the index.php is called by a frontend process
// The value is set to "true" by default in App // The value is set to "true" by default in App
$a = new App(__DIR__, false); $a = new Friendica\App(__DIR__, false);
$a->runFrontend(); $a->runFrontend();