1
0
Fork 0

improved code blocks

This commit is contained in:
Friendika 2011-07-18 19:17:16 -07:00
parent c0b8e63a3f
commit 7008bec045
2 changed files with 16 additions and 2 deletions

View file

@ -3,6 +3,13 @@
require_once("include/oembed.php"); require_once("include/oembed.php");
require_once('include/event.php'); require_once('include/event.php');
function stripcode_br_cb($s) {
return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]';
}
// 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
@ -89,9 +96,16 @@ function bbcode($Text,$preserve_nl = false) {
$Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text); $Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text);
// Declare the format for [code] layout // Declare the format for [code] layout
$Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripcode_br_cb',$Text);
$CodeLayout = '<code>$1</code>'; $CodeLayout = '<code>$1</code>';
// Check for [code] text // Check for [code] text
$Text = preg_replace("/\[code\](.*?)\[\/code\]/is","$CodeLayout", $Text); $Text = preg_replace("/\[code\](.*?)\[\/code\]/is","$CodeLayout", $Text);
// Declare the format for [quote] layout // Declare the format for [quote] layout
$QuoteLayout = '<blockquote>$1</blockquote>'; $QuoteLayout = '<blockquote>$1</blockquote>';
// Check for [quote] text // Check for [quote] text

View file

@ -45,8 +45,8 @@ code {
border: 1px solid #444; border: 1px solid #444;
background: #EEE; background: #EEE;
color: #444; color: #444;
padding: 10px; padding: 0px 10px 10px 10px;
margin-top: 20px; margin-top: 20px;
} }
/*blockquote:before { /*blockquote:before {
content: '>> '; content: '>> ';