From: Tim Otten Date: Mon, 29 Apr 2013 20:52:39 +0000 (-0700) Subject: CRM-12370 - Code style X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a038b93370dc2d2b2bd39208e9cd6fc0e5e7d9ea;p=civicrm-core.git CRM-12370 - Code style ---------------------------------------- * CRM-12370: CRM_Utils_Hook::requireCiviModules() assigns infinite weight to extensions http://issues.civicrm.org/jira/browse/CRM-12370 --- diff --git a/CRM/Utils/Hook/Drupal.php b/CRM/Utils/Hook/Drupal.php index e0c425c73b..b9e94c8c7d 100644 --- a/CRM/Utils/Hook/Drupal.php +++ b/CRM/Utils/Hook/Drupal.php @@ -56,8 +56,8 @@ class CRM_Utils_Hook_Drupal extends CRM_Utils_Hook { private $drupalModules = NULL; function invoke($numParams, - &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, - $fnSuffix + &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, + $fnSuffix ) { $this->buildModuleList(); @@ -89,15 +89,16 @@ class CRM_Utils_Hook_Drupal extends CRM_Utils_Hook { if ($this->drupalModules !== NULL) { foreach ($this->drupalModules as $moduleName) { $this->allModules[$moduleName] = $moduleName; - if ( $moduleName == 'civicrm' ) { + if ($moduleName == 'civicrm') { if (!empty($this->civiModules)) { - foreach( $this->civiModules as $civiModuleName) { + foreach ($this->civiModules as $civiModuleName) { $this->allModules[$civiModuleName] = $civiModuleName; } } } } - } else { + } + else { $this->allModules = (array) $this->civiModules; }