Skip to content
Snippets Groups Projects
Commit cec90ca4 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

fixes #3145

Closes #3145

Merge request studip/studip!2119
parent 89e11724
No related branches found
No related tags found
No related merge requests found
...@@ -28,9 +28,6 @@ class LinkCloudWidget extends LinksWidget ...@@ -28,9 +28,6 @@ class LinkCloudWidget extends LinksWidget
*/ */
public function &addLink($label, $url, $icon = null, $attributes = [], $index = null) 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( $content = sprintf(
'<a href="%s" class="%s">%s</a>', '<a href="%s" class="%s">%s</a>',
htmlReady($url), htmlReady($url),
......
...@@ -76,9 +76,6 @@ class LinkElement extends WidgetElement implements ArrayAccess ...@@ -76,9 +76,6 @@ class LinkElement extends WidgetElement implements ArrayAccess
{ {
parent::__construct(); parent::__construct();
// TODO: Remove this some versions after 5.0
$url = html_entity_decode($url);
$this->label = $label; $this->label = $label;
$this->url = $url; $this->url = $url;
$this->attributes = $attributes; $this->attributes = $attributes;
......
...@@ -36,10 +36,6 @@ class OptionsWidget extends ListWidget ...@@ -36,10 +36,6 @@ class OptionsWidget extends ListWidget
?string $toggle_url_off = null, ?string $toggle_url_off = null,
array $attributes = [] array $attributes = []
): ButtonElement { ): 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')); $attributes['class'] = trim(($attributes['class'] ?? '') . ' options-checkbox options-' . ($state ? 'checked' : 'unchecked'));
return $this->addElement( return $this->addElement(
...@@ -67,9 +63,6 @@ class OptionsWidget extends ListWidget ...@@ -67,9 +63,6 @@ class OptionsWidget extends ListWidget
$checked = false, $checked = false,
array $attributes = [] array $attributes = []
): ButtonElement { ): 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')); $attributes['class'] = trim(($attributes['class'] ?? '') . ' options-radio options-' . ($checked ? 'checked' : 'unchecked'));
return $this->addElement( return $this->addElement(
......
...@@ -27,9 +27,6 @@ class SearchWidget extends SidebarWidget ...@@ -27,9 +27,6 @@ class SearchWidget extends SidebarWidget
{ {
parent::__construct(); parent::__construct();
// TODO: Remove this some versions after 5.0
$url = html_entity_decode($url);
$this->url = $url ?: $_SERVER['REQUEST_URI']; $this->url = $url ?: $_SERVER['REQUEST_URI'];
$this->title = _('Suche'); $this->title = _('Suche');
$this->template = 'sidebar/search-widget'; $this->template = 'sidebar/search-widget';
......
...@@ -39,9 +39,6 @@ class SelectWidget extends SidebarWidget ...@@ -39,9 +39,6 @@ class SelectWidget extends SidebarWidget
*/ */
public function setUrl($url) public function setUrl($url)
{ {
// TODO: Remove this some versions after 5.0
$url = html_entity_decode($url);
$query = parse_url($url, PHP_URL_QUERY); $query = parse_url($url, PHP_URL_QUERY);
if ($query) { if ($query) {
$url = str_replace('?' . $query , '', $url); $url = str_replace('?' . $query , '', $url);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment