Skip to content
Snippets Groups Projects
Commit 7985a9b4 authored by Michaela Brückner's avatar Michaela Brückner :unicorn:
Browse files

Merge remote-tracking branch 'origin/main' into main

parents 5d02ec00 c80a130f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/extern/modules/ExternModuleTemplateNews.class.php
+ 4
− 4
View file @ 7985a9b4
...@@ -157,8 +157,7 @@ class ExternModuleTemplateNews extends ExternModule { ...@@ -157,8 +157,7 @@ class ExternModuleTemplateNews extends ExternModule {
} }
if ($nameformat == 'last') $local_fullname_sql['last'] = ' Nachname '; if ($nameformat == 'last') $local_fullname_sql['last'] = ' Nachname ';
$_news = StudipNews::GetNewsByRange($this->config->range_id); $news = StudipNews::GetNewsByRange($this->config->range_id, false, true);
$news =& $_news;
if (!count($news)) { if (!count($news)) {
$content['NEWS']['NO-NEWS']['NO-NEWS_TEXT'] = $this->config->getValue('Main', "nodatatext"); $content['NEWS']['NO-NEWS']['NO-NEWS_TEXT'] = $this->config->getValue('Main', "nodatatext");
} }
...@@ -181,7 +180,7 @@ class ExternModuleTemplateNews extends ExternModule { ...@@ -181,7 +180,7 @@ class ExternModuleTemplateNews extends ExternModule {
$content['NEWS']['ALL-NEWS']['SINGLE-NEWS'][$i]['NEWS_ADMIN-MESSAGE'] = preg_replace('# \(?(.*)\)?#', '$1', $admin_msg); $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.'); $content['NEWS']['ALL-NEWS']['SINGLE-NEWS'][$i]['NEWS_BODY'] = _('Keine Beschreibung vorhanden.');
} else { } else {
$content['NEWS']['ALL-NEWS']['SINGLE-NEWS'][$i]['NEWS_BODY'] = ExternModule::ExtFormatReady((string) $news_detail->body); $content['NEWS']['ALL-NEWS']['SINGLE-NEWS'][$i]['NEWS_BODY'] = ExternModule::ExtFormatReady((string) $news_detail->body);
...@@ -210,6 +209,7 @@ class ExternModuleTemplateNews extends ExternModule { ...@@ -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']]); $content['NEWS']['ALL-NEWS']['SINGLE-NEWS'][$i]['PERSONDETAIL-HREF'] = $this->elements['LinkInternTemplate']->createUrl(['link_args' => 'username=' . $temp['username']]);
} }
$i++; $i++;
} else if ($news_detail->date < $now) { } else if ($news_detail->date < $now) {
//archivierte News ausgeben //archivierte News ausgeben
if ($news_detail->chdate_uid){ if ($news_detail->chdate_uid){
...@@ -219,7 +219,7 @@ class ExternModuleTemplateNews extends ExternModule { ...@@ -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); $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."); $content['NEWS']['ALL-ARCHIV-NEWS']['SINGLE-ARCHIVE-NEWS'][$j]['ARCHIV_NEWS_BODY'] = _("Keine Beschreibung vorhanden.");
} else { } else {
$content['NEWS']['ALL-ARCHIV-NEWS']['SINGLE-ARCHIVE-NEWS'][$j]['ARCHIV_NEWS_BODY'] = ExternModule::ExtFormatReady((string) $news_detail->body); $content['NEWS']['ALL-ARCHIV-NEWS']['SINGLE-ARCHIVE-NEWS'][$j]['ARCHIV_NEWS_BODY'] = ExternModule::ExtFormatReady((string) $news_detail->body);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment