towards drupal 8 - move common permissionDenied fn

diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
index da839d9f935af0f1dbb0f3b4ff1d5cc551bd167e..c540bd4b7896cf3102058f3f8df2bb6f981a3efd 100644 (file)
--- a/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@ -51,7 +51,7 @@ class CRM_Utils_System_Drupal extends CRM_Utils_System_DrupalBase {
    */
   function createUser(&$params, $mail) {
     $form_state = form_state_defaults();
-    
+
     $form_state['input'] = array(
       'name' => $params['cms_name'],
       'mail' => $params[$mail],
@@ -581,10 +581,6 @@ AND    u.status = 1
     drupal_set_message($message);
   }
 
-  function permissionDenied() {
-    drupal_access_denied();
-  }
-
   function logout() {
     module_load_include('inc', 'user', 'user.pages');
     return user_logout();

diff --git a/CRM/Utils/System/Drupal6.php b/CRM/Utils/System/Drupal6.php
index 7bb0dad6bee7937eac0112a3ca5991cfd6229c29..83f7ec179fa63e7b6bbbde3eec6cfd978244220c 100644 (file)
--- a/CRM/Utils/System/Drupal6.php
+++ b/CRM/Utils/System/Drupal6.php
@@ -555,10 +555,6 @@ class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase {
     drupal_set_message($message);
   }
 
-  function permissionDenied() {
-    drupal_access_denied();
-  }
-
   function logout() {
     module_load_include('inc', 'user', 'user.pages');
     return user_logout();

diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
index 169d6f4cb4046773b866d718a034005906ef0356..0bd0ce203ee67fdef48cdd9f6aeda04dc7fab928 100644 (file)
--- a/CRM/Utils/System/DrupalBase.php
+++ b/CRM/Utils/System/DrupalBase.php
@@ -227,4 +227,11 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
     global $user;
     return $this->getUniqueIdentifierFromUserObject($user);
   }
+
+  /**
+   * Action to take when access is not permitted
+   */
+  function permissionDenied() {
+    drupal_access_denied();
+  }
 }