oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-16 20:05:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

get rid of unwanted <br>s in items with oembed

Browse source 
fix video thumbnail in quattro, vier, duepuntozero themes
This commit is contained in:
fabrixxm 2015-12-28 18:07:31 +01:00
parent 0896f3a4f5
commit 6da04d16bd
9 changed files with 54 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/bbcode.php
View file

@ -301,14 +301,12 @@ function bb_onelinecode_cb($match) {
}
function tryoembed($match){
//$url = ((count($match)==2)?$match[1]:$match[2]);
$url = $match[1];
// Always embed the SSL version
$url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
array("https://www.youtube.com/", "https://player.vimeo.com/"), $url);
//logger("tryoembed: $url");
$o = oembed_fetch_url($url);
@ -318,7 +316,7 @@ function tryoembed($match){
if ($o->type=="error") return $match[0];
$html = oembed_format_object($o);
return $html; //oembed_iframe($html,$o->width,$o->height);
return $html;
}

14
include/oembed.php
View file

@ -1,12 +1,9 @@
<?php
function oembed_replacecb($matches){
// logger('oembedcb');
$embedurl=$matches[1];
$j = oembed_fetch_url($embedurl);
$s = oembed_format_object($j);
return $s;//oembed_iframe($s,$j->width,$j->height);
return $s;
}
@ -144,15 +141,12 @@ function oembed_format_object($j){
} else {
$ret=$jhtml;
}
$ret.="<br>";
//$ret.="<br>";
}; break;
case "photo": {
$ret.= "<img width='".$j->width."' src='".proxy_url($j->url)."'>";
//$ret.= "<img width='".$j->width."' height='".$j->height."' src='".proxy_url($j->url)."'>";
$ret.="<br>";
}; break;
case "link": {
//$ret = "<a href='".$embedurl."'>".$j->title."</a>";
}; break;
case "rich": {
// not so safe..
@ -194,10 +188,10 @@ function oembed_format_object($j){
} else {
// add <a> for html2bbcode conversion
$ret .= "<a href='$embedurl' rel='oembed'>$embedurl</a>";
$ret .= "<br style='clear:left'>";
}
$ret.="</span>";
return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
$ret = str_replace("\n","",$ret);
return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
}
function oembed_iframe($src,$width,$height) {