Reinstate missing rows

CRM/ACL/Form/WordPress/Permissions.php

@@ -84,20 +84,28 @@ public function buildQuickForm() {
       }
     }
 
+    // build table rows by merging role perms
+    $rows = array();
+    foreach ($rolePerms as $role => $perms) {
+      foreach ($perms as $name => $title) {
+        $rows[$name] = $title;
+      }
+    }
+
     // Build array keyed by permission
     $table = array();
-    foreach ($descArray as $perm => $desc) {
+    foreach ($rows AS $perm => $label) {
 
-      // Init row with permission description
+      // Init row with permission label
       $table[$perm] = array(
-        'desc' => $desc,
+        'label' => $label,
         'roles' => array(),
       );
 
-      // Add permission label and role names
+      // Add permission description and role names
       foreach ($roles as $key => $label) {
-        if (isset($rolePerms[$key][$perm])) {
-          $table[$perm]['label'] = $rolePerms[$key][$perm];
+        if (isset($descArray[$perm])) {
+          $table[$perm]['desc'] = $descArray[$perm];
         }
         $table[$perm]['roles'][] = $key;
       }