Merge remote-tracking branch 'upstream/master'

[friendica-addons.git] / fromgplus / fromgplus.php

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index f7841300f3531d5a3f7bd5d15082eaf59b932229..5bd82ed86855cd0c205cfbd7c50c502465520254 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -275,6 +275,9 @@ function fromgplus_handleattachments($item) {
                                        $post .= "\n[url=".$thumb->url."][img]".$image."[/img][/url]\n";
                                }
                                break;
+                       case "audio":
+                               $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+                               break;
                        //default:
                        //      die($attachment->objectType);
                }
@@ -298,6 +301,9 @@ function fromgplus_fetch($a, $uid) {
 
        $lastdate = 0;
 
+       if (!is_array($activities->items))
+               return;
+
        $reversed = array_reverse($activities->items);
 
        foreach($reversed as $item) {