Merge pull request #10540 from colemanw/CRM-20091

[civicrm-core.git] / CRM / Core / Permission.php

diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php
index 826d70a2847dbbefc8258a674e6ea943fd9cbce3..0b9979d599f0aa50d1048c9050cdcb0c70da68f8 100644 (file)
--- a/CRM/Core/Permission.php
+++ b/CRM/Core/Permission.php
@@ -1016,6 +1016,12 @@ class CRM_Core_Permission {
         'access CiviCRM',
         'delete in CiviCase',
       ),
+      'restore' => array(
+        'administer CiviCase',
+      ),
+      'merge' => array(
+        'administer CiviCase',
+      ),
       'default' => array(
         // At minimum the user needs one of the following. Finer-grained access is controlled by CRM_Case_BAO_Case::addSelectWhereClause
         array('access my cases and activities', 'access all cases and activities'),
@@ -1126,6 +1132,12 @@ class CRM_Core_Permission {
     // Loc block is only used for events
     $permissions['loc_block'] = $permissions['event'];
 
+    $permissions['state_province'] = array(
+      'get' => array(
+        'access CiviCRM',
+      ),
+    );
+
     // Price sets are shared by several components, user needs access to at least one of them
     $permissions['price_set'] = array(
       'default' => array(