CRM-17889 -- New Mailing page hangs on multilingual setup

diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index 4fcf26f6e10d9e2a471570e8f41f480f62f0dafa..330bb9c8d95f8a3d3e0d2ed609bb93338dac31d9 100644 (file)
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -3139,8 +3139,8 @@ AND        m.id = %1
    */
   public static function mailingGroupEntityTables() {
     $tables = array(
-      'civicrm_group',
-      'civicrm_mailing',
+      CRM_Contact_BAO_Group::getTableName(),
+      CRM_Mailing_BAO_Mailing::getTableName(),
     );
     // Identical keys & values
     return array_combine($tables, $tables);