updated node_export, mimemail, menu_attributes

This commit is contained in:
Bachir Soussi Chiadmi
2016-11-05 17:09:40 +01:00
parent 2b028cf376
commit fdefc824d8
50 changed files with 1598 additions and 1555 deletions

View File

@@ -6,9 +6,9 @@ configure = admin/structure/menu/settings
files[] = menu_attributes.test
; Information added by Drupal.org packaging script on 2015-01-02
version = "7.x-1.0-rc3+1-dev"
; Information added by Drupal.org packaging script on 2016-02-15
version = "7.x-1.0"
core = "7.x"
project = "menu_attributes"
datestamp = "1420231982"
datestamp = "1455568740"

View File

@@ -16,7 +16,7 @@ function menu_attributes_permission() {
return array(
'administer menu attributes' => array(
'title' => t('Administer menu attributes'),
'description' => t('Administer menu attributes.'),
'description' => t('Administer menu attributes configuration.'),
),
);
}
@@ -255,6 +255,9 @@ function _menu_attributes_form_alter(array &$form, array $item = array(), array
$has_visible_children = (bool) element_get_visible_children($form['options']['attributes']);
$user_has_access = user_access('administer menu attributes');
$form['options']['attributes']['#access'] = ($has_visible_children && $user_has_access);
$has_visible_children = (bool) element_get_visible_children($form['options']['item_attributes']);
$form['options']['item_attributes']['#access'] = ($has_visible_children && $user_has_access);
}
/**
@@ -337,7 +340,7 @@ function menu_attributes_preprocess_menu_link(&$variables) {
// Class get's special treatment, as it's an array and it should not
// replace existing values.
if ($attribute == 'class') {
$value = explode(' ', $value);
$value = !is_array($value) ? explode(' ', $value) : $value;
if (isset($attributes[$attribute])) {
$value = array_merge($attributes[$attribute], $value);
}