bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated mailgun, mailsystem, honeypot, googleanalitycs, features, content_taxonomy

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2019-05-13 17:55:28 +02:00
parent 2ffad14939
commit e08a2639c6
54 changed files with 1911 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sites/all/modules/contrib/admin/features/includes/features.field.inc
View File

@@ -274,7 +274,7 @@ function field_base_features_rebuild($module) {
// Create or update field.
if (isset($existing_fields[$field['field_name']])) {
$existing_field = $existing_fields[$field['field_name']];
$array_diff_result = drupal_array_diff_assoc_recursive($field + $existing_field, $existing_field);
$array_diff_result = features_array_diff_assoc_recursive($field + $existing_field, $existing_field);
if (!empty($array_diff_result)) {
try {
field_update_field($field);
@@ -319,7 +319,7 @@ function field_instance_features_rebuild($module) {
// Create or update field instance.
if (isset($existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']])) {
$existing_instance = $existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']];
if ($field_instance + $existing_instance !== $existing_instance) {
if ($field_instance + $existing_instance != $existing_instance) {
try {
field_update_instance($field_instance);
}
@@ -494,7 +494,7 @@ function field_features_rebuild($module) {
$field_config = $field['field_config'];
if (isset($existing_fields[$field_config['field_name']])) {
$existing_field = $existing_fields[$field_config['field_name']];
$array_diff_result = drupal_array_diff_assoc_recursive($field_config + $existing_field, $existing_field);
$array_diff_result = features_array_diff_assoc_recursive($field_config + $existing_field, $existing_field);
if (!empty($array_diff_result)) {
try {
field_update_field($field_config);
@@ -518,7 +518,7 @@ function field_features_rebuild($module) {
$field_instance = $field['field_instance'];
if (isset($existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']])) {
$existing_instance = $existing_instances[$field_instance['entity_type']][$field_instance['bundle']][$field_instance['field_name']];
if ($field_instance + $existing_instance !== $existing_instance) {
if ($field_instance + $existing_instance != $existing_instance) {
field_update_instance($field_instance);
}
}

10
sites/all/modules/contrib/admin/features/includes/features.image.inc
View File

@@ -73,11 +73,17 @@ function image_features_export_render($module_name, $data, $export = NULL) {
*/
function image_features_revert($module) {
if ($default_styles = features_get_default('image', $module)) {
foreach (array_keys($default_styles) as $default_style) {
if ($style = image_style_load($default_style)) {
foreach ($default_styles as $default_style_name => $default_style) {
if ($style = image_style_load($default_style_name)) {
if ($style['storage'] != IMAGE_STORAGE_DEFAULT) {
image_default_style_revert($style);
}
else {
// Verify that the loaded style still matches what's in code.
if ($default_style['effects'] !== $style['effects']) {
image_default_style_revert($style);
}
}
}
}
}

12
sites/all/modules/contrib/admin/features/includes/features.menu.inc
View File

@@ -420,8 +420,12 @@ function features_menu_link_load($identifier) {
* Returns a lowercase clean string with only letters, numbers and dashes
*/
function features_clean_title($str) {
return strtolower(preg_replace_callback('/(\s)|([^a-zA-Z\-0-9])/i', create_function(
'$matches',
'return $matches[1]?"-":"";'
), $str));
return strtolower(preg_replace_callback('/(\s)|([^a-zA-Z\-0-9])/i', '_features_clean_title', $str));
}
/**
* Callback function for preg_replace_callback() to clean a string.
*/
function _features_clean_title($matches) {
return $matches[1] ? '-' : '';
}