diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | images/friendika-128.png | bin | 7086 -> 6453 bytes | |||
| -rw-r--r-- | images/friendika-16.png | bin | 699 -> 770 bytes | |||
| -rw-r--r-- | images/friendika-256.png | bin | 11869 -> 10273 bytes | |||
| -rw-r--r-- | images/friendika-32.png | bin | 1411 -> 1593 bytes | |||
| -rw-r--r-- | images/friendika-64.png | bin | 3174 -> 3250 bytes | |||
| -rw-r--r-- | include/bbcode.php | 8 |
7 files changed, 8 insertions, 2 deletions
@@ -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 Binary files differindex 1d1c8e320..d2792ab54 100644 --- a/images/friendika-128.png +++ b/images/friendika-128.png diff --git a/images/friendika-16.png b/images/friendika-16.png Binary files differindex 1a742ecdc..3793508fb 100644 --- a/images/friendika-16.png +++ b/images/friendika-16.png diff --git a/images/friendika-256.png b/images/friendika-256.png Binary files differindex ea931c85f..e965fbaba 100644 --- a/images/friendika-256.png +++ b/images/friendika-256.png diff --git a/images/friendika-32.png b/images/friendika-32.png Binary files differindex a300b7bea..61764bf20 100644 --- a/images/friendika-32.png +++ b/images/friendika-32.png diff --git a/images/friendika-64.png b/images/friendika-64.png Binary files differindex a1c042293..88cb8b016 100644 --- a/images/friendika-64.png +++ b/images/friendika-64.png diff --git a/include/bbcode.php b/include/bbcode.php index 40f4935fb..3656f23a9 100644 --- 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); |
