Skip to content
Browse files

Showmore: A little html bug was fixed (missing </div>)

  • Loading branch information...
1 parent 33df399 commit 3689c821b692a99533f2cb338dccaaca8ed5f896 @annando annando committed Apr 6, 2012
Showing with 22 additions and 15 deletions.
  1. +20 −14 facebook/facebook.php
  2. +2 −1 showmore/showmore.php
View
34 facebook/facebook.php
@@ -1365,21 +1365,26 @@ function fb_consume_stream($uid,$j,$wall = false) {
if($entry->description)
$quote = $entry->description;
- foreach ($entry->properties as $property)
- $quote .= "\n".$property->name.": [url=".$property->href."]".$property->text."[/url]";
+ if ($entry->properties)
+ foreach ($entry->properties as $property)
+ $quote .= "\n".$property->name.": [url=".$property->href."]".$property->text."[/url]";
if ($quote)
$datarray['body'] .= "\n[quote]".$quote."[/quote]";
- if($entry->picture && $entry->link) {
- $datarray['body'] .= "\n" . '[url=' . $entry->link . '][img]' . $entry->picture . '[/img][/url]';
- }
- else {
- if($entry->picture)
- $datarray['body'] .= "\n" . '[img]' . $entry->picture . '[/img]';
- // if just a link, it may be a wall photo - check
- if($entry->link)
- $datarray['body'] .= fb_get_photo($uid,$entry->link);
+ // Only import the picture when the message is no video
+ // oembed display a picture of the video as well
+ if ($entry->type != "video") {
+ if($entry->picture && $entry->link) {
+ $datarray['body'] .= "\n" . '[url=' . $entry->link . '][img]'.$entry->picture.'[/img][/url]';
+ }
+ else {
+ if($entry->picture)
+ $datarray['body'] .= "\n" . '[img]' . $entry->picture . '[/img]';
+ // if just a link, it may be a wall photo - check
+ if($entry->link)
+ $datarray['body'] .= fb_get_photo($uid,$entry->link);
+ }
}
if(trim($datarray['body']) == '') {
@@ -1392,9 +1397,10 @@ function fb_consume_stream($uid,$j,$wall = false) {
if ($entry->icon)
$datarray['body'] .= "[img]".$entry->icon."[/img] &nbsp; ";
- foreach ($entry->actions as $action)
- if (($action->name != "Comment") and ($action->name != "Like"))
- $datarray['body'] .= "[url=".$action->link."]".$action->name."[/url] &nbsp; ";
+ if ($entry->actions)
+ foreach ($entry->actions as $action)
+ if (($action->name != "Comment") and ($action->name != "Like"))
+ $datarray['body'] .= "[url=".$action->link."]".$action->name."[/url] &nbsp; ";
$datarray['body'] = trim($datarray['body']);
View
3 showmore/showmore.php
@@ -46,7 +46,8 @@ function showmore_addon_settings(&$a,&$s) {
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="showmore-submit" name="showmore-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
-// $s .= '<div class="showmore-desc">' . t('Use /expression/ to provide regular expressions') . '</div></div>';
+// $s .= '<div class="showmore-desc">' . t('Use /expression/ to provide regular expressions') . '</div>';
+ $s .= '</div>';
return;
}

0 comments on commit 3689c82

Please sign in to comment.
Something went wrong with that request. Please try again.