Merge pull request #4726 from atif-shaikh/CRM-5039

[civicrm-core.git] / CRM / Utils / Hook / Drupal6.php

diff --git a/CRM/Utils/Hook/Drupal6.php b/CRM/Utils/Hook/Drupal6.php
index 7cde491c40d7e9d0396aa80130db6bed0a338724..c405a1c19b3aa534838c91371428916d8560fca6 100644 (file)
--- a/CRM/Utils/Hook/Drupal6.php
+++ b/CRM/Utils/Hook/Drupal6.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,69 +28,10 @@
 /**
  *
  * @package CiviCRM_Hook
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id: $
  *
  */
-class CRM_Utils_Hook_Drupal6 extends CRM_Utils_Hook {
-
-  /**
-   * @var bool
-   */
-  private $isBuilt = FALSE;
-
-  /**
-   * @var array(string)
-   */
-  private $allModules = NULL;
-
-  /**
-   * @var array(string)
-   */
-  private $civiModules = NULL;
-
-  /**
-   * @var array(string)
-   */
-  private $drupalModules = NULL;
-
-  function invoke($numParams,
-    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
-    $fnSuffix
-  ) {
-
-    $this->buildModuleList();
-
-    return $this->runHooks($this->allModules, $fnSuffix,
-      $numParams, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6
-    );
-  }
-
-  /**
-   * Build the list of modules to be processed for hooks.
-   */
-  function buildModuleList() {
-    if ($this->isBuilt === FALSE) {
-      if ($this->drupalModules === NULL) {
-        if (function_exists('module_list')) {
-          // copied from user_module_invoke
-          $this->drupalModules = module_list();
-        }
-      }
-
-      if ($this->civiModules === NULL) {
-        $this->civiModules = array();
-        $this->requireCiviModules($this->civiModules);
-      }
-
-      $this->allModules = array_merge((array)$this->drupalModules, (array)$this->civiModules);
-      if ($this->drupalModules !== NULL && $this->civiModules !== NULL) {
-        // both CRM and CMS have bootstrapped, so this is the final list
-        $this->isBuilt = TRUE;
-      }
-    }
-  }
+class CRM_Utils_Hook_Drupal6 extends CRM_Utils_Hook_DrupalBase {
 }
 
-
-