[ticket/471] Do not shorten text if limit is at 0

Also, text will no longer be shortened if the modules is using the compact
style.

B3P-471
This commit is contained in:
Marc Alexander
2015-02-12 23:03:33 +01:00
parent b98c6fed23
commit ce42fb4fb8
3 changed files with 3 additions and 3 deletions

View File

@@ -124,7 +124,7 @@ class announcements extends module_base
$total_announcements = 1;
// Fetch announcements from portal functions.php with check if "read full" is requested.
$portal_announcement_length = ($announcement < 0) ? $this->config['board3_announcements_length_' . $module_id] : 0;
$portal_announcement_length = ($announcement < 0 && !$this->config['board3_announcements_style_' . $module_id]) ? $this->config['board3_announcements_length_' . $module_id] : 0;
$this->fetch_posts->set_module_id($module_id);
$fetch_news = $this->fetch_posts->get_posts(
$this->config['board3_global_announcements_forum_' . $module_id],

View File

@@ -125,7 +125,7 @@ class news extends module_base
$total_news = 1;
// Fetch news from portal functions.php with check if "read full" is requested.
$portal_news_length = ($news < 0) ? $this->config['board3_news_length_' . $module_id] : 0;
$portal_news_length = ($news < 0 && !$this->config['board3_news_style_' . $module_id]) ? $this->config['board3_news_length_' . $module_id] : 0;
$this->fetch_posts->set_module_id($module_id);
$fetch_news = $this->fetch_posts->get_posts(
$this->config['board3_news_forum_' . $module_id],