Merge pull request #6457 from annando/onepoll-bug

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 08858fe0fc45128ada66a6fce8ac289e94a9d90d..ff9fa5511a0158c2867d8445a08a83c382664c5d 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -26,11 +26,10 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Model\FileTag;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use Friendica\Content\Text\HTML;
 
-require_once "include/conversation.php";
-
 /**
  * Turn user/group ACLs stored as angle bracketed text into arrays
  *
@@ -61,7 +60,7 @@ function expand_acl($s) {
  */
 function sanitise_acl(&$item) {
        if (intval($item)) {
-               $item = '<' . intval(notags(trim($item))) . '>';
+               $item = '<' . intval(Strings::escapeTags(trim($item))) . '>';
        } else {
                unset($item);
        }