Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-03-03 21:48:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

bug #34, line breaks double in retweet/share

Browse source
This commit is contained in:
Friendika 2011-04-10 03:00:29 -07:00
parent 6b66ac8183
commit bf865f0210
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -2,7 +2,7 @@
set_time_limit(0); set_time_limit(0);
define ( 'FRIENDIKA_VERSION', '2.1.943' ); define ( 'FRIENDIKA_VERSION', '2.1.944' );
define ( 'DFRN_PROTOCOL_VERSION', '2.2' ); define ( 'DFRN_PROTOCOL_VERSION', '2.2' );
define ( 'DB_UPDATE_VERSION', 1047 ); define ( 'DB_UPDATE_VERSION', 1047 );

5
include/bbcode.php
View file

@ -3,7 +3,7 @@ require_once("include/oembed.php");
// BBcode 2 HTML was written by WAY2WEB.net // BBcode 2 HTML was written by WAY2WEB.net
// extended to work with Mistpark/Friendika - Mike Macgirvin // extended to work with Mistpark/Friendika - Mike Macgirvin
function bbcode($Text) { function bbcode($Text,$preserve_nl = false) {
// Replace any html brackets with HTML Entities to prevent executing HTML or script // Replace any html brackets with HTML Entities to prevent executing HTML or script
// Don't use strip_tags here because it breaks [url] search by replacing & with amp // Don't use strip_tags here because it breaks [url] search by replacing & with amp
@ -12,7 +12,10 @@ function bbcode($Text) {
$Text = str_replace(">", ">", $Text); $Text = str_replace(">", ">", $Text);
// Convert new line chars to html <br /> tags // Convert new line chars to html <br /> tags
$Text = nl2br($Text); $Text = nl2br($Text);
if($preserve_nl)
$Text = str_replace(array("\n","\r"), array('',''),$Text);
// Set up the parameters for a URL search string // Set up the parameters for a URL search string
$URLSearchString = "^\[\]"; $URLSearchString = "^\[\]";

2
mod/share.php
View file

@ -17,7 +17,7 @@ function share_init(&$a) {
$o = ''; $o = '';
$o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />'; $o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
$o .= prepare_body($r[0]); $o .= bbcode($r[0]['body'], true);
echo $o . '<br />'; echo $o . '<br />';
killme(); killme();
} }