fix banding on logo, xhtml compliant list and basic table support

diff --git a/boot.php b/boot.php
index b726b79a8d4c578d75e982343d36af6498c211ea..49120b7cd1d340f2a0e6c44f088746738e7db6a4 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      );
 

diff --git a/images/friendika-128.png b/images/friendika-128.png
index 1d1c8e320775fb6336a05f69126d54614f02d66f..d2792ab54ebeb1b34dcb18e3c6b35d9b568743ec 100644 (file)
Binary files a/images/friendika-128.png and b/images/friendika-128.png differ

diff --git a/images/friendika-16.png b/images/friendika-16.png
index 1a742ecdc1016e7033e78e37fbecade08fef6d50..3793508fb2b39c060fd83cb788d3135fd6cd7f9e 100644 (file)
Binary files a/images/friendika-16.png and b/images/friendika-16.png differ

diff --git a/images/friendika-256.png b/images/friendika-256.png
index ea931c85f720579cc25769431a2fe0793a95974c..e965fbabab62ed7e8bd0841e23604980346570d8 100644 (file)
Binary files a/images/friendika-256.png and b/images/friendika-256.png differ

diff --git a/images/friendika-32.png b/images/friendika-32.png
index a300b7beae91dd9bd78e5e168cd8acde47080e43..61764bf20a35fb21995b667e9a5e25436685a8a7 100644 (file)
Binary files a/images/friendika-32.png and b/images/friendika-32.png differ

diff --git a/images/friendika-64.png b/images/friendika-64.png
index a1c04229320aa940a38eb7fcadf8e45b422e37e6..88cb8b016d42f3462bdbc731e61741924a6fadb0 100644 (file)
Binary files a/images/friendika-64.png and b/images/friendika-64.png differ

diff --git a/include/bbcode.php b/include/bbcode.php
index 40f4935fba21aecba992fa4d6c7277a2ea75dd1a..3656f23a9d3852646fad7dbf02cab0969d92d07e 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -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);