X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=9cdaefb2124f11942dce06d58a137d8706bb6559;hb=0373056448aec398ee765065adc998aa0da02ac0;hp=52026a7fb31cc52dc6c8e9710b8063b4eb42a567;hpb=13f899542d4854d9a4c00632b31fce266f61f773;p=friendica.git diff --git a/boot.php b/boot.php index 52026a7fb3..9cdaefb212 100644 --- a/boot.php +++ b/boot.php @@ -27,6 +27,7 @@ use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Object\Contact; use Friendica\Util\Lock; require_once 'include/network.php'; @@ -39,7 +40,6 @@ require_once 'include/features.php'; require_once 'include/identity.php'; require_once 'update.php'; require_once 'include/dbstructure.php'; -require_once 'include/poller.php'; define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'Asparagus'); @@ -619,7 +619,7 @@ function is_ajax() /** * @brief Function to check if request was an AJAX (xmlhttprequest) request. * - * @param boolean $via_worker boolean Is the check run via the poller? + * @param boolean $via_worker boolean Is the check run via the worker? */ function check_db($via_worker) { @@ -984,10 +984,10 @@ function public_contact() if (!$public_contact_id && x($_SESSION, 'authenticated')) { if (x($_SESSION, 'my_address')) { // Local user - $public_contact_id = intval(get_contact($_SESSION['my_address'], 0)); + $public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0)); } elseif (x($_SESSION, 'visitor_home')) { // Remote user - $public_contact_id = intval(get_contact($_SESSION['visitor_home'], 0)); + $public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0)); } } elseif (!x($_SESSION, 'authenticated')) { $public_contact_id = false; @@ -1065,18 +1065,6 @@ function get_max_import_size() return ((x($a->config, 'max_import_size')) ? $a->config['max_import_size'] : 0 ); } -/** - * @brief compatibilty wrapper for Worker::add function - * - * @param (integer|array) priority or parameter array, strings are deprecated and are ignored - * - * @return boolean "false" if proc_run couldn't be executed - */ -function proc_run() -{ - $proc_args = func_get_args(); - call_user_func_array('Friendica\Core\Worker::add', $proc_args); -} function current_theme() {