From 9c77c57b74312a92eada9b84f68addece7a3a27c Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 6 Apr 2011 05:09:24 -0700 Subject: [PATCH] if base url changes radically, save the change. --- boot.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 1d7135b296..f8a8c9f939 100644 --- a/boot.php +++ b/boot.php @@ -437,15 +437,18 @@ function check_config(&$a) { load_config('system'); - if(! x($_SERVER,'SERVER_NAME')) - return; - $build = get_config('system','build'); if(! x($build)) $build = set_config('system','build',DB_UPDATE_VERSION); $url = get_config('system','url'); - if(! x($url)) + + // if the url isn't set or the stored url is radically different + // 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. + + if((! x($url)) || (! link_compare($url,$a->get_baseurl()))) $url = set_config('system','url',$a->get_baseurl()); if($build != DB_UPDATE_VERSION) {