From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 23 Nov 2016 02:46:33 +0000 (+1100)
Subject: CRM-19641 Further Fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=83b4ef1916f304de264d321587b99d51007d7210;p=civicrm-core.git

CRM-19641 Further Fix
---

diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php
index 1e3abee48e..96fc0fc172 100644
--- a/CRM/Case/XMLProcessor/Report.php
+++ b/CRM/Case/XMLProcessor/Report.php
@@ -691,10 +691,11 @@ SELECT label, value
 
       foreach ($sql as $tableName => $values) {
         $columnNames = implode(',', $values);
-        $tableName = CRM_Utils_Type::escape($tableName, 'MysqlColumnNameOrAlias');
+        $title = CRM_Core_DAO::escapeString($groupTitle[$tableName]);
+        $mysqlTableName = CRM_Utils_Type::escape($tableName, 'MysqlColumnNameOrAlias');
         $sql[$tableName] = "
-SELECT '" . CRM_Core_DAO::escapeString($groupTitle[$tableName]) . "' as groupTitle, $columnNames
-FROM   $tableName
+SELECT '" . $title . "' as groupTitle, $columnNames
+FROM   $mysqlTableName
 WHERE  entity_id = %1
 ";
       }