Merge pull request civicrm#264 from agh1/permission-descriptions

davecivicrm · davecivicrm · commit 4c44763f61f4 · 2015-03-31T13:12:35.000-07:00
CRM-16201 - Display permission descriptions
diff --git a/civicrm.module b/civicrm.module
@@ -60,11 +60,16 @@ function civicrm_permission() {
 
   CRM_Core_Config::singleton();
 
-  $permissions = CRM_Core_Permission::basicPermissions();
+  $permissions = CRM_Core_Permission::basicPermissions(FALSE, TRUE);
   $perms_array = array();
-  foreach ($permissions as $perm => $title) {
+  foreach ($permissions as $perm => $attr) {
+    $title = array_shift($attr);
+    $description = array_shift($attr);
     //order matters here, but we deal with that later
     $perms_array[$perm] = array('title' => $title);
+    if ($description) {
+      $perms_array[$perm]['description'] = $description;
+    }
   }
   return $perms_array;
 }
