fixes #3145

Closes #3145

Merge request studip/studip!2119

5 files changed, 0 insertions, 19 deletions

diff --git a/lib/classes/sidebar/LinkCloudWidget.php b/lib/classes/sidebar/LinkCloudWidget.php
index de4db55..b683aef 100644
--- a/lib/classes/sidebar/LinkCloudWidget.php
+++ b/lib/classes/sidebar/LinkCloudWidget.php
@@ -28,9 +28,6 @@ class LinkCloudWidget extends LinksWidget
      */
     public function &addLink($label, $url, $icon = null, $attributes = [], $index = null)
     {
-        // TODO: Remove this some versions after 5.0
-        $url = html_entity_decode($url);
-
         $content = sprintf(
             '<a href="%s" class="%s">%s</a>',
             htmlReady($url),
diff --git a/lib/classes/sidebar/LinkElement.php b/lib/classes/sidebar/LinkElement.php
index 8476c3e..f8d768b 100644
--- a/lib/classes/sidebar/LinkElement.php
+++ b/lib/classes/sidebar/LinkElement.php
@@ -76,9 +76,6 @@ class LinkElement extends WidgetElement implements ArrayAccess
     {
         parent::__construct();
 
-        // TODO: Remove this some versions after 5.0
-        $url = html_entity_decode($url);
-
         $this->label      = $label;
         $this->url        = $url;
         $this->attributes = $attributes;
diff --git a/lib/classes/sidebar/OptionsWidget.php b/lib/classes/sidebar/OptionsWidget.php
index 5f44c0c..5331e61 100644
--- a/lib/classes/sidebar/OptionsWidget.php
+++ b/lib/classes/sidebar/OptionsWidget.php
@@ -36,10 +36,6 @@ class OptionsWidget extends ListWidget
         ?string $toggle_url_off = null,
         array $attributes = []
     ): ButtonElement {
-        // TODO: Remove this some versions after 5.0
-        $toggle_url = html_entity_decode($toggle_url);
-        $toggle_url_off = isset($toggle_url_off) ? html_entity_decode($toggle_url_off) : null;
-
         $attributes['class'] = trim(($attributes['class'] ?? '') . ' options-checkbox options-' . ($state ? 'checked' : 'unchecked'));
 
         return $this->addElement(
@@ -67,9 +63,6 @@ class OptionsWidget extends ListWidget
         $checked = false,
         array $attributes = []
     ): ButtonElement {
-        // TODO: Remove this some versions after 5.0
-        $url = html_entity_decode($url);
-
         $attributes['class'] = trim(($attributes['class'] ?? '') . ' options-radio options-' . ($checked ? 'checked' : 'unchecked'));
 
         return $this->addElement(
diff --git a/lib/classes/sidebar/SearchWidget.php b/lib/classes/sidebar/SearchWidget.php
index 16d577b..5a42e94 100644
--- a/lib/classes/sidebar/SearchWidget.php
+++ b/lib/classes/sidebar/SearchWidget.php
@@ -27,9 +27,6 @@ class SearchWidget extends SidebarWidget
     {
         parent::__construct();
 
-        // TODO: Remove this some versions after 5.0
-        $url = html_entity_decode($url);
-
         $this->url      = $url ?: $_SERVER['REQUEST_URI'];
         $this->title    = _('Suche');
         $this->template = 'sidebar/search-widget';
diff --git a/lib/classes/sidebar/SelectWidget.php b/lib/classes/sidebar/SelectWidget.php
index 772004c..c33b2b6 100644
--- a/lib/classes/sidebar/SelectWidget.php
+++ b/lib/classes/sidebar/SelectWidget.php
@@ -39,9 +39,6 @@ class SelectWidget extends SidebarWidget
      */
     public function setUrl($url)
     {
-        // TODO: Remove this some versions after 5.0
-        $url = html_entity_decode($url);
-
         $query = parse_url($url, PHP_URL_QUERY);
         if ($query) {
             $url = str_replace('?' . $query , '', $url);