tobias/friendica
1
0
Fork 0
Code Pull requests Activity

preserve newlines on all networks

Browse source
This commit is contained in:
Friendika 2010-11-05 02:19:39 -07:00
parent b94cb8d234
commit 206eee0229
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -694,7 +694,7 @@ function xmlify($str) {
$buffer .= '>'; $buffer .= '>';
break; break;
case "\n" : case "\n" :
$buffer .= ' '; $buffer .= "\n";
break; break;
default : default :
$buffer .= $char; $buffer .= $char;

4
include/html2bbcode.php
View file

@ -6,6 +6,7 @@ function html2bbcode($s) {
// Tags to Find // Tags to Find
$htmltags = array( $htmltags = array(
'/\n/is',
'/\<b\>(.*?)\<\/b\>/is', '/\<b\>(.*?)\<\/b\>/is',
'/\<i\>(.*?)\<\/i\>/is', '/\<i\>(.*?)\<\/i\>/is',
'/\<u\>(.*?)\<\/u\>/is', '/\<u\>(.*?)\<\/u\>/is',
@ -24,6 +25,7 @@ $htmltags = array(
// Replace with // Replace with
$bbtags = array( $bbtags = array(
'',
'[b]$1[/b]', '[b]$1[/b]',
'[i]$1[/i]', '[i]$1[/i]',
'[u]$1[/u]', '[u]$1[/u]',
@ -31,7 +33,7 @@ $bbtags = array(
'[*]$1', '[*]$1',
'[img]$2[/img]', '[img]$2[/img]',
'$2', '$2',
'\n', "\n",
'[b]$1[/b]', '[b]$1[/b]',
'[url=$1]$3[/url]', '[url=$1]$3[/url]',
'[code]$1[/code]', '[code]$1[/code]',

6
view/theme/default/style.css
View file

@ -14,7 +14,7 @@
body { body {
background: #F5F6FB; background: #F5F6FB;
color: #444444; color: #444444;
font-family: "Lucida Grande", Tahoma, sans-serif; font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
font-size: 90%; font-size: 90%;
margin-left: 10px; margin-left: 10px;
} }
@ -123,11 +123,9 @@ blockquote:before {
#banner { #banner {
color: #F5F6FB; color: #F5F6FB;
font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
/* font-family: "lucida sans", verdana, sans; */
font-size: 1.8em; font-size: 1.8em;
letter-spacing: 0.12em; letter-spacing: 0.12em;
/* font-weight: bold; */
position: absolute; position: absolute;
top: 10px; top: 10px;
left: 40%; left: 40%;