Diaspora: Improved parsing of linefeeds

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 34c932f7457c9306d28e696408ff7a3d320d22cd..69a87b3817a37e9640a38d4b2eb302ddd072b346 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -34,6 +34,15 @@ function diaspora2bb($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);
 
        // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 64edef3012845dd59b86d787d4d97fe8e16cef12..79309e338e8090e9d020d0cfc5de0e9dccb1930a 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1216,6 +1216,7 @@ section.minimal {
 
 .wall-item-container .wall-item-content img {
   max-width: 100%;
+  vertical-align: middle;
   /* max-width: 650px; */
   /* max-width: 580px; */
 }