Merge pull request #9433 from seamuslee001/CRM-19641-b

CRM-19641 Further Fix
civicrm · Nov 23, 2016 · 434771c · 434771c
2 parents aab2552 + 4e2be64
commit 434771c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php
@@ -688,10 +688,11 @@ public function getActivityTypeCustomSQL($activityTypeID, $dateFormat = NULL) {
 
       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
 ";
       }