From 9a19f4f6c5a2eb5d377d9e911eaab854339404ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Tue, 12 Nov 2019 10:00:34 +0100 Subject: [PATCH] Temporary fix for buggy addUrls(), see https://github.com/movim/movim/issues/877 --- app/Message.php | 6 ++++++ app/widgets/Chat/Chat.php | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Message.php b/app/Message.php index 5201db1a5..0e271f71a 100644 --- a/app/Message.php +++ b/app/Message.php @@ -389,7 +389,13 @@ class Message extends Model public function addUrls() { if (is_string($this->body)) { + $old = $this->body; $this->body = addUrls($this->body); + + // TODO fix addUrls, see https://github.com/movim/movim/issues/877 + if (strlen($this->body) < strlen($old)) { + $this->body = $old; + } } } } diff --git a/app/widgets/Chat/Chat.php b/app/widgets/Chat/Chat.php index 374c76372..b3c7086b9 100644 --- a/app/widgets/Chat/Chat.php +++ b/app/widgets/Chat/Chat.php @@ -791,7 +791,6 @@ class Chat extends \Movim\Widget\Base // Sticker message if (isset($message->sticker)) { - $p = new Picture; $sticker = $p->get($message->sticker, false, false, 'png'); $stickerSize = $p->getSize();