diff options
| author | Mario <mario@mariovavti.com> | 2023-01-13 20:01:05 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-01-13 20:01:05 +0000 |
| commit | 2805520d1bcb2640fc079d54f5f230f7b87d1f84 (patch) | |
| tree | 43b3e5bb7c71522d04560015478765a7b763a5fe /include/text.php | |
| parent | f6d940606350eb8685c278af6d87f3a0b8c0f5e5 (diff) | |
| parent | fb7ca18820e7618325dded78a3c3a464dd01b391 (diff) | |
| download | volse-hubzilla-2805520d1bcb2640fc079d54f5f230f7b87d1f84.tar.gz volse-hubzilla-2805520d1bcb2640fc079d54f5f230f7b87d1f84.tar.bz2 volse-hubzilla-2805520d1bcb2640fc079d54f5f230f7b87d1f84.zip | |
Merge remote-tracking branch 'origin/8.0RC'8.0
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index cc480aacf..35ce465d6 100644 --- a/include/text.php +++ b/include/text.php @@ -303,6 +303,7 @@ function purify_html($s, $allow_position = false) { $def->addElement('footer', 'Block', 'Flow', 'Common'); //Inline $def->addElement('button', 'Inline', 'Inline', 'Common'); + $def->addElement('mark', 'Inline', 'Inline', 'Common'); if($allow_position) { @@ -2969,7 +2970,7 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) $newname = substr($name,1); $newname = substr($newname,0,-1); - $r = q("SELECT * FROM xchan WHERE ( xchan_addr = '%s' OR xchan_url = '%s' ) AND xchan_deleted = 0 AND NOT xchan_network IN ('rss', 'anon', 'unknown')", + $r = q("SELECT * FROM xchan LEFT JOIN hubloc ON hubloc_hash = xchan_hash WHERE ( xchan_addr = '%s' OR xchan_url = '%s' ) AND xchan_deleted = 0 AND NOT xchan_network IN ('rss', 'anon', 'unknown') ORDER BY hubloc_id DESC", dbesc($newname), dbesc($newname) ); @@ -3004,7 +3005,7 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) if((! $r) && strpos($newname,'@')) { $r = q("SELECT * FROM xchan LEFT JOIN hubloc ON xchan_hash = hubloc_hash - WHERE hubloc_addr = '%s' AND xchan_deleted = 0 AND NOT xchan_network IN ('rss', 'anon', 'unknown')", + WHERE hubloc_addr = '%s' AND xchan_deleted = 0 AND NOT xchan_network IN ('rss', 'anon', 'unknown') ORDER BY hubloc_id DESC", dbesc($newname) ); } |