diff --git a/advagg.module b/advagg.module index 3ca77aa..cc92ffb 100644 --- a/advagg.module +++ b/advagg.module @@ -703,7 +703,7 @@ function advagg_enabled() { */ function advagg_current_hooks_hash_array() { // Put all enabled hooks and settings into a big array. - $advagg_hash = array( + $aggregate_settings = array( 'variables' => array( 'advagg_gzip' => variable_get('advagg_gzip', ADVAGG_GZIP), 'is_https' => $GLOBALS['is_https'], @@ -714,9 +714,9 @@ function advagg_current_hooks_hash_array() { // Allow other modules to add in their own settings and hooks. // Call hook_advagg_current_hooks_hash_array_alter(). - drupal_alter('advagg_current_hooks_hash_array', $advagg_hash); + drupal_alter('advagg_current_hooks_hash_array', $aggregate_settings); - return $advagg_hash; + return $aggregate_settings; } /** @@ -730,16 +730,16 @@ function advagg_get_current_hooks_hash() { if (!isset($current_hash)) { // Get all advagg hooks and variables in use. - $current_hash_array = advagg_current_hooks_hash_array(); + $aggregate_settings = advagg_current_hooks_hash_array(); // Generate the hash. - $current_hash = drupal_hash_base64(serialize($current_hash_array)); + $current_hash = drupal_hash_base64(serialize($aggregate_settings)); // Save into variables for verification purposes later on if not found. $settings = advagg_get_hooks_hash_settings($current_hash); if (empty($settings) && lock_acquire(__FUNCTION__, 5)) { // Save new hash into - advagg_set_hooks_hash($current_hash, $current_hash_array); + advagg_set_hooks_hash($current_hash, $aggregate_settings); // Release lock lock_release(__FUNCTION__); @@ -951,7 +951,6 @@ function advagg_get_global_counter() { return $global_counter; } - /** * Cache clear callback for admin_menu/flush-cache/advagg. */ diff --git a/advagg_css_compress/advagg_css_compress.module b/advagg_css_compress/advagg_css_compress.module index 3f12be9..fa3c950 100644 --- a/advagg_css_compress/advagg_css_compress.module +++ b/advagg_css_compress/advagg_css_compress.module @@ -19,7 +19,7 @@ define('ADVAGG_CSS_COMPRESSOR', 2); /** * Implement hook_advagg_current_hooks_hash_array_alter. */ -function advagg_css_compress_advagg_current_hooks_hash_array_alter(&$advagg_hash) { - $advagg_hash['variables']['advagg_css_compressor'] = variable_get('advagg_css_compressor', ADVAGG_CSS_COMPRESSOR); - $advagg_hash['variables']['advagg_css_compress_agg_files'] = variable_get('advagg_css_compress_agg_files', ADVAGG_CSS_COMPRESS_AGG_FILES); +function advagg_css_compress_advagg_current_hooks_hash_array_alter(&$aggregate_settings) { + $aggregate_settings['variables']['advagg_css_compressor'] = variable_get('advagg_css_compressor', ADVAGG_CSS_COMPRESSOR); + $aggregate_settings['variables']['advagg_css_compress_agg_files'] = variable_get('advagg_css_compress_agg_files', ADVAGG_CSS_COMPRESS_AGG_FILES); } diff --git a/advagg_js_compress/advagg_js_compress.module b/advagg_js_compress/advagg_js_compress.module index f880b72..d74d7ed 100644 --- a/advagg_js_compress/advagg_js_compress.module +++ b/advagg_js_compress/advagg_js_compress.module @@ -56,9 +56,9 @@ function advagg_js_compress_menu() { /** * Implement hook_advagg_current_hooks_hash_array_alter. */ -function advagg_js_compress_advagg_current_hooks_hash_array_alter(&$advagg_hash) { - $advagg_hash['variables']['advagg_js_compressor'] = variable_get('advagg_js_compressor', ADVAGG_JS_COMPRESSOR); - $advagg_hash['variables']['advagg_js_compress_agg_files'] = variable_get('advagg_js_compress_agg_files', ADVAGG_CSS_COMPRESS_AGG_FILES); - $advagg_hash['variables']['advagg_js_compress_packer'] = variable_get('advagg_js_compress_packer', ADVAGG_JS_COMPRESS_PACKER); - $advagg_hash['variables']['advagg_js_max_compress_ratio'] = variable_get('advagg_js_max_compress_ratio', ADVAGG_JS_MAX_COMPRESS_RATIO); +function advagg_js_compress_advagg_current_hooks_hash_array_alter(&$aggregate_settings) { + $aggregate_settings['variables']['advagg_js_compressor'] = variable_get('advagg_js_compressor', ADVAGG_JS_COMPRESSOR); + $aggregate_settings['variables']['advagg_js_compress_agg_files'] = variable_get('advagg_js_compress_agg_files', ADVAGG_CSS_COMPRESS_AGG_FILES); + $aggregate_settings['variables']['advagg_js_compress_packer'] = variable_get('advagg_js_compress_packer', ADVAGG_JS_COMPRESS_PACKER); + $aggregate_settings['variables']['advagg_js_max_compress_ratio'] = variable_get('advagg_js_max_compress_ratio', ADVAGG_JS_MAX_COMPRESS_RATIO); }