aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-07-25 12:25:27 +0200
committerMax Kostikov <max@kostikov.co>2019-07-25 12:25:27 +0200
commit5695350e98a8a2c802ff419c5b29b0f01f0180df (patch)
tree66fe3d69f857c0e57233dbb848022c61c459b012
parent4e3a0720c3c1dc6906adb055769254d77c740ba3 (diff)
downloadvolse-hubzilla-5695350e98a8a2c802ff419c5b29b0f01f0180df.tar.gz
volse-hubzilla-5695350e98a8a2c802ff419c5b29b0f01f0180df.tar.bz2
volse-hubzilla-5695350e98a8a2c802ff419c5b29b0f01f0180df.zip
Revert "Merge branch 'dev' into 'dev'"
This reverts merge request !1694
-rw-r--r--include/activities.php2
-rw-r--r--include/bbcode.php2
-rw-r--r--include/text.php4
-rw-r--r--include/zid.php4
4 files changed, 6 insertions, 6 deletions
diff --git a/include/activities.php b/include/activities.php
index f329e374c..68c995338 100644
--- a/include/activities.php
+++ b/include/activities.php
@@ -51,7 +51,7 @@ function profile_activity($changed, $value) {
if($t == 1 && strlen($value)) {
// if it's a url, the HTML quotes will mess it up, so link it and don't try and zidify it because we don't know what it points to.
- $value = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)([\,\.\:\;]\s|$)/ismu", 'red_zrl_callback', $value);
+ $value = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ismu", 'red_zrl_callback', $value);
// take out the bookmark indicator
if(substr($value,0,2) === '#^')
$value = str_replace('#^','',$value);
diff --git a/include/bbcode.php b/include/bbcode.php
index df91356de..485a1f5b2 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -70,7 +70,7 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) {
function tryoembed($match) {
- $url = ((count($match) == 3) ? $match[1] : $match[2]);
+ $url = ((count($match) == 2) ? $match[1] : $match[2]);
$o = oembed_fetch_url($url);
diff --git a/include/text.php b/include/text.php
index 1cde6bb01..8adcc1269 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3405,10 +3405,10 @@ function cleanup_bbcode($body) {
$body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','\red_escape_codeblock',$body);
$body = preg_replace_callback("/([^\]\='".'"'."\/\{]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\
-+\,\(\)]+)([\,\.\:\;]\s|$)/ismu", '\nakedoembed', $body);
++\,\(\)]+)/ismu", '\nakedoembed', $body);
$body = preg_replace_callback("/([^\]\='".'"'."\/\{]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\
-+\,\(\)]+)([\,\.\:\;]\s|$)/ismu", '\red_zrl_callback', $body);
++\,\(\)]+)/ismu", '\red_zrl_callback', $body);
$body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','\red_unescape_codeblock',$body);
diff --git a/include/zid.php b/include/zid.php
index fc8a31094..27ef0cefa 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -216,9 +216,9 @@ function red_zrl_callback($matches) {
if($matches[1] === '#^')
$matches[1] = '';
if($zrl)
- return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]' . $matches[3];
+ return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]';
- return $matches[1] . '#^[url=' . $matches[2] . ']' . $matches[2] . '[/url]' . $matches[3];
+ return $matches[1] . '#^[url=' . $matches[2] . ']' . $matches[2] . '[/url]';
}
/**