CRM-11925 - Remove uninstallPermissions()

upgradePermissions() addresses a superset of cases handled by uninstallPermissions().

diff --git a/CRM/Core/Permission/Base.php b/CRM/Core/Permission/Base.php
index 653ae99323d5ff021501e008f9ad90818971cf0d..3b3a40696765cf3c1ef09223d1fa8f42acc50b6d 100644 (file)
--- a/CRM/Core/Permission/Base.php
+++ b/CRM/Core/Permission/Base.php
@@ -163,13 +163,6 @@ class CRM_Core_Permission_Base {
     return FALSE;
   }
 
-  /**
-   * Remove all vestiges of permissions for the given module.
-   */
-  function uninstallPermissions($module) {
-    throw new CRM_Core_Exception("Unimplemented method: CRM_Core_Permission_*::uninstallPermissions");
-  }
-
   /**
    * Ensure that the CMS supports all the permissions defined by CiviCRM
    * and its extensions. If there are stale permissions, they should be

diff --git a/CRM/Core/Permission/Drupal.php b/CRM/Core/Permission/Drupal.php
index d091426067c62efc643a115a7c51615304385ec5..60c15c9097e8f636dc7dfc47ab8c96d8eda591b9 100644 (file)
--- a/CRM/Core/Permission/Drupal.php
+++ b/CRM/Core/Permission/Drupal.php
@@ -91,16 +91,6 @@ class CRM_Core_Permission_Drupal extends CRM_Core_Permission_DrupalBase{
     return TRUE;
   }
 
-  /**
-   * Remove all vestiges of permissions for the given module.
-   */
-  function uninstallPermissions($module) {
-    db_delete('role_permission')
-      ->condition('permission', "$module|%", 'LIKE')
-      ->condition('module', 'civicrm')
-      ->execute();
-  }
-
   /**
    * {@inheritdoc}
    */

diff --git a/CRM/Core/Permission/Drupal6.php b/CRM/Core/Permission/Drupal6.php
index 63d703b950685c7a079cc42260d1b4a2ba40a4e6..8c7d2c26fead03c55f6ceb0f50f735d0d899ea9f 100644 (file)
--- a/CRM/Core/Permission/Drupal6.php
+++ b/CRM/Core/Permission/Drupal6.php
@@ -156,15 +156,6 @@ class CRM_Core_Permission_Drupal6 extends CRM_Core_Permission_DrupalBase {
     return TRUE;
   }
 
-  /**
-   * Remove all vestiges of permissions for the given module.
-   *
-   * Does nothing in Drupal 6.
-   */
-  function uninstallPermissions($module) {
-    // D6 allows us to be really lazy... things get cleaned up when the admin form is next submitted...
-  }
-
   /**
    * {@inheritdoc}
    *

diff --git a/CRM/Extension/Manager/Module.php b/CRM/Extension/Manager/Module.php
index 7c2ce4768b64b97de5e9094439982065dece9636..89655eae71d94347f10fc6ce696739f25b736088 100644 (file)
--- a/CRM/Extension/Manager/Module.php
+++ b/CRM/Extension/Manager/Module.php
@@ -67,11 +67,6 @@ class CRM_Extension_Manager_Module extends CRM_Extension_Manager_Base {
   }
 
   public function onPostUninstall(CRM_Extension_Info $info) {
-    // Remove references to the module's permissions.
-    $config = CRM_Core_Config::singleton();
-    if ($config->userPermissionClass->isModulePermissionSupported()) {
-      $config->userPermissionClass->uninstallPermissions($info->file);
-    } // else: don't care because no permissions were installed!
   }
 
   public function onPreDisable(CRM_Extension_Info $info) {