aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php5
-rw-r--r--include/zot.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index f28021b60..a4fe8d3ad 100755
--- a/boot.php
+++ b/boot.php
@@ -1316,6 +1316,11 @@ 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'] : '');
$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",
diff --git a/include/zot.php b/include/zot.php
index c7049dee6..051fa5078 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -138,7 +138,7 @@ function zot_finger($webbie,$channel) {
$r = q("select xchan.*, hubloc.* from xchan
left join hubloc on xchan_hash = hubloc_hash
where xchan_addr = '%s' and (hubloc_flags & %d) limit 1",
- dbesc($xchan_address),
+ dbesc($xchan_addr),
intval(HUBLOC_FLAGS_PRIMARY)
);