Skip to content

Commit

Permalink
fix(Reports) decode HTML entities
Browse files Browse the repository at this point in the history
  • Loading branch information
joebordes committed Feb 1, 2019
1 parent 8140022 commit d9a7bfa
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions modules/Reports/ReportUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ function getReportFieldValue($report, $picklistArray, $dbField, $valueArray, $fi
}

function report_getMoreInfoFromRequest($cbreporttype, $pmodule, $smodule, $pivotcolumns) {
global $adb;
global $adb, $default_charset;
if (isset($_REQUEST['cbreporttype']) && $_REQUEST['cbreporttype']=='external') {
if (isset($_REQUEST['adduserinfo']) && ($_REQUEST['adduserinfo'] == 'on' || $_REQUEST['adduserinfo'] == 1)) {
$aui = 1;
Expand All @@ -189,7 +189,7 @@ function report_getMoreInfoFromRequest($cbreporttype, $pmodule, $smodule, $pivot
));
$cbreporttype = 'external';
} elseif (isset($_REQUEST['cbreporttype']) && $_REQUEST['cbreporttype']=='directsql') {
$minfo = vtlib_purify($_REQUEST['directsqlcommand']);
$minfo = html_entity_decode(vtlib_purify($_REQUEST['directsqlcommand']), ENT_QUOTES, $default_charset);
$cbreporttype = 'directsql';
} elseif (isset($_REQUEST['cbreporttype']) && $_REQUEST['cbreporttype']=='crosstabsql') {
require_once 'include/adodb/pivottable.inc.php';
Expand Down

0 comments on commit d9a7bfa

Please sign in to comment.