Commit 85ffa618 authored by Mario's avatar Mario

Merge branch 'dev' into 'dev'

Remove undefined array element use for xchan date

See merge request hubzilla/addons!160
parents 9a40a76c b6490829
...@@ -533,7 +533,7 @@ function diaspora_queue($owner,$contact,$slap,$public_batch,$message_id = '') { ...@@ -533,7 +533,7 @@ function diaspora_queue($owner,$contact,$slap,$public_batch,$message_id = '') {
dbesc($dest_url), dbesc($dest_url),
dbesc($dest_url), dbesc($dest_url),
dbesc('queued'), dbesc('queued'),
dbesc(datetime_convert()), dbescdate(datetime_convert()),
dbesc($owner['channel_hash']), dbesc($owner['channel_hash']),
dbesc($hash) dbesc($hash)
); );
...@@ -708,7 +708,7 @@ function diaspora_discover(&$b) { ...@@ -708,7 +708,7 @@ function diaspora_discover(&$b) {
$r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s', xchan_pubkey = '%s' where xchan_hash = '%s'", $r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s', xchan_pubkey = '%s' where xchan_hash = '%s'",
dbesc($vcard['fn']), dbesc($vcard['fn']),
dbesc($network), dbesc($network),
dbesc(datetime_convert()), dbescdate(datetime_convert()),
dbesc($pubkey), dbesc($pubkey),
dbesc($addr) dbesc($addr)
); );
...@@ -750,7 +750,7 @@ function diaspora_discover(&$b) { ...@@ -750,7 +750,7 @@ function diaspora_discover(&$b) {
$photos = import_xchan_photo($vcard['photo'],$addr); $photos = import_xchan_photo($vcard['photo'],$addr);
$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'", $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'",
dbescdate(datetime_convert('UTC','UTC',$arr['photo_updated'])), dbescdate(datetime_convert()),
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
dbesc($photos[2]), dbesc($photos[2]),
...@@ -1184,13 +1184,13 @@ function diaspora_queue_deliver(&$b) { ...@@ -1184,13 +1184,13 @@ function diaspora_queue_deliver(&$b) {
logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG); logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
if($base) { if($base) {
q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ", q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
dbesc(datetime_convert()), dbescdate(datetime_convert()),
dbesc($base) dbesc($base)
); );
} }
q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'", q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
dbesc('accepted for delivery'), dbesc('accepted for delivery'),
dbesc(datetime_convert()), dbescdate(datetime_convert()),
dbesc($outq['outq_hash']) dbesc($outq['outq_hash'])
); );
remove_queue_item($outq['outq_hash']); remove_queue_item($outq['outq_hash']);
......
...@@ -1021,7 +1021,7 @@ function as_actor_store($url,$person_obj) { ...@@ -1021,7 +1021,7 @@ function as_actor_store($url,$person_obj) {
dbesc(escape_tags($name)), dbesc(escape_tags($name)),
dbesc(escape_tags($pubkey)), dbesc(escape_tags($pubkey)),
dbesc('activitypub'), dbesc('activitypub'),
dbesc(datetime_convert()), dbescdate(datetime_convert()),
dbesc($url) dbesc($url)
); );
} }
...@@ -1062,7 +1062,7 @@ function as_actor_store($url,$person_obj) { ...@@ -1062,7 +1062,7 @@ function as_actor_store($url,$person_obj) {
$photos = import_xchan_photo($icon,$url); $photos = import_xchan_photo($icon,$url);
$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'", $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'",
dbescdate(datetime_convert('UTC','UTC',$arr['photo_updated'])), dbescdate(datetime_convert()),
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
dbesc($photos[2]), dbesc($photos[2]),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment