Fix encoding for a few popup links (joomla#43874)

Fedik · web-flow · commit e84b2bbbc78e · 2024-08-10T11:40:10.000+02:00
diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php
@@ -43,7 +43,7 @@
         Text::_('COM_FINDER_CONTENT_PLUGIN'),
         [
             'class'                 => 'alert-link',
-            'data-joomla-dialog'    => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
+            'data-joomla-dialog'    => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
             'data-checkin-url'      => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $this->finderPluginId),
             'data-close-on-message' => '',
             'data-reload-on-close'  => '',
diff --git a/administrator/components/com_finder/tmpl/index/emptystate.php b/administrator/components/com_finder/tmpl/index/emptystate.php
@@ -47,7 +47,7 @@
         Text::_('COM_FINDER_CONTENT_PLUGIN'),
         [
             'class'                 => 'alert-link',
-            'data-joomla-dialog'    => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
+            'data-joomla-dialog'    => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
             'data-checkin-url'      => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $this->finderPluginId),
             'data-close-on-message' => '',
             'data-reload-on-close'  => '',
diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php
@@ -51,7 +51,7 @@
         Text::_('COM_REDIRECT_SYSTEM_PLUGIN'),
         [
             'class'                 => 'alert-link',
-            'data-joomla-dialog'    => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
+            'data-joomla-dialog'    => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
             'data-checkin-url'      => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $redirectPluginId),
             'data-close-on-message' => '',
             'data-reload-on-close'  => '',
diff --git a/administrator/components/com_redirect/tmpl/links/emptystate.php b/administrator/components/com_redirect/tmpl/links/emptystate.php
@@ -65,7 +65,7 @@
         Text::_('COM_REDIRECT_SYSTEM_PLUGIN'),
         [
             'class'                 => 'alert-link',
-            'data-joomla-dialog'    => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
+            'data-joomla-dialog'    => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
             'data-checkin-url'      => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $redirectPluginId),
             'data-close-on-message' => '',
             'data-reload-on-close'  => '',

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`Text::_('COM_FINDER_CONTENT_PLUGIN'),`
`44`	`44`	`[`
`45`	`45`	`'class' => 'alert-link',`
`46`		`- 'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),`
	`46`	`+ 'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE)),`
`47`	`47`	`'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $this->finderPluginId),`
`48`	`48`	`'data-close-on-message' => '',`
`49`	`49`	`'data-reload-on-close' => '',`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`Text::_('COM_FINDER_CONTENT_PLUGIN'),`
`48`	`48`	`[`
`49`	`49`	`'class' => 'alert-link',`
`50`		`- 'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),`
	`50`	`+ 'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE)),`
`51`	`51`	`'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $this->finderPluginId),`
`52`	`52`	`'data-close-on-message' => '',`
`53`	`53`	`'data-reload-on-close' => '',`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`Text::_('COM_REDIRECT_SYSTEM_PLUGIN'),`
`52`	`52`	`[`
`53`	`53`	`'class' => 'alert-link',`
`54`		`- 'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),`
	`54`	`+ 'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE)),`
`55`	`55`	`'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $redirectPluginId),`
`56`	`56`	`'data-close-on-message' => '',`
`57`	`57`	`'data-reload-on-close' => '',`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`Text::_('COM_REDIRECT_SYSTEM_PLUGIN'),`
`66`	`66`	`[`
`67`	`67`	`'class' => 'alert-link',`
`68`		`- 'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),`
	`68`	`+ 'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE)),`
`69`	`69`	`'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $redirectPluginId),`
`70`	`70`	`'data-close-on-message' => '',`
`71`	`71`	`'data-reload-on-close' => '',`