From 2b0e7fcf2d57a6e20d9477b0d8680ad0b355a1bd Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Fri, 25 Feb 2022 23:48:29 -0800
Subject: [PATCH] minor fixes (#4965)

---
 sites/default/documents/custom_menus/Custom.json | 24 ++++++++++++++----------
 src/Common/Twig/TwigExtension.php                |  2 +-
 templates/patient/partials/testing.html.twig     |  2 --
 3 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 templates/patient/partials/testing.html.twig

diff --git a/sites/default/documents/custom_menus/Custom.json b/sites/default/documents/custom_menus/Custom.json
index c8ade20df..da9681645 100644
--- a/sites/default/documents/custom_menus/Custom.json
+++ b/sites/default/documents/custom_menus/Custom.json
@@ -16,6 +16,18 @@
     ]
   },
   {
+    "label": "Finder",
+    "menu_id": "fin0",
+    "target": "fin",
+    "url": "/interface/main/finder/dynamic_finder.php",
+    "children": [],
+    "requirement": 0,
+    "acl_req": [
+      "patients",
+      "demo"
+    ]
+  },
+  {
     "label": "Flow",
     "menu_id": "pfb0",
     "target": "flb",
@@ -32,7 +44,7 @@
     ]
   },
   {
-        "label": "Recall",
+        "label": "Recalls",
         "menu_id": "pfb0",
         "target": "rcb",
         "url": "/interface/main/messages/messages.php?go=Recalls",
@@ -424,7 +436,7 @@
       {
         "label": "Billing Manager",
         "menu_id": "bil0",
-        "target": "bil",
+        "target": "bil0",
         "url": "/interface/billing/billing_report.php",
         "children": [],
         "requirement": 0,
@@ -1282,14 +1294,6 @@
           "admin",
           "super"
         ]
-      },
-      {
-        "label": "About",
-        "menu_id": "abo0",
-        "target": "msc",
-        "url": "/interface/main/about_page.php",
-        "children": [],
-        "requirement": 0
       }
     ],
     "requirement": 0,
diff --git a/src/Common/Twig/TwigExtension.php b/src/Common/Twig/TwigExtension.php
index e15f346ca..96f5b4bac 100644
--- a/src/Common/Twig/TwigExtension.php
+++ b/src/Common/Twig/TwigExtension.php
@@ -118,7 +118,7 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
             new TwigFunction(
                 'csrfToken',
                 function ($subject = 'default') {
-                    return sprintf('<input type="hidden" name="_token" value="%s">', CsrfUtils::collectCsrfToken($subject));
+                    return sprintf('<input type="hidden" name="_token" value="%s">', attr(CsrfUtils::collectCsrfToken($subject)));
                 }
             ),
         ];
diff --git a/templates/patient/partials/testing.html.twig b/templates/patient/partials/testing.html.twig
deleted file mode 100644
index 4b578a732..000000000
--- a/templates/patient/partials/testing.html.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-{# THIS IS FOR POC ONLY - REMOVE BEFORE SUBMITTING PR #}
-{{ var1 }}
-- 
2.11.4.GIT