diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-12-07 22:27:35 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-12-07 22:27:35 +0000 |
| commit | 44263d5ac3e5189df28c92f58c2875137052b6ea (patch) | |
| tree | 70aa75426f2b3c984faecdb5f684157bccedda3a /include/zot.php | |
| parent | 555226ada4946b78be5fa2966f5c8532a997953f (diff) | |
| parent | 2452b822f909a3cac432a76d8c928733a7683c6a (diff) | |
| download | volse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.tar.gz volse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.tar.bz2 volse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php index 2d2bc92c6..31f0e8771 100644 --- a/include/zot.php +++ b/include/zot.php @@ -406,7 +406,7 @@ function import_xchan_from_json($j) { require_once("Photo.php"); - $photos = import_profile_photo($j->photo,0,$xchan_hash); + $photos = import_profile_photo($j->photo,$xchan_hash); $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s' limit 1", dbesc($j->photo_updated), @@ -524,7 +524,7 @@ function import_xchan($arr) { require_once("Photo.php"); - $photos = import_profile_photo($arr['photo'],0,$xchan_hash); + $photos = import_profile_photo($arr['photo'],$xchan_hash); $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s' limit 1", dbesc($arr['photo_updated']), @@ -870,7 +870,6 @@ function delete_imported_item($sender,$item,$uid) { } function process_mail_delivery($sender,$arr,$deliveries) { - foreach($deliveries as $d) { $r = q("select * from channel where channel_hash = '%s' limit 1", |