X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=dedae7fd547c7a99dea0e3865e759a76e1d4c872;hb=d233beb4ce8808ebfc09ddd8d70e7cc739b4db7f;hp=3df59f4c01fd8dc97f5e875b0f51113825caca34;hpb=9c920fd7b9193330cb1f27ad67bf3b735054c815;p=friendica.git diff --git a/boot.php b/boot.php index 3df59f4c01..dedae7fd54 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1429' ); +define ( 'FRIENDICA_VERSION', '3.0.1438' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1154 ); @@ -364,6 +364,8 @@ if(! class_exists('App')) { public $sourcename = ''; public $videowidth = 425; public $videoheight = 350; + public $force_max_items = 0; + public $theme_thread_allow = true; private $scheme; private $hostname; @@ -733,9 +735,13 @@ if(! function_exists('check_config')) { // than the currently visited url, store the current value accordingly. // "Radically different" ignores common variations such as http vs https // and www.example.com vs example.com. + // We will only change the url to an ip address if there is no existing setting - if((! x($url)) || (! link_compare($url,$a->get_baseurl()))) + 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()); + if($build != DB_UPDATE_VERSION) { $stored = intval($build);