Merge branch 'develop' into issue/3878-move-Contact-to-src

This commit is contained in:
Hypolite Petovan 2017-11-19 18:09:14 -05:00 committed by GitHub
commit b85c94a60d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 110 additions and 129 deletions

View file

@ -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)
{
@ -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()
{