Merge pull request #1769 from vivekarora/CRM-12060-4.4Patch

CRM-12060 - Support hook_civicrm_permissions on WordPress

CRM/ACL/Form/WordPress/Permissions.php

@@ -159,19 +159,7 @@ class CRM_ACL_Form_WordPress_Permissions extends CRM_Core_Form {
   static function getPermissionArray(){
     global $civicrm_root;
 
-    $permissions = CRM_Core_Permission::getCorePermissions();
-    $crmFolderDir = $civicrm_root . DIRECTORY_SEPARATOR . 'CRM';
-
-    $components = CRM_Core_Component::getComponentsFromFile($crmFolderDir);
-    foreach ($components as $comp) {
-      $perm = $comp->getPermissions();
-      if ($perm) {
-        $info = $comp->getInfo();
-        foreach ($perm as $p) {
-          $permissions[$p] = $info['translatedName'] . ': ' . $p;
-        }
-      }
-    }
+    $permissions = CRM_Core_Permission::basicPermissions();
 
     $perms_array = array();
     foreach ($permissions as $perm => $title) {

CRM/Core/Permission/WordPress.php

@@ -87,4 +87,17 @@ class CRM_Core_Permission_WordPress extends CRM_Core_Permission_Base {
     }
     return FALSE;
   }
+  /**
+   * {@inheritDoc}
+   */
+  public function isModulePermissionSupported() {
+  	return TRUE;
+  }
+  
+  /**
+   * {@inheritdoc}
+   */
+  function upgradePermissions($permissions) {
+  	return;
+  }
 }