diff --git a/app/Post.php b/app/Post.php index c62b117fd..2c8ae793c 100644 --- a/app/Post.php +++ b/app/Post.php @@ -261,11 +261,6 @@ class Post extends Model return explodeJid($this->aid)['username'] ?? ''; } - public function getDecodedContentAttribute() - { - return htmlspecialchars_decode($this->content, ENT_XML1 | ENT_COMPAT); - } - public function getDecodedContentRawAttribute() { return htmlspecialchars_decode($this->contentraw, ENT_XML1 | ENT_COMPAT); diff --git a/app/widgets/PublishBrief/_publishbrief.tpl b/app/widgets/PublishBrief/_publishbrief.tpl index bada61e99..829b942bc 100644 --- a/app/widgets/PublishBrief/_publishbrief.tpl +++ b/app/widgets/PublishBrief/_publishbrief.tpl @@ -85,7 +85,7 @@ name="content" placeholder="{$c->__('publishbrief.content_text')}" data-autoheight="true" - >{if="$post"}{$post->decodedContentraw}{elseif="$draft && !empty($draft->content)"}{$draft->decodedContent}{/if} + >{if="$post"}{$post->decodedContentraw}{elseif="$draft && !empty($draft->content)"}{$draft->content}{/if} {if="$extended"} diff --git a/composer.lock b/composer.lock index 0f9d45b28..6fca6faa1 100644 --- a/composer.lock +++ b/composer.lock @@ -2058,27 +2058,22 @@ }, { "name": "psr/container", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -2091,7 +2086,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -2105,9 +2100,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" + "source": "https://github.com/php-fig/container/tree/1.1.1" }, - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/http-message", @@ -2621,16 +2616,16 @@ }, { "name": "react/dns", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/reactphp/dns.git", - "reference": "665260757171e2ab17485b44e7ffffa7acb6ca1f" + "reference": "b22b0b20278e8535e633ab71a52472c5bf620aa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/dns/zipball/665260757171e2ab17485b44e7ffffa7acb6ca1f", - "reference": "665260757171e2ab17485b44e7ffffa7acb6ca1f", + "url": "https://api.github.com/repos/reactphp/dns/zipball/b22b0b20278e8535e633ab71a52472c5bf620aa1", + "reference": "b22b0b20278e8535e633ab71a52472c5bf620aa1", "shasum": "" }, "require": { @@ -2685,7 +2680,7 @@ ], "support": { "issues": "https://github.com/reactphp/dns/issues", - "source": "https://github.com/reactphp/dns/tree/v1.4.0" + "source": "https://github.com/reactphp/dns/tree/v1.5.0" }, "funding": [ { @@ -2697,7 +2692,7 @@ "type": "github" } ], - "time": "2020-09-18T12:12:55+00:00" + "time": "2021-03-05T12:16:50+00:00" }, { "name": "react/event-loop",