From ac973ac6be4bbc7744a7ffb1b8a19a09f3712b36 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 30 Aug 2024 07:14:22 +0000
Subject: [PATCH] add new method ContentBar::setInfoHTML() in favor of the now
deprecated ContentBar::setInfo(), fixes #4380
Closes #4380
Merge request studip/studip!3189
---
app/controllers/course/wiki.php | 6 +++---
app/controllers/oer/market.php | 2 +-
lib/classes/ContentBar.php | 15 +++++++++++++--
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index 647ab8aa2b6..91e43727434 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -128,7 +128,7 @@ class Course_WikiController extends AuthenticatedController
);
}
- $this->contentbar->setInfo(sprintf(
+ $this->contentbar->setInfoHTML(sprintf(
_('Version %1$s, geändert von %2$s <br> am %3$s'),
$this->page->versionnumber,
$author,
@@ -481,7 +481,7 @@ class Course_WikiController extends AuthenticatedController
$this->contentbar = ContentBar::get()
->setTOC(CoreWiki::getTOC($page))
->setIcon(Icon::create('wiki'))
- ->setInfo(_('Zuletzt gespeichert') .': '. '<span class="wiki-last-edited-' . $this->page->id . '"></span>');
+ ->setInfoHTML(_('Zuletzt gespeichert') .': '. '<span class="wiki-last-edited-' . $this->page->id . '"></span>');
}
public function apply_editing_action(WikiPage $page)
@@ -711,7 +711,7 @@ class Course_WikiController extends AuthenticatedController
$this->contentbar = ContentBar::get()
->setTOC(CoreWiki::getTOC($version->page))
->setIcon(Icon::create('wiki'))
- ->setInfo(sprintf(
+ ->setInfoHTML(sprintf(
_('Version %1$s vom %2$s'),
$version->versionnumber,
date('d.m.Y H:i:s', $version['mkdate'])
diff --git a/app/controllers/oer/market.php b/app/controllers/oer/market.php
index 5a58c97e03f..3f9dc89646b 100644
--- a/app/controllers/oer/market.php
+++ b/app/controllers/oer/market.php
@@ -330,7 +330,7 @@ class Oer_MarketController extends StudipController
$this->contentbar = ContentBar::get()
->setTOC(new TOCItem($this->material['name']))
- ->setInfo(htmlReady($infotext))
+ ->setInfoHTML(htmlReady($infotext))
->setIcon(Icon::create('oer-campus'));
}
diff --git a/lib/classes/ContentBar.php b/lib/classes/ContentBar.php
index 0e6a664dcb0..47d27ce637c 100644
--- a/lib/classes/ContentBar.php
+++ b/lib/classes/ContentBar.php
@@ -53,13 +53,24 @@ class ContentBar
}
/**
- * Provide some info text.
+ * Provide some info text as html.
+ *
* @param string $info
* @return ContentBar $this Return current instance for method chaining.
+ *
+ * @deprecated since Stud.IP 6.0, use ContentBar::setInfoHTML() instead
*/
public function setInfo(string $info)
{
- $this->infoText = $info;
+ return $this->setInfoHTML($info);
+ }
+
+ /**
+ * Provide some info as html.
+ */
+ public function setInfoHTML(string $html): static
+ {
+ $this->infoText = $html;
return $this;
}
--
GitLab