displayHorizNavBarMenu(); ?> diff --git a/interface/patient_file/report/patient_report.php b/interface/patient_file/report/patient_report.php index 0f5816de8..31f3a5a95 100644 --- a/interface/patient_file/report/patient_report.php +++ b/interface/patient_file/report/patient_report.php @@ -72,7 +72,7 @@ function show_date_fun(){

displayHorizNavBarMenu(); diff --git a/interface/patient_file/summary/demographics.php b/interface/patient_file/summary/demographics.php index 9b88ee2ff..fbd53db63 100644 --- a/interface/patient_file/summary/demographics.php +++ b/interface/patient_file/summary/demographics.php @@ -682,7 +682,7 @@ if (!empty($grparr['']['grp_size'])) {

displayHorizNavBarMenu(); diff --git a/interface/patient_file/summary/stats_full.php b/interface/patient_file/summary/stats_full.php index 66550176a..14e29eb0a 100644 --- a/interface/patient_file/summary/stats_full.php +++ b/interface/patient_file/summary/stats_full.php @@ -106,7 +106,7 @@ require_once("$include_root/expand_contract_js.php");//jQuery to provide expand/ - +

@@ -120,7 +120,7 @@ require_once("$include_root/expand_contract_js.php");//jQuery to provide expand/

displayHorizNavBarMenu(); diff --git a/interface/patient_file/transaction/transactions.php b/interface/patient_file/transaction/transactions.php index b5a10e6fc..19eff9d30 100644 --- a/interface/patient_file/transaction/transactions.php +++ b/interface/patient_file/transaction/transactions.php @@ -39,7 +39,7 @@ use OpenEMR\Menu\PatientMenuRole;

displayHorizNavBarMenu(); diff --git a/interface/reports/external_data.php b/interface/reports/external_data.php index d7df9736b..d8abbfa9e 100644 --- a/interface/reports/external_data.php +++ b/interface/reports/external_data.php @@ -152,7 +152,7 @@ $records2 = array();

displayHorizNavBarMenu(); diff --git a/interface/reports/pat_ledger.php b/interface/reports/pat_ledger.php index 76a8a02f9..6d2c8d68e 100644 --- a/interface/reports/pat_ledger.php +++ b/interface/reports/pat_ledger.php @@ -485,7 +485,7 @@ if ($_REQUEST['form_csvexport']) {

displayHorizNavBarMenu(); diff --git a/library/menu/src/PatientMenuRole.php b/library/menu/src/PatientMenuRole.php index 92cf98c14..56b588a5e 100644 --- a/library/menu/src/PatientMenuRole.php +++ b/library/menu/src/PatientMenuRole.php @@ -167,7 +167,7 @@ class PatientMenuRole extends MenuRole $menu_restrictions = $this->getMenu(); $li_id = 1; $str_top = << +

@@ -181,15 +181,17 @@ EOT; // flatten to only show children items foreach ($value->children as $children_key => $children_value) { $link = ($children_value->pid != "true") ? $children_value->url : $children_value->url . attr($pid); - $list = '

'; - $list .= ' ' . text($children_value->label) . ' '; + $class = isset($children_value->class) ? $children_value->class : ''; + $list = '

'; + $list .= ' ' . text($children_value->label) . ' '; $list .= '

'; } echo $list. "\r\n"; } else { $link = ($value->pid != "true") ? $value->url : $value->url . attr($pid); - $list = '

'; - $list .= ' ' . text($value->label) . ' '; + $class = isset($value->class) ? $value->class : ''; + $list = '

'; + $list .= ' ' . text($value->label) . ' '; $list .= '

'; } echo $list. "\r\n"; diff --git a/library/options.inc.php b/library/options.inc.php index a65fd5498..fb33b0706 100644 --- a/library/options.inc.php +++ b/library/options.inc.php @@ -2036,7 +2036,7 @@ function generate_display_field($frow, $currvalue) } // If match is not found in main and backup lists, return the key with exclamation mark if ($s == '') { - $s = nl2br(htmlspecialchars($currvalue, ENT_NOQUOTES)). + $s = nl2br(text(xl_list_label($currvalue))). ''; } } // simple text field -- 2.11.4.GIT