From b9a0ef7cdb57c7ccec01db5bea71e191afeae2ed Mon Sep 17 00:00:00 2001 From: saint-hh Date: Thu, 26 Jan 2017 22:21:26 +0100 Subject: [PATCH 1/8] Add files via upload --- portal/fetch_posts.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/portal/fetch_posts.php b/portal/fetch_posts.php index 53971889..58c45667 100644 --- a/portal/fetch_posts.php +++ b/portal/fetch_posts.php @@ -205,7 +205,7 @@ class fetch_posts t.topic_title, t.topic_attachment, t.topic_views, - t.poll_title, + t.poll_start, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, @@ -334,7 +334,7 @@ class fetch_posts 'user_id' => $row['user_id'], 'user_type' => $row['user_type'], '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), 'topic_views' => $row['topic_views'], 'forum_name' => $row['forum_name'], @@ -651,11 +651,10 @@ class fetch_posts */ 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(); - $message = $trim->setText($message) - ->shortenText($length); + $trim = new \Nickvergessen\TrimMessage\TrimMessage($message, $bbcode_uid, $length); + $message = $trim->message(); unset($trim); } From 6cae1e4b756b3616b5f6419002a77491e6e90bf7 Mon Sep 17 00:00:00 2001 From: saint-hh Date: Sat, 28 Jan 2017 19:25:41 +0100 Subject: [PATCH 2/8] Style changes - pagination buttons --- .../modules/announcements_center_compact.html | 33 +++++++++++-------- .../portal/modules/birthdays_side.html | 2 +- .../template/portal/modules/friends_side.html | 2 +- .../portal/modules/latest_members_side.html | 16 ++++----- .../portal/modules/news_compact_center.html | 29 +++++++++------- .../portal/modules/topposters_side.html | 16 ++++----- 6 files changed, 55 insertions(+), 43 deletions(-) diff --git a/styles/prosilver/template/portal/modules/announcements_center_compact.html b/styles/prosilver/template/portal/modules/announcements_center_compact.html index 90136c8d..b98ecf4a 100644 --- a/styles/prosilver/template/portal/modules/announcements_center_compact.html +++ b/styles/prosilver/template/portal/modules/announcements_center_compact.html @@ -22,33 +22,38 @@