Merge remote-tracking branch 'origin/develop' into develop

exponentcms · Jun 2, 2018 · 4a3392d · 4a3392d
2 parents 91071d2 + f661767
commit 4a3392d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/framework/modules/socialfeed/controllers/socialfeedController.php b/framework/modules/socialfeed/controllers/socialfeedController.php
@@ -202,7 +202,7 @@ private function get_facebook_feed($page_name = '')
                     if (empty($this->config['socialfeed_facebook_apiv24']))
                         $request = new FacebookRequest($this->session, 'GET', '/' . $page_name . '/posts'); //v4
                     else // facebook api v2.4+ requires specific request for fields
-                        $request = new FacebookRequest($this->session, 'GET', '/' . $page_name . '/posts?fields=type,message,likes,link,created_time,source,object_id,actions'); //v4 new api v2.4+
+                        $request = new FacebookRequest($this->session, 'GET', '/' . $page_name . '/posts?fields=type,message,likes,link,created_time,source,object_id,actions,picture'); //v4 new api v2.4+
                     $response = $request->execute(); //v4
                     $graph_object = $response->getGraphObject(); //v4
                     $facebook_values = $graph_object->asArray(); //v4
@@ -335,6 +335,12 @@ private function parse_facebook_data($facebook_entry) {
                 $message_feed['picture'] = 'https://graph.facebook.com/'.$facebook_entry->object_id.'/picture?type=normal';
             }
         }
+        if ($facebook_entry->type === 'link') {
+            if ($this->display_pic == 1) {
+//                $message_feed['picture'] = $facebook_entry->picture;
+                $message_feed['picture'] = $facebook_entry->picture;
+            }
+        }
         if (isset($facebook_entry->message) && !empty($facebook_entry->message)) {
             $message_feed['message'] = substr(
                 $facebook_entry->message,