diff options
| author | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2021-10-15 14:26:31 +0200 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2021-10-15 14:26:40 +0200 |
| commit | c80a130ffed18a5ddf56a7a40a35e54dacb2f818 (patch) | |
| tree | 3631124f8bafa0f26dfe7c37e48e4132d8ad7600 /lib/extern | |
| parent | 93e959ec24e7e885f731747ce1dc2aa24d811eee (diff) | |
fix news display on template based external pages, fixes #335
Diffstat (limited to 'lib/extern')
| -rw-r--r-- | lib/extern/modules/ExternModuleTemplateNews.class.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/extern/modules/ExternModuleTemplateNews.class.php b/lib/extern/modules/ExternModuleTemplateNews.class.php index 71a1f89..aad0579 100644 --- a/lib/extern/modules/ExternModuleTemplateNews.class.php +++ b/lib/extern/modules/ExternModuleTemplateNews.class.php @@ -157,8 +157,7 @@ class ExternModuleTemplateNews extends ExternModule { } if ($nameformat == 'last') $local_fullname_sql['last'] = ' Nachname '; - $_news = StudipNews::GetNewsByRange($this->config->range_id); - $news =& $_news; + $news = StudipNews::GetNewsByRange($this->config->range_id, false, true); if (!count($news)) { $content['NEWS']['NO-NEWS']['NO-NEWS_TEXT'] = $this->config->getValue('Main', "nodatatext"); } @@ -181,7 +180,7 @@ class ExternModuleTemplateNews extends ExternModule { $content['NEWS']['ALL-NEWS']['SINGLE-NEWS'][$i]['NEWS_ADMIN-MESSAGE'] = preg_replace('# \(?(.*)\)?#', '$1', $admin_msg); } - if (!$news_content) { + if (!(string) $news_detail->body) { $content['NEWS']['ALL-NEWS']['SINGLE-NEWS'][$i]['NEWS_BODY'] = _('Keine Beschreibung vorhanden.'); } else { $content['NEWS']['ALL-NEWS']['SINGLE-NEWS'][$i]['NEWS_BODY'] = ExternModule::ExtFormatReady((string) $news_detail->body); @@ -210,6 +209,7 @@ class ExternModuleTemplateNews extends ExternModule { $content['NEWS']['ALL-NEWS']['SINGLE-NEWS'][$i]['PERSONDETAIL-HREF'] = $this->elements['LinkInternTemplate']->createUrl(['link_args' => 'username=' . $temp['username']]); } $i++; + } else if ($news_detail->date < $now) { //archivierte News ausgeben if ($news_detail->chdate_uid){ @@ -219,7 +219,7 @@ class ExternModuleTemplateNews extends ExternModule { $content['NEWS']['ALL-ARCHIV-NEWS']['SINGLE-ARCHIVE-NEWS'][$j]['ARCHIV_NEWS_ADMIN-MESSAGE'] = preg_replace('# \(?(.*)\)?#', '$1', $admin_msg); } - if (!$news_content) { + if (!(string) $news_detail->body) { $content['NEWS']['ALL-ARCHIV-NEWS']['SINGLE-ARCHIVE-NEWS'][$j]['ARCHIV_NEWS_BODY'] = _("Keine Beschreibung vorhanden."); } else { $content['NEWS']['ALL-ARCHIV-NEWS']['SINGLE-ARCHIVE-NEWS'][$j]['ARCHIV_NEWS_BODY'] = ExternModule::ExtFormatReady((string) $news_detail->body); |