Fixes for custom group query escaping

civicrm · Sep 4, 2017 · fb8f485 · fb8f485
1 parent 348d2f4
commit fb8f485
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
@@ -1031,7 +1031,6 @@ public static function &getGroupDetail($groupId = NULL, $searchable = NULL, &$ex
     );
 
     // create select
-    $select = "SELECT";
     $s = array();
     foreach ($tableData as $tableName => $tableColumn) {
       foreach ($tableColumn as $columnName) {

diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
@@ -186,10 +186,9 @@ public static function del($id) {
     $extends = array('event');
     $groupTree = CRM_Core_BAO_CustomGroup::getGroupDetail(NULL, NULL, $extends);
     foreach ($groupTree as $values) {
-      $query = "DELETE FROM %1 WHERE entity_id = %2";
+      $query = "DELETE FROM " . $values['table_name'] . " WHERE entity_id = %1";
       CRM_Core_DAO::executeQuery($query, array(
-        1 => array($values['table_name'], 'string'),
-        2 => array($id, 'integer'),
+        1 => array($id, 'Integer'),
       ));
     }