aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-03-31 16:28:39 +0200
committerMichael Vogel <icarus@dabo.de>2012-03-31 16:28:39 +0200
commit59b45f7fc12027c387f04a2121ea398c1d534626 (patch)
treee717616428e620d5710983b83e68c0c704cba2f9 /include
parentbdd275474044152a5d9a33ea6b8a8071b931d27e (diff)
downloadvolse-hubzilla-59b45f7fc12027c387f04a2121ea398c1d534626.tar.gz
volse-hubzilla-59b45f7fc12027c387f04a2121ea398c1d534626.tar.bz2
volse-hubzilla-59b45f7fc12027c387f04a2121ea398c1d534626.zip
Several improvements
Diffstat (limited to 'include')
-rw-r--r--include/bbcode.php3
-rw-r--r--include/html2plain.php5
2 files changed, 6 insertions, 2 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]
diff --git a/include/html2plain.php b/include/html2plain.php
index fe0e3326e..7aa20500a 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -83,12 +83,15 @@ function collecturls($message) {
$urls = array();
foreach ($result as $treffer) {
// A list of some links that should be ignored
- $list = array("/user/", "/tag/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/",
+ $list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/",
"//facebook.com/profile.php?id=", "//plus.google.com/");
foreach ($list as $listitem)
if (strpos($treffer[1], $listitem) !== false)
$ignore = true;
+ if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
+ $ignore = false;
+
if (!$ignore)
$urls[$treffer[1]] = $treffer[1];
}