forked from GNUsocial/gnu-social
[LIB_REFACTOR] Fix requires
This commit is contained in:
committed by
Diogo Cordeiro
parent
58bde08425
commit
b41f9620fa
@@ -120,7 +120,7 @@ foreach ($options as $option) {
|
||||
}
|
||||
}
|
||||
|
||||
require_once INSTALLDIR . '/lib/common.php';
|
||||
require_once INSTALLDIR . '/lib/util/common.php';
|
||||
|
||||
set_error_handler('common_error_handler');
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
|
||||
define('GNUSOCIAL', true);
|
||||
define('STATUSNET', true);
|
||||
|
||||
require_once INSTALLDIR . '/lib/common.php';
|
||||
require_once INSTALLDIR . '/lib/util/common.php';
|
||||
|
||||
// Try to find an autoloader for a local psysh version.
|
||||
// We'll wrap this whole mess in a Closure so it doesn't leak any globals.
|
||||
|
||||
@@ -29,7 +29,7 @@ define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
|
||||
define('GNUSOCIAL', true);
|
||||
define('STATUSNET', true); // compatibility
|
||||
|
||||
require_once(INSTALLDIR . '/lib/common.php');
|
||||
require_once INSTALLDIR . '/lib/util/common.php';
|
||||
|
||||
common_log(LOG_INFO, 'Starting to do old notices.');
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ define('INSTALLDIR', dirname(__DIR__));
|
||||
define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
|
||||
set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib');
|
||||
|
||||
require_once INSTALLDIR . '/lib/installer.php';
|
||||
require_once INSTALLDIR . '/lib/util/installer.php';
|
||||
require_once 'Console/Getopt.php';
|
||||
|
||||
class CliInstaller extends Installer
|
||||
|
||||
@@ -27,8 +27,8 @@ as STDIN.
|
||||
|
||||
END_OF_HELP;
|
||||
|
||||
require_once INSTALLDIR.'/scripts/commandline.inc';
|
||||
require_once INSTALLDIR . '/lib/mailhandler.php';
|
||||
require_once INSTALLDIR . '/scripts/commandline.inc';
|
||||
require_once INSTALLDIR . '/lib/util/mailhandler.php';
|
||||
|
||||
if (common_config('emailpost', 'enabled')) {
|
||||
$mh = new MailHandler();
|
||||
|
||||
@@ -71,9 +71,9 @@ END_OF_QUEUE_HELP;
|
||||
|
||||
require_once INSTALLDIR.'/scripts/commandline.inc';
|
||||
|
||||
require_once(INSTALLDIR . '/lib/daemon.php');
|
||||
require_once(INSTALLDIR.'/classes/Queue_item.php');
|
||||
require_once(INSTALLDIR.'/classes/Notice.php');
|
||||
require_once INSTALLDIR . '/lib/util/daemon.php';
|
||||
require_once(INSTALLDIR . '/classes/Queue_item.php');
|
||||
require_once(INSTALLDIR . '/classes/Notice.php');
|
||||
|
||||
/**
|
||||
* Queue handling daemon...
|
||||
|
||||
@@ -85,7 +85,7 @@ function mailConfirmAddress(Confirm_address $ca)
|
||||
mail_confirm_address($user, $ca->code, $user->getNickname(), $ca->address);
|
||||
}
|
||||
|
||||
require_once(INSTALLDIR . '/lib/mail.php');
|
||||
require_once INSTALLDIR . '/lib/util/mail.php';
|
||||
|
||||
if (!$all) {
|
||||
mailConfirmAddress($ca);
|
||||
|
||||
@@ -29,7 +29,7 @@ define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
|
||||
define('GNUSOCIAL', true);
|
||||
define('STATUSNET', true); // compatibility
|
||||
|
||||
require_once(INSTALLDIR . '/lib/common.php');
|
||||
require_once INSTALLDIR . '/lib/util/common.php';
|
||||
|
||||
// Master StatusNet .pot file location (created by update_pot.sh)
|
||||
$statusnet_pot = INSTALLDIR . '/locale/statusnet.pot';
|
||||
|
||||
Reference in New Issue
Block a user