X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=ccff45f7343295d6b4c29648febce22a55e3735c;hb=4dfea76434d37e5a89b39122ec42b8580366ed50;hp=c500468e5fadb5b028f564c95ad029500518c8f6;hpb=fb676335dbfb90d282622a68cb9a7113be19bc31;p=friendica.git diff --git a/boot.php b/boot.php index c500468e5f..ccff45f734 100644 --- a/boot.php +++ b/boot.php @@ -1537,7 +1537,7 @@ function check_db() { * Sets the base url for use in cmdline programs which don't have * $_SERVER variables */ -function check_url(&$a) { +function check_url(App &$a) { $url = get_config('system','url'); @@ -1548,9 +1548,9 @@ function check_url(&$a) { // We will only change the url to an ip address if there is no existing setting if(! x($url)) - $url = set_config('system','url',$a->get_baseurl()); - if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname))) - $url = set_config('system','url',$a->get_baseurl()); + $url = set_config('system','url',App::get_baseurl()); + if((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname))) + $url = set_config('system','url',App::get_baseurl()); return; } @@ -1559,7 +1559,7 @@ function check_url(&$a) { /** * @brief Automatic database updates */ -function update_db(&$a) { +function update_db(App &$a) { $build = get_config('system','build'); if(! x($build)) $build = set_config('system','build',DB_UPDATE_VERSION); @@ -1675,7 +1675,7 @@ function run_update_function($x) { * @param App $a * */ -function check_plugins(&$a) { +function check_plugins(App &$a) { $r = q("SELECT * FROM `addon` WHERE `installed` = 1"); if (dbm::is_result($r)) @@ -2410,7 +2410,8 @@ function get_temppath() { return(""); } -function set_template_engine(&$a, $engine = 'internal') { +/// @deprecated +function set_template_engine(App &$a, $engine = 'internal') { /// @note This function is no longer necessary, but keep it as a wrapper to the class method /// to avoid breaking themes again unnecessarily