summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValery L. Lourie2012-12-23 06:39:52 (GMT)
committer Valery L. Lourie2012-12-23 06:39:52 (GMT)
commit892c6c875beea21b3addd4c53297d3539ae09171 (patch)
treec6ce204628fcd94cf5bf0299062ba1fd8f6db4c7
parent06f29935d7559abaf5a4b84aa419da2bb129b73b (diff)
Issue #1301552 by valthebald: fixed features staying overriden7.x-2.6-rc17.x-2.6-CHRISTMAS7.x-2.6
-rw-r--r--metatags_quick.module4
-rw-r--r--metatags_quick_extra.admin.inc2
2 files changed, 4 insertions, 2 deletions
diff --git a/metatags_quick.module b/metatags_quick.module
index daae406..54d5621 100644
--- a/metatags_quick.module
+++ b/metatags_quick.module
@@ -140,7 +140,9 @@ function metatags_quick_field_access($op, $field, $entity_type, $entity, $accoun
function metatags_quick_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
foreach ($items as $lang => $lang_item) {
foreach ($lang_item as $i => $final_item) {
- $items[$lang][$i]['meta_name'] = $field['settings']['meta_name'];
+ if (!isset($items[$lang][$i]['meta_name'])) {
+ $items[$lang][$i]['meta_name'] = $field['settings']['meta_name'];
+ }
}
}
}
diff --git a/metatags_quick_extra.admin.inc b/metatags_quick_extra.admin.inc
index 202b0aa..4440d4c 100644
--- a/metatags_quick_extra.admin.inc
+++ b/metatags_quick_extra.admin.inc
@@ -16,7 +16,7 @@ function metatags_quick_admin_auto_settings($form,$form_state) {
// construct the options array for all content types
$type_names = node_type_get_names();
-
+
// facility to select content types for auto-tagging. Has AJAX behavior.
$form['applicable_content_types'] = array(
'#type' => 'checkboxes',