From 7dfd9435f78939166326755792ed8b319e5b5983 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 26 Aug 2013 18:15:30 -0700 Subject: found the bugger --- boot.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 7902313e6..d5210df95 100755 --- a/boot.php +++ b/boot.php @@ -1317,12 +1317,16 @@ function fix_system_urls($oldurl,$newurl) { if(! $parsed) continue; $newhost = $parsed['host']; + // sometimes parse_url returns unexpected results. if(strpos($newhost,'/') !== false) $newhost = substr($newhost,0,strpos($newhost,'/')); - $rhs = $newhost . (($parsed['port']) ? ':' . $parsed['port'] : '') . (($parsed['path']) ? $parsed['path'] : ''); + $rhs = $newhost . (($parsed['port']) ? ':' . $parsed['port'] : ''); + + // paths aren't going to work. You have to be at the (sub)domain root + // . (($parsed['path']) ? $parsed['path'] : ''); $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s', xchan_follow = '%s', xchan_connpage = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s' limit 1", dbesc($channel . '@' . $rhs), -- cgit v1.2.3