Diaspora: Improved parsing of linefeeds
This commit is contained in:
parent
43f98bc854
commit
c356da2cad
2 changed files with 10 additions and 0 deletions
|
@ -34,6 +34,15 @@ function diaspora2bb($s) {
|
||||||
|
|
||||||
$s = str_replace('#','#',$s);
|
$s = str_replace('#','#',$s);
|
||||||
|
|
||||||
|
$search = array(" \n", "\n ");
|
||||||
|
$replace = array("\n", "\n");
|
||||||
|
do {
|
||||||
|
$oldtext = $s;
|
||||||
|
$s = str_replace($search, $replace, $s);
|
||||||
|
} while ($oldtext != $s);
|
||||||
|
|
||||||
|
$s = str_replace("\n\n", "<br>", $s);
|
||||||
|
|
||||||
$s = html2bbcode($s);
|
$s = html2bbcode($s);
|
||||||
|
|
||||||
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
|
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
|
||||||
|
|
|
@ -1216,6 +1216,7 @@ section.minimal {
|
||||||
|
|
||||||
.wall-item-container .wall-item-content img {
|
.wall-item-container .wall-item-content img {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
|
vertical-align: middle;
|
||||||
/* max-width: 650px; */
|
/* max-width: 650px; */
|
||||||
/* max-width: 580px; */
|
/* max-width: 580px; */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue