Add files via upload

This commit is contained in:
saint-hh
2017-01-26 22:21:26 +01:00
committed by GitHub
parent 3853fde6ed
commit b9a0ef7cdb

View File

@@ -205,7 +205,7 @@ class fetch_posts
t.topic_title, t.topic_title,
t.topic_attachment, t.topic_attachment,
t.topic_views, t.topic_views,
t.poll_title, t.poll_start,
t.topic_posts_approved, t.topic_posts_approved,
t.topic_posts_unapproved, t.topic_posts_unapproved,
t.topic_posts_softdeleted, t.topic_posts_softdeleted,
@@ -334,7 +334,7 @@ class fetch_posts
'user_id' => $row['user_id'], 'user_id' => $row['user_id'],
'user_type' => $row['user_type'], 'user_type' => $row['user_type'],
'user_colour' => $row['user_colour'], 'user_colour' => $row['user_colour'],
'poll' => $this->get_setting_based_data($row['poll_title'], true, false), 'poll' => $this->get_setting_based_data($row['poll_start'], true, false),
'attachment' => $this->get_setting_based_data($row['topic_attachment'], true, false), 'attachment' => $this->get_setting_based_data($row['topic_attachment'], true, false),
'topic_views' => $row['topic_views'], 'topic_views' => $row['topic_views'],
'forum_name' => $row['forum_name'], 'forum_name' => $row['forum_name'],
@@ -651,11 +651,10 @@ class fetch_posts
*/ */
public function shorten_message($message, $bbcode_uid, $length) public function shorten_message($message, $bbcode_uid, $length)
{ {
if (class_exists('\Marc1706\TextShortener\Shortener')) if (class_exists('\Nickvergessen\TrimMessage\TrimMessage'))
{ {
$trim = new \Marc1706\TextShortener\Shortener(); $trim = new \Nickvergessen\TrimMessage\TrimMessage($message, $bbcode_uid, $length);
$message = $trim->setText($message) $message = $trim->message();
->shortenText($length);
unset($trim); unset($trim);
} }