From cb2fe3f93c18b7ee84038069b7b291d2f90fc215 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Fri, 1 Jul 2022 09:30:54 +0200
Subject: [PATCH] * Mobile view: fix broken Security & Password menu

---
 api/src/Framework.php    | 4 ++--
 pixelegg/js/fw_mobile.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/Framework.php b/api/src/Framework.php
index 7238d20091..5e218fb709 100644
--- a/api/src/Framework.php
+++ b/api/src/Framework.php
@@ -1351,8 +1351,8 @@ abstract class Framework extends Framework\Extra
 						'id'    => 'password',
 						'name'  => 'preferences',
 						'title' => lang($types[$type]['title']),
-						'url'   => "javascript:egw.open_link('".
-							self::link('/index.php?menuaction=preferences.preferences_password.change')."','_blank','850x580')",
+						'url'   => 'javascript:egw.open_link("'.
+							self::link('/index.php?menuaction=preferences.preferences_password.change').'","_blank","850x580")',
 					));
 				}
 				break;
diff --git a/pixelegg/js/fw_mobile.js b/pixelegg/js/fw_mobile.js
index 2b4f83a287..5e25038d46 100644
--- a/pixelegg/js/fw_mobile.js
+++ b/pixelegg/js/fw_mobile.js
@@ -1128,7 +1128,7 @@ import {tapAndSwipe} from "../../api/js/tapandswipe";
 				if (matches.length > 1 && matches[2] !== undefined)
 				{
 					try {
-						args = JSON.parse('['+matches[2]+']');
+						args = JSON.parse('['+decodeURI(matches[2])+']');
 					}
 					catch(e) {	// deal with '-encloded strings (JSON allows only ")
 						args = JSON.parse('['+matches[2].replace(/','/g, '","').replace(/((^|,)'|'(,|$))/g, '$2"$3')+']');