aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-03 18:12:02 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-03 18:12:02 +0200
commitadfc748bfa724ad8cc9d4ebf6f9d095fc56fb936 (patch)
tree2d5e256b6bb001397939debad609789367745fc9 /include/items.php
parent2ce1e3678acd59409f1013433db99df6624c2895 (diff)
parentf3cb17ac3b007afd2dc5bf7cdad8a054b4d7fcd8 (diff)
downloadvolse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.gz
volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.bz2
volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index 2701c3fa2..9807831e3 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1127,7 +1127,7 @@ function import_author_rss($x) {
if($r && $x['photo']) {
- $photos = import_profile_photo($x['photo']['src'],$x['url']);
+ $photos = import_xchan_photo($x['photo']['src'],$x['url']);
if($photos) {
/** @bug $arr is undefined in this SQL query */
@@ -1172,7 +1172,7 @@ function import_author_unknown($x) {
);
if($r && $x['photo']) {
- $photos = import_profile_photo($x['photo']['src'],$x['url']);
+ $photos = import_xchan_photo($x['photo']['src'],$x['url']);
if($photos) {
/** @bug $arr is undefined in this SQL query */