aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-13 04:53:17 -0700
committerFriendika <info@friendika.com>2011-09-13 04:53:17 -0700
commit43da1429cc85beee5b02e63635757700171e602e (patch)
tree0186ab8cc76ac823f2f3493e331a42ffb29294c6
parent08fc3e91b6084c71e502e6e7915ac566ea21e9ee (diff)
downloadvolse-hubzilla-43da1429cc85beee5b02e63635757700171e602e.tar.gz
volse-hubzilla-43da1429cc85beee5b02e63635757700171e602e.tar.bz2
volse-hubzilla-43da1429cc85beee5b02e63635757700171e602e.zip
import image sizes from html source
-rw-r--r--include/html2bbcode.php8
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",