aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-21 16:45:47 -0700
committerFriendika <info@friendika.com>2011-06-21 16:45:47 -0700
commite6086e23634939b3354c6b6db59d596c6e2d7ca4 (patch)
tree85b47ad5fe8bff278844e5064d7e373bb1f37cbc
parent043bde42a6a8dc312bbe66921a5339e09e9bef2f (diff)
downloadvolse-hubzilla-e6086e23634939b3354c6b6db59d596c6e2d7ca4.tar.gz
volse-hubzilla-e6086e23634939b3354c6b6db59d596c6e2d7ca4.tar.bz2
volse-hubzilla-e6086e23634939b3354c6b6db59d596c6e2d7ca4.zip
missed some images, table border property
-rw-r--r--images/friendika-48.pngbin0 -> 2404 bytes
-rw-r--r--images/friendika-96.pngbin0 -> 5484 bytes
-rw-r--r--include/bbcode.php4
3 files changed, 4 insertions, 0 deletions
diff --git a/images/friendika-48.png b/images/friendika-48.png
new file mode 100644
index 000000000..f858d9a81
--- /dev/null
+++ b/images/friendika-48.png
Binary files differ
diff --git a/images/friendika-96.png b/images/friendika-96.png
new file mode 100644
index 000000000..76a102ef2
--- /dev/null
+++ b/images/friendika-96.png
Binary files differ
diff --git a/include/bbcode.php b/include/bbcode.php
index 3656f23a9..7fc1eac1c 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -78,6 +78,10 @@ function bbcode($Text,$preserve_nl = false) {
$Text = preg_replace("/\[td\](.*?)\[\/td\]/s", '<td>$1</td>' ,$Text);
$Text = preg_replace("/\[tr\](.*?)\[\/tr\]/s", '<tr>$1</tr>' ,$Text);
$Text = preg_replace("/\[table\](.*?)\[\/table\]/s", '<table>$1</table>' ,$Text);
+
+ $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/s", '<table border="1" >$1</table>' ,$Text);
+ $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/s", '<table border="0" >$1</table>' ,$Text);
+
// $Text = str_replace("[*]", "<li>", $Text);