diff options
| -rw-r--r-- | include/api.php | 5 | ||||
| -rw-r--r-- | view/api_timeline_atom.tpl | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/api.php b/include/api.php index c77c55cef..082da55b3 100644 --- a/include/api.php +++ b/include/api.php @@ -723,7 +723,8 @@ 'created_at'=> api_date($item['created']), 'published' => datetime_convert('UTC','UTC',$item['created'],ATOM_TIME), 'updated' => datetime_convert('UTC','UTC',$item['edited'],ATOM_TIME), - 'id' => $item['uri'], + 'id' => $item['id'], + 'message_id' => $item['uri'], 'text' => strip_tags(bbcode($item['body'])), 'html' => bbcode($item['body']), 'source' => (($item['app']) ? $item['app'] : 'web'), @@ -773,7 +774,7 @@ $email = $a->config['admin_email']; $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false'); $private = (($a->config['system']['block_public']) ? 'true' : 'false'); - $textlimit = (($a->config['max_import_size']) ? $a->config['max_import_size'] : '200000'); + $textlimit = (string) (($a->config['max_import_size']) ? $a->config['max_import_size'] : 200000); $ssl = (($a->config['system']['have_ssl']) ? 'true' : 'false'); $sslserver = (($ssl === 'true') ? str_replace('http:','https:',$a->get_baseurl()) : ''); diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl index dcabba465..aef1f9310 100644 --- a/view/api_timeline_atom.tpl +++ b/view/api_timeline_atom.tpl @@ -53,7 +53,7 @@ {{ for $statuses as $status }} <entry> <activity:object-type>$status.objecttype</activity:object-type> - <id>$status.id</id> + <id>$status.message_id</id> <title>$status.text</title> <content type="html">$status.html</content> <link rel="alternate" type="text/html" href="$status.url"/> |