Standardise handling of administer Multiple Organizations

civicrm · Mar 12, 2021 · 6174513 · 6174513
1 parent 7b11eac
commit 6174513
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php
@@ -588,13 +588,8 @@ public static function basicPermissions($all = FALSE, $descriptions = FALSE) {
    */
   public static function assembleBasicPermissions($all = FALSE, $descriptions = FALSE) {
     $config = CRM_Core_Config::singleton();
-    $prefix = ts('CiviCRM') . ': ';
     $permissions = self::getCorePermissions();
 
-    if (self::isMultisiteEnabled()) {
-      $permissions['administer Multiple Organizations'] = [$prefix . ts('administer Multiple Organizations')];
-    }
-
     if (!$descriptions) {
       foreach ($permissions as $name => $attr) {
         $permissions[$name] = array_shift($attr);
@@ -909,6 +904,12 @@ public static function getCorePermissions() {
         'description' => ts('Permit altering all restricted data options'),
       ],
     ];
+    if (self::isMultisiteEnabled()) {
+      $permissions['administer Multiple Organizations'] = [
+        'label' => $prefix . ts('administer Multiple Organizations'),
+        'description' => ts('Administer multiple organizations. In practice this allows editing the group organization link')
+      ];
+    }
     foreach (self::getImpliedPermissions() as $name => $includes) {
       foreach ($includes as $permission) {
         $permissions[$name][] = $permissions[$permission];