fix banding on logo, xhtml compliant list and basic table support
authorFriendika <info@friendika.com>
Tue, 21 Jun 2011 23:29:43 +0000 (16:29 -0700)
committerFriendika <info@friendika.com>
Tue, 21 Jun 2011 23:29:43 +0000 (16:29 -0700)
boot.php
images/friendika-128.png
images/friendika-16.png
images/friendika-256.png
images/friendika-32.png
images/friendika-64.png
include/bbcode.php

index b726b79..49120b7 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1017' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1018' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1065      );
 
index 1d1c8e3..d2792ab 100644 (file)
Binary files a/images/friendika-128.png and b/images/friendika-128.png differ
index 1a742ec..3793508 100644 (file)
Binary files a/images/friendika-16.png and b/images/friendika-16.png differ
index ea931c8..e965fba 100644 (file)
Binary files a/images/friendika-256.png and b/images/friendika-256.png differ
index a300b7b..61764bf 100644 (file)
Binary files a/images/friendika-32.png and b/images/friendika-32.png differ
index a1c0422..88cb8b0 100644 (file)
Binary files a/images/friendika-64.png and b/images/friendika-64.png differ
index 40f4935..3656f23 100644 (file)
@@ -73,7 +73,13 @@ function bbcode($Text,$preserve_nl = false) {
        $Text = preg_replace("/\[list=I\](.*?)\[\/list\]/s", '<ul class="listupperroman">$1</ul>' ,$Text);
        $Text = preg_replace("/\[list=a\](.*?)\[\/list\]/s", '<ul class="listloweralpha">$1</ul>' ,$Text);
        $Text = preg_replace("/\[list=A\](.*?)\[\/list\]/s", '<ul class="listupperalpha">$1</ul>' ,$Text);
-       $Text = str_replace("[*]", "<li>", $Text);
+       $Text = preg_replace("/\[li\](.*?)\[\/li\]/s", '<li>$1</li>' ,$Text);
+
+       $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 = str_replace("[*]", "<li>", $Text);
 
        // Check for font change text
        $Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text);