diff options
| author | zottel <github@zottel.net> | 2012-04-08 21:50:41 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-08 21:50:41 +0200 |
| commit | 315d496290747aab8b3147dc24b822460071bb2d (patch) | |
| tree | 4d3cd849580d7ba3b8c30667bbb6f0901dc7d738 /include/bbcode.php | |
| parent | aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (diff) | |
| parent | 5c0446975516f2b52b6cf51618e0b75af56de71b (diff) | |
| download | volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.gz volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.bz2 volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 9befbd0f7..3697f1fc5 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -230,7 +230,8 @@ function bbcode($Text,$preserve_nl = false) { $Text); // [img=widthxheight]image source[/img] - $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text); + //$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text); + $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="width: $1px;" >', $Text); // Images // [img]pathtoimage[/img] |