From 6f6b1f95c855eb1e06aa73aaab8ddefd8eb970da Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 28 Dec 2012 11:31:30 +0100 Subject: [PATCH] vier: With IE there are no borders around images anymore bbcode: Multiple new lines are now reduced --- include/bbcode.php | 10 ++++++++++ view/theme/vier/style.css | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/include/bbcode.php b/include/bbcode.php index 384fd5ebd9..08edc19340 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -310,6 +310,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // remove some newlines before the general conversion $Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","[share$1]$2[/share]",$Text); + $Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism","[quote$1]$2[/quote]",$Text); // when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems if (!$tryoembed) @@ -324,6 +325,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = trim($Text); $Text = str_replace("\r\n","\n", $Text); + + // removing multiplicated newlines + $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]"); + $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]"); + do { + $oldtext = $Text; + $Text = str_replace($search, $replace, $Text); + } while ($oldtext != $Text); + $Text = str_replace(array("\r","\n"), array('
','
'), $Text); if($preserve_nl) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 9524c73cab..1701e8ac4c 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -7,6 +7,10 @@ @import url("css/font-awesome.css") all; @import url("css/font2.css") all; +img { + border: 0px; +} + /* ========= */ /* = Admin = */ /* ========= */ -- 2.39.2