aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-05-03 12:34:51 +0200
committerMario Vavti <mario@mariovavti.com>2018-05-03 12:34:51 +0200
commit2f9a04455988620485fb0462c1889af502a20f71 (patch)
tree00651d5e1c51b1d18c68c20288f91df49b252f56
parent1f429a003386bbf11f26c9caea4b18b01cf09ef2 (diff)
downloadvolse-hubzilla-2f9a04455988620485fb0462c1889af502a20f71.tar.gz
volse-hubzilla-2f9a04455988620485fb0462c1889af502a20f71.tar.bz2
volse-hubzilla-2f9a04455988620485fb0462c1889af502a20f71.zip
Revert "hubzilla issue #1151 - activitypub mention gets bookmarked"
This reverts commit 285781b8870d1c36cf90a3b38a448719b8bf9d21.
-rw-r--r--include/network.php4
-rw-r--r--include/text.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/network.php b/include/network.php
index a00ede6bf..8b7490a8a 100644
--- a/include/network.php
+++ b/include/network.php
@@ -797,7 +797,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
if($namespaces)
$parser = @xml_parser_create_ns("UTF-8",':');
else
- $parser = @xml_parser_create('UTF-8');
+ $parser = @xml_parser_create();
if(! $parser) {
logger('xml2array: xml_parser_create: no resource');
@@ -807,7 +807,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8");
// http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
- xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
+ xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
@xml_parse_into_struct($parser, trim($contents), $xml_values);
@xml_parser_free($parser);
diff --git a/include/text.php b/include/text.php
index babc18b44..af88c9f9c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3273,9 +3273,9 @@ 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\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\
+ $body = preg_replace_callback("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\
+\,\(\)]+)/ismu", '\nakedoembed', $body);
- $body = preg_replace_callback("/([^\]\='".'"'."\/\{]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\
+ $body = preg_replace_callback("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\
+\,\(\)]+)/ismu", '\red_zrl_callback', $body);
$body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','\red_unescape_codeblock',$body);