From 95c80eb4a5502e7e6e24aca326f366e150cbf9e2 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Fri, 21 Sep 2018 15:42:47 +0530 Subject: [PATCH 1/3] fix(dependencies): locked down bleach to 2.1.4 bleach.clean used in html_utils depends on the latest version of bleach Signed-off-by: Ameya Shenoy --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bd676a94c4..4864ec8b1b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ email_reply_parser click num2words==0.5.5 watchdog==0.8.0 -bleach +bleach==2.1.4 bleach-whitelist Pillow beautifulsoup4 From dc983f49c620f9e89aa7edcfec525a93d8b9b27f Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Fri, 21 Sep 2018 15:44:33 +0530 Subject: [PATCH 2/3] fix(patch): refactor social login keys escaped special characters in query Signed-off-by: Ameya Shenoy --- frappe/patches/v10_0/refactor_social_login_keys.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches/v10_0/refactor_social_login_keys.py b/frappe/patches/v10_0/refactor_social_login_keys.py index 01c0c16490..d896932953 100644 --- a/frappe/patches/v10_0/refactor_social_login_keys.py +++ b/frappe/patches/v10_0/refactor_social_login_keys.py @@ -111,7 +111,7 @@ def insert_user_social_login(user, modified_by, provider, idx, userid=None, user VALUES ({values}) """.format( source_cols = "`" + "`, `".join(source_cols) + "`", - values= "'" + "', '".join(values) + "'" + values= "'" + "', '".join([frappe.db.escape(d) for d in values]) + "'" ) frappe.db.sql(query) From ea082ce8a3315d7900e6a4d83a4285133e8f913f Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Fri, 21 Sep 2018 10:59:46 +0000 Subject: [PATCH 3/3] bumped to version 11.0.2 --- frappe/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 73926e1b96..26adacd0f1 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe" app_license = "MIT" develop_version = '11.x.x-develop' -staging_version = '11.0.1' +staging_version = '11.0.2' app_email = "info@frappe.io"