diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-16 09:39:29 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-16 09:39:29 +0200 |
| commit | 9d2afc2d3c12f6b70eae11487e491e2d8604ed60 (patch) | |
| tree | ced4fb400d25762866a773115b122f6c9cc498de /include/html2bbcode.php | |
| parent | 019b735ec75989336826e5ad5db6377803ecb050 (diff) | |
| parent | 2e43b291e73f6d7c36a9d8743fc2635dc3444841 (diff) | |
| download | volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.gz volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.bz2 volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'include/html2bbcode.php')
| -rw-r--r-- | include/html2bbcode.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php index d4e8cce66..8025c336b 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -24,6 +24,10 @@ function html2bbcode($s) { '/\<u\>(.*?)\<\/u\>/is', '/\<ul\>(.*?)\<\/ul\>/is', '/\<li\>(.*?)\<\/li\>/is', + '/\<img(.*?)width: *([0-9]+)(.*?)height: *([0-9]+)(.*?)src=\"(.*?)\" (.*?)\>/is', + '/\<img(.*?)height: *([0-9]+)(.*?)width: *([0-9]+)(.*?)src=\"(.*?)\" (.*?)\>/is', + '/\<img(.*?)src=\"(.*?)\"(.*?)width: *([0-9]+)(.*?)height: *([0-9]+)(.*?)\>/is', + '/\<img(.*?)src=\"(.*?)\"(.*?)height: *([0-9]+)(.*?)width: *([0-9]+)(.*?)\>/is', '/\<img(.*?) src=\"(.*?)\" (.*?)\>/is', '/\<div(.*?)\>(.*?)\<\/div\>/is', '/\<br(.*?)\>/is', @@ -50,6 +54,10 @@ function html2bbcode($s) { '[u]$1[/u]', '[list]$1[/list]', '[*]$1', + '[img=$2x$4]$6[/img]', + '[img=$4x$2]$6[/img]', + '[img=$4x$6]$2[/img]', + '[img=$6x$4]$2[/img]', '[img]$2[/img]', '$2', "\n", |