friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

bbcode: mask "[" and "]" for attachments.

pull/1086/head
Michael Vogel 2014-08-28 01:11:43 +02:00
parent 4bdd905b3e
commit b4e8ec2806
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/bbcode.php
View File

@ -152,9 +152,9 @@ function bb_rearrange_share($shared) {
if ($matches)
$description = trim($matches[1]);
$url = htmlentities($url, ENT_QUOTES, 'UTF-8', false);
$title = htmlentities($title, ENT_QUOTES, 'UTF-8', false);
$preview = htmlentities($preview, ENT_QUOTES, 'UTF-8', false);
$url = str_replace(array("[", "]"), array("[", "]"), htmlentities($url, ENT_QUOTES, 'UTF-8', false));
$title = str_replace(array("[", "]"), array("[", "]"), htmlentities($title, ENT_QUOTES, 'UTF-8', false));
$preview = str_replace(array("[", "]"), array("[", "]"), htmlentities($preview, ENT_QUOTES, 'UTF-8', false));
$Text = trim($shared[1])."\n[attachment type='".$type."'";
@ -165,7 +165,7 @@ function bb_rearrange_share($shared) {
if ($preview != "") {
require_once("include/Photo.php");
$picturedata = get_photo_info($preview);
// echo $preview."*".print_r($picturedata, true)."*";
if (count($picturedata) > 0) {
// if the preview picture is larger than 500 pixels then show it in a larger mode
// But only, if the picture isn't higher than large (To prevent huge posts)
@ -281,8 +281,6 @@ function tryoembed($match){
if (isset($match[2]))
$o->title = $match[2];
//echo "<pre>"; var_dump($match, $url, $o); killme();
if ($o->type=="error") return $match[0];
$html = oembed_format_object($o);