api compatibility fixes

diff --git a/include/api.php b/include/api.php
index c77c55cef49ed51a185818b0af1c30d7fa31a4c6..082da55b3de70a936a2a316f1b9d22e82a51e8a1 100644 (file)
--- 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 dcabba465a597faa85cf75fd7b44a3afa47e4c60..aef1f9310adda5d672c24b89a43793b1363fb08e 100644 (file)
--- 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"/>