Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index d3365e710656b81adae10c17c7cec30d6dbd5990..c8026ad3a99b1ed91f5284df2b2efef07baae3f6 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -10,6 +10,7 @@
 define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
 require_once('mod/share.php');
+require_once('mod/parse_url.php');
 
 function fromgplus_install() {
        register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
@@ -324,6 +325,11 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                if ($quote != "")
                                        $pagedata["text"] = $quote;
 
+                               // Add Keywords to page link
+                               $data = parseurl_getsiteinfo_cached($pagedata["url"], true);
+                               if (isset($data["keywords"]))
+                                       $pagedata["keywords"] = $data["keywords"];
+
                                break;
 
                        case "photo":