From fd7df64e872982ac9f2fb72f4b2eabe43363ed10 Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Tue, 30 May 2017 20:24:48 -0700
Subject: [PATCH] couple more changes related to prior commit

---
 controllers/C_DocumentCategory.class.php        | 1 +
 templates/document_categories/general_list.html | 2 +-
 templates/documents/general_queue.html          | 2 +-
 templates/insurance_numbers/general_edit.html   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/controllers/C_DocumentCategory.class.php b/controllers/C_DocumentCategory.class.php
index 86cc5f347..fcb1439bc 100644
--- a/controllers/C_DocumentCategory.class.php
+++ b/controllers/C_DocumentCategory.class.php
@@ -16,6 +16,7 @@ class C_DocumentCategory extends Controller {
 		$this->assign("CURRENT_ACTION", $GLOBALS['webroot']."/controller.php?" . "practice_settings&document_category&");
 		$this->link = $GLOBALS['webroot']."/controller.php?" . "document_category&";
 		$this->assign("STYLE", $GLOBALS['style']);
+		$this->assign("V_JS_INCLUDES", $GLOBALS['v_js_includes']);
 
 		$t = new CategoryTree(1);
 		//print_r($t->tree);
diff --git a/templates/document_categories/general_list.html b/templates/document_categories/general_list.html
index 53af789e7..f029b6846 100644
--- a/templates/document_categories/general_list.html
+++ b/templates/document_categories/general_list.html
@@ -17,7 +17,7 @@
 var deleteLabel="{xl t="Delete"|escape:'html'}";
 var editLabel="{xl t="Edit"|escape:'html'}";
 </script>
-<script type="text/javascript" src="{$WEBROOT}/library/js/CategoryTreeMenu.js?v={php}echo $GLOBALS['v_js_includes'];{/php}"></script>
+<script type="text/javascript" src="{$WEBROOT}/library/js/CategoryTreeMenu.js?v={$V_JS_INCLUDES}"></script>
 <table>
 	<tr>
 		<td height="20" valign="top">{xl t="Document Categories"|escape:'html'}</td>
diff --git a/templates/documents/general_queue.html b/templates/documents/general_queue.html
index fd814c11c..f469f1035 100644
--- a/templates/documents/general_queue.html
+++ b/templates/documents/general_queue.html
@@ -23,7 +23,7 @@
 	<tr>
 		<td><input type="checkbox" name="files[{$file.document_id}][active]" value="1" {if is_numeric($file.patient_id)}checked{/if}></td>
 
-		<td><a href="{$file.web_path}" onclick="top.restoreSession()">{$file.filename}</a><input type="hidden" name="files[{$file.document_id|escape:'html'}][name]" value="{$file.filename|escape:'html'}"></td>
+		<td><a href="{$file.web_path}" onclick="top.restoreSession()">{$file.filename|escape:'html'}</a><input type="hidden" name="files[{$file.document_id|escape:'html'}][name]" value="{$file.filename|escape:'html'}"></td>
 
 		<td>{$file.mtime|escape:'html'}</td>
 
diff --git a/templates/insurance_numbers/general_edit.html b/templates/insurance_numbers/general_edit.html
index c8fe8e78b..964dbf62c 100644
--- a/templates/insurance_numbers/general_edit.html
+++ b/templates/insurance_numbers/general_edit.html
@@ -36,7 +36,7 @@
 {/foreach}
 
 <tr> <td style="border-style:none;" colspan="5">
-    <a href="{$CURRENT_ACTION}action=edit&id=&provider_id={$provider->get_id()}&showform=true"
+    <a href="{$CURRENT_ACTION}action=edit&id=&provider_id={$provider->get_id()|escape:'html'}&showform=true"
         class="btn btn-default btn-add" onclick="top.restoreSession()">
         <span>{xl t='Add New'|escape:'html'}
     </a>
-- 
2.11.4.GIT