aboutsummaryrefslogtreecommitdiffstats
path: root/include/diaspora.php
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-07 22:35:02 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-07 22:35:02 -0700
commit737a3362d50900a5f26aada14f515c5c857a762f (patch)
treeae8337e97dd3ae5356daefa0c0da2812511341a0 /include/diaspora.php
parentf84453497bd5ef4eba8bca84917b8e82d784937a (diff)
parentee6c53c2e54619a39e16ac2176835adea3b73778 (diff)
downloadvolse-hubzilla-737a3362d50900a5f26aada14f515c5c857a762f.tar.gz
volse-hubzilla-737a3362d50900a5f26aada14f515c5c857a762f.tar.bz2
volse-hubzilla-737a3362d50900a5f26aada14f515c5c857a762f.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/diaspora.php')
-rwxr-xr-xinclude/diaspora.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index f650f0831..f0687e51e 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -907,12 +907,12 @@ function get_diaspora_reshare_xml($url,$recurse = 0) {
$x = z_fetch_url($url);
if(! $x['success'])
- $x = z_fetch_url(str_replace('https://','http://',$source_url));
+ $x = z_fetch_url(str_replace('https://','http://',$url));
if(! $x['success']) {
- logger('get_diaspora_reshare_xml: unable to fetch source url ' . $source_url);
+ logger('get_diaspora_reshare_xml: unable to fetch source url ' . $url);
return;
}
- logger('diaspora_reshare: source: ' . $x['body'], LOGGER_DATA);
+ logger('get_diaspora_reshare_xml: source: ' . $x['body'], LOGGER_DEBUG);
$source_xml = parse_xml_string($x['body'],false);