aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-06 14:56:59 +0100
committermarijus <mario@localhost.localdomain>2014-02-06 14:56:59 +0100
commita2b311991a90e1c78d30bad5504c18bb2a3c5c2a (patch)
tree54b5e5dbc7230442a3e1ec894c4a4c385b2d78c7 /include/text.php
parent419e3b5024efec40c98e48c3bf213c4e60d39fae (diff)
parent7a522be20bd66a0a904dcddf33d53e59aa04a92d (diff)
downloadvolse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.tar.gz
volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.tar.bz2
volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.zip
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'include/text.php')
-rwxr-xr-xinclude/text.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php
index 266d8952b..2b334068f 100755
--- a/include/text.php
+++ b/include/text.php
@@ -565,6 +565,10 @@ function get_tags($s) {
$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
+ // ignore anything in [style= ]
+
+ $s = preg_replace('/\[style=(.*?)\]/sm','',$s);
+
// Match full names against @tags including the space between first and last
// We will look these up afterward to see if they are full names or not recognisable.