From 1552a5f2f29398abc757f40fec55234c9707aa74 Mon Sep 17 00:00:00 2001
From: akarmanov <alexandrk_@hotmail.com>
Date: Wed, 17 Jan 2024 09:14:06 -0500
Subject: [PATCH] BACKLOG-22157 Check both default and per site config for dry
 run

---
 .../richtext/configuration/RichTextConfiguration.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jahia/modules/richtext/configuration/RichTextConfiguration.java b/src/main/java/org/jahia/modules/richtext/configuration/RichTextConfiguration.java
index e4be084..d8804cf 100644
--- a/src/main/java/org/jahia/modules/richtext/configuration/RichTextConfiguration.java
+++ b/src/main/java/org/jahia/modules/richtext/configuration/RichTextConfiguration.java
@@ -139,13 +139,15 @@ public boolean configExists(String siteKey) {
 
     @Override
     public boolean htmlSanitizerDryRun(String siteKey) {
-        if (configExists(siteKey)) {
-            JSONObject f = configs.get(siteKeyToPid.get(siteKey)).getJSONObject("htmlFiltering");
+        JSONObject f = new JSONObject();
 
-            return f.has("htmlSanitizerDryRun") && f.getBoolean("htmlSanitizerDryRun");
+        if (configExists(siteKey)) {
+            f = configs.get(siteKeyToPid.get(siteKey)).getJSONObject("htmlFiltering");
+        } else if ((configExists(DEFAULT_POLICY_KEY))) {
+            f = configs.get(siteKeyToPid.get(DEFAULT_POLICY_KEY)).getJSONObject("htmlFiltering");
         }
 
-        return false;
+        return f.has("htmlSanitizerDryRun") && f.getBoolean("htmlSanitizerDryRun");
     }
 
     private void mergeJsonObject(JSONObject target, JSONObject source) {