diff --git a/API.txt b/API.txt
index 9f09029..46cbc26 100644
--- a/API.txt
+++ b/API.txt
@@ -115,6 +115,7 @@ API version 1.14
the generation of a description field for the current page.
* New constant NODEWORDS_TYPE_BLOG for custom handling of the core blog
module's main page.
+* Changed nodewords_og_form_default() so it also passes in the $options array.
Current meta tag weights, grouped by topic:
diff --git a/nodewords_basic/nodewords_basic.module b/nodewords_basic/nodewords_basic.module
index 790f868..e73fbc2 100644
--- a/nodewords_basic/nodewords_basic.module
+++ b/nodewords_basic/nodewords_basic.module
@@ -226,6 +226,19 @@ function nodewords_basic_title_form(&$form, $content, $options) {
'#default_value' => empty($content['divider']) ? ' | ' : $content['divider'],
'#maxlength' => variable_get('nodewords_max_size', 350),
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['page_title']['value'])) {
+ $default = $options['default']['page_title']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['page_title']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -265,10 +278,23 @@ function nodewords_basic_abstract_form(&$form, $content, $options) {
'#type' => 'textfield',
'#title' => t('Abstract'),
'#description' => t('Enter a short abstract. Typically it is one sentence, with a maximum of %count characters. It should not contain any HTML tags or other formatting.', array('%count' => variable_get('nodewords_max_size', 350))),
- '#default_value' => empty($content['value']) ? (!empty($options['default']['abstract']['value']) ? $options['default']['abstract']['value'] : '') : $content['value'],
+ '#default_value' => empty($content['value']) ? '' : $content['value'],
'#size' => 60,
'#maxlength' => variable_get('nodewords_max_size', 350),
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['abstract']['value'])) {
+ $default = $options['default']['abstract']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['abstract']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -349,10 +375,23 @@ function nodewords_basic_copyright_form(&$form, $content, $options) {
'#type' => 'textfield',
'#title' => t('Copyright'),
'#description' => t('Enter a short copyright statement.'),
- '#default_value' => empty($content['value']) ? (!empty($options['default']['copyright']['value']) ? $options['default']['copyright']['value'] : '') : $content['value'],
+ '#default_value' => empty($content['value']) ? '' : $content['value'],
'#size' => 60,
'#maxlength' => variable_get('nodewords_max_size', 350),
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['copyright']['value'])) {
+ $default = $options['default']['copyright']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['copyright']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -375,12 +414,11 @@ function nodewords_basic_description_form(&$form, $content, $options) {
'#tree' => TRUE,
'#weight' => -189,
);
-
$form['description']['value'] = array(
'#type' => 'textarea',
'#title' => t('Description'),
'#description' => t('Enter a one or two sentence description of your page. Limit the description to about 20 words with a maximum of %count characters. It should not contain any HTML tags or other formatting.', array('%count' => variable_get('nodewords_max_size', 350))),
- '#default_value' => empty($content['value']) ? (!empty($options['default']['description']['value']) ? $options['default']['description']['value'] : '') : $content['value'],
+ '#default_value' => empty($content['value']) ? '' : $content['value'],
'#cols' => 60,
'#rows' => 3,
'#wysiwyg' => FALSE,
@@ -397,6 +435,19 @@ function nodewords_basic_description_form(&$form, $content, $options) {
$form['description']['value']['#description'] .= ' ' . t('If this is left empty the value will be automatically generated from the node');
}
}
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['description']['value'])) {
+ $default = $options['default']['description']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['description']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -419,11 +470,24 @@ function nodewords_basic_keywords_form(&$form, $content, $options) {
'#type' => 'textfield',
'#title' => t('Keywords'),
'#description' => t('Enter a comma separated list of keywords. Avoid duplication of words as this will lower your search engine ranking.'),
- '#default_value' => empty($content['value']) ? (!empty($options['default']['keywords']['value']) ? $options['default']['keywords']['value'] : '') : $content['value'],
+ '#default_value' => empty($content['value']) ? '' : $content['value'],
'#size' => 60,
'#element_validate' => array('nodewords_basic_keywords_form_validate'),
'#maxlength' => variable_get('nodewords_max_size', 350),
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['keywords']['value'])) {
+ $default = $options['default']['keywords']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['keywords']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -527,12 +591,25 @@ function nodewords_basic_revisit_after_form(&$form, $content, $options) {
'#type' => 'textfield',
'#title' => t('Revisit after'),
'#description' => t('The meta tag REVISIT-AFTER defines how often a search engine or spider should come to your website for re-indexing. This tag is used for websites that change their content and on a regular basis. This tag can also be beneficial in boosting your rankings if search engines display results based on the most recent submissions.'),
- '#default_value' => empty($content['value']) ? (!empty($options['default']['revisit-after']['value']) ? (integer) $options['default']['revisit-after']['value'] : 1) : (integer) $content['value'],
+ '#default_value' => empty($content['value']) ? '' : (integer) $content['value'],
'#size' => 3,
'#element_validate' => array('nodewords_basic_revisit_after_form_validate'),
'#maxlength' => 3,
'#field_suffix' => t('day(s)'),
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['revisit-after']['value'])) {
+ $default = $options['default']['revisit-after']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['revisit-after']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -589,13 +666,10 @@ function nodewords_basic_robots_form(&$form, $content, $options) {
}
if (!empty($default_values)) {
- $description = t(
- 'The default value is currently %default_values.',
- array('%default_values' => implode(', ', $default_values))
- );
+ $description = t('The default is: %default_values', array('%default_values' => implode(', ', $default_values)));
}
else {
- $description = t('The default value is currently not set.');
+ $description = t('The default is: ') . t('Not set.');
}
$form['robots']['use_default']['#description'] = $description;
diff --git a/nodewords_extra/nodewords_extra.module b/nodewords_extra/nodewords_extra.module
index 0e86613..f9f7d55 100644
--- a/nodewords_extra/nodewords_extra.module
+++ b/nodewords_extra/nodewords_extra.module
@@ -5,17 +5,6 @@
*/
/**
- * Implements hook_form_FORM_ID_alter().
- */
-function nodewords_extra_form_nodewords_settings_form_alter(&$form, &$form_state) {
- $form['metatags_creation']['nodewords_add_dc_schema'] = array(
- '#type' => 'checkbox',
- '#title' => t('Add the Dublin Core schema meta tag'),
- '#default_value' => variable_get('nodewords_add_dc_schema', FALSE),
- );
-}
-
-/**
* Implements hook_nodewords_api().
*/
function nodewords_extra_nodewords_api() {
@@ -163,22 +152,6 @@ function nodewords_extra_nodewords_tags_info() {
return $tags;
}
-function nodewords_extra_nodewords_tags_output_alter(&$output, $parameters) {
- $bool = (
- variable_get('nodewords_add_dc_schema', FALSE) &&
- isset($parameters['output']) &&
- $parameters['type'] != NODEWORDS_TYPE_NONE &&
- $parameters['output'] == 'head'
- );
-
- if ($bool) {
- $output = (
- '' . "\n" .
- $output
- );
- }
-}
-
/**
* Implements hook_perm().
*/
@@ -196,6 +169,40 @@ function nodewords_extra_perm() {
}
/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * Provide an option to automatically add the DC schema meta tag.
+ */
+function nodewords_extra_form_nodewords_settings_form_alter(&$form, &$form_state) {
+ $form['metatags_creation']['nodewords_add_dc_schema'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Add the Dublin Core schema meta tag'),
+ '#default_value' => variable_get('nodewords_add_dc_schema', FALSE),
+ );
+}
+
+/**
+ * Implementation of hook_nodewords_tags_output_alter().
+ *
+ * Output the DC schema meta tag, if requested.
+ */
+function nodewords_extra_nodewords_tags_output_alter(&$output, $parameters) {
+ $bool = (
+ variable_get('nodewords_add_dc_schema', FALSE) &&
+ isset($parameters['output']) &&
+ $parameters['type'] != NODEWORDS_TYPE_NONE &&
+ $parameters['output'] == 'head'
+ );
+
+ if ($bool) {
+ $output = (
+ '' . "\n" .
+ $output
+ );
+ }
+}
+
+/**
* Set the form fields used to implement the options for the meta tag.
*/
function nodewords_extra_dc_contributor_form(&$form, $content, $options) {
@@ -208,11 +215,24 @@ function nodewords_extra_dc_contributor_form(&$form, $content, $options) {
'#type' => 'textarea',
'#title' => t('Dublin Core: Contributor'),
'#description' => t('Enter the name(s) of an entity responsible for making contributions to the resource. Examples of a contributor include a person, an organization, or a service. Multiple names may be added, one per line, up to a maximum of %count characters.', array('%count' => variable_get('nodewords_max_size', 350))),
- '#default_value' => empty($content['value']) ? (!empty($options['default']['dc.contributor']['value']) ? $options['default']['dc.contributor']['value'] : '') : $content['value'],
+ '#default_value' => empty($content['value']) ? '' : $content['value'],
'#cols' => 60,
'#rows' => 2,
'#wysiwyg' => FALSE,
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['dc.contributor']['value'])) {
+ $default = $options['default']['dc.contributor']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['dc.contributor']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -230,7 +250,7 @@ function nodewords_extra_dc_contributor_prepare(&$tags, $content, $options) {
/**
* Set the form fields used to implement the options for the meta tag.
*/
-function nodewords_extra_dc_ror_form(&$form, $content, $options) {
+function nodewords_extra_dc_creator_form(&$form, $content, $options) {
$form['dc.creator'] = array(
'#tree' => TRUE,
'#weight' => -179,
@@ -240,10 +260,23 @@ function nodewords_extra_dc_ror_form(&$form, $content, $options) {
'#type' => 'textfield',
'#title' => t('Dublin Core: Creator'),
'#description' => t('Enter the name of an entity primarily responsible for making the resource. Examples of a creator include a person, an organization, or a service.'),
- '#default_value' => empty($content['value']) ? (!empty($options['default']['dc.creator']['value']) ? $options['default']['dc.creator']['value'] : '') : $content['value'],
+ '#default_value' => empty($content['value']) ? '' : $content['value'],
'#size' => 60,
'#maxlength' => variable_get('nodewords_max_size', 350),
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['dc.creator']['value'])) {
+ $default = $options['default']['dc.creator']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['dc.creator']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -273,6 +306,20 @@ function nodewords_extra_dc_date_form(&$form, $content, $options) {
'#description' => t('A point or period of time associated with an event in the lifecycle of the resource. The date should be relative to UTC.'),
'#default_value' => empty($content['value']) ? array() : $content['value'],
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['dc.date']['value'])) {
+ $date = $options['default']['dc.date']['value'];
+ $default = format_date(mktime(0, 0, 0, $date['month'], $date['day'], $date['year']), 'custom', 'F jS, Y');
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['dc.date']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -311,7 +358,7 @@ function nodewords_extra_dc_description_form(&$form, $content, $options) {
'#type' => 'textarea',
'#title' => t('Dublin Core: Description'),
'#description' => t('Enter a one or two sentence description of your page. Limit the description to about 20 words with a maximum of %count characters. It should not contain any HTML tags or other formatting.', array('%count' => variable_get('nodewords_max_size', 350))),
- '#default_value' => empty($content['value']) ? (!empty($options['default']['dc.description']['value']) ? $options['default']['dc.description']['value'] : '') : $content['value'],
+ '#default_value' => empty($content['value']) ? '' : $content['value'],
'#cols' => 60,
'#rows' => 3,
'#wysiwyg' => FALSE,
@@ -328,6 +375,19 @@ function nodewords_extra_dc_description_form(&$form, $content, $options) {
$form['dc.description']['value']['#description'] .= ' ' . t('If this is left empty the value will be automatically generated from the node');
}
}
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['dc.description']['value'])) {
+ $default = $options['default']['dc.description']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['dc.description']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -349,10 +409,23 @@ function nodewords_extra_dc_publisher_form(&$form, $content, $options) {
'#type' => 'textfield',
'#title' => t('Dublin Core: Publisher'),
'#description' => t('Enter a name of an entity responsible for making the resource available. Examples of a publisher include a person, an organization, or a service.'),
- '#default_value' => empty($options['default']['dc.publisher']['value']) ? '' : $options['default']['dc.publisher']['value'],
+ '#default_value' => empty($content['value']) ? '' : $content['value'],
'#size' => 60,
'#maxlength' => variable_get('nodewords_max_size', 350),
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['dc.publisher']['value'])) {
+ $default = $options['default']['dc.publisher']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['dc.publisher']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -386,6 +459,19 @@ function nodewords_extra_dc_title_form(&$form, $content, $options) {
'#size' => 60,
'#maxlength' => variable_get('nodewords_max_size', 350),
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['dc.publisher']['value'])) {
+ $default = $options['default']['dc.publisher']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['dc.title']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -426,6 +512,7 @@ function nodewords_extra_location_form(&$form, $content, $options) {
'#size' => 14,
'#maxlength' => 14,
'#prefix' => '',
+ '#suffix' => '
',
'#latitude' => TRUE,
);
@@ -438,6 +525,25 @@ function nodewords_extra_location_form(&$form, $content, $options) {
'#maxlength' => 14,
'#suffix' => '
',
);
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current defaults.
+ if (!empty($options['default']['location']['latitude'])) {
+ $latitude = $options['default']['location']['latitude'];
+ }
+ else {
+ $latitude = t('Not set');
+ }
+ if (!empty($options['default']['location']['longitude'])) {
+ $longitude = $options['default']['location']['longitude'];
+ }
+ else {
+ $longitude = t('Not set');
+ }
+
+ $form['location']['longitude']['#description'] = '
' . t('The defaults are: %latitude / %longitude', array('%latitude' => $latitude, '%longitude' => $longitude));
+ }
}
/**
diff --git a/nodewords_og/nodewords_og.module b/nodewords_og/nodewords_og.module
index 10b639a..320dfd7 100644
--- a/nodewords_og/nodewords_og.module
+++ b/nodewords_og/nodewords_og.module
@@ -193,7 +193,7 @@ function nodewords_og_get_tags() {
return $tags;
}
-function nodewords_og_form_default(&$form, &$content, $name, $elemtype = 'textfield') {
+function nodewords_og_form_default(&$form, &$content, $options, $name, $elemtype = 'textfield', $show_defaults = TRUE) {
$form[$name] = array(
'#tree' => TRUE,
);
@@ -208,6 +208,19 @@ function nodewords_og_form_default(&$form, &$content, $name, $elemtype = 'textfi
if ($elemtype == 'textfield') {
$form[$name]['value']['#maxlength'] = variable_get('nodewords_max_size', 350);
}
+
+ // Show the current default.
+ if ($show_defaults && $options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default'][$name]['value'])) {
+ $default = $options['default'][$name]['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form[$name]['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
/**
@@ -243,7 +256,7 @@ function nodewords_og_get_tag_description($name) {
}
function nodewords_og_og_title_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:title');
+ nodewords_og_form_default($form, $content, $options, 'og:title');
$form['og:title']['#weight'] = -197;
}
@@ -257,7 +270,7 @@ function nodewords_og_og_title_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_type_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:type');
+ nodewords_og_form_default($form, $content, $options, 'og:type');
$form['og:type']['#weight'] = -149;
// Make the field a selector.
@@ -283,7 +296,7 @@ function nodewords_og_og_type_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_image_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:image');
+ nodewords_og_form_default($form, $content, $options, 'og:image');
$form['og:image']['#weight'] = -184;
$form['og:image']['value'] += array(
@@ -310,7 +323,8 @@ function nodewords_og_og_image_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_url_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:url');
+ // Don't display what the current default value is.
+ nodewords_og_form_default($form, $content, $options, 'og:url', 'textfield', FALSE);
$form['og:url']['#weight'] = -137;
$form['og:url']['value']['#element_validate'] = array('nodewords_validate_element');
@@ -336,7 +350,7 @@ function nodewords_og_og_url_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_site_name_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:site_name');
+ nodewords_og_form_default($form, $content, $options, 'og:site_name');
$form['og:site_name']['#weight'] = -209;
}
@@ -350,7 +364,7 @@ function nodewords_og_og_description_form(&$form, $content, $options) {
$autogenerate = variable_get('nodewords_metatags_generation_method_' . $options['node_type'], NODEWORDS_GENERATION_WHEN_EMPTY);
}
- nodewords_og_form_default($form, $content, 'og:description', 'textarea');
+ nodewords_og_form_default($form, $content, $options, 'og:description', 'textarea');
$form['og:description']['#weight'] = -187;
$form['og:description']['value']['#type'] = 'textarea';
$form['og:description']['value']['#cols'] = 60;
@@ -368,6 +382,19 @@ function nodewords_og_og_description_form(&$form, $content, $options) {
$form['og:description']['value']['#description'] .= ' ' . t('If this is left empty the value will be automatically generated from the node');
}
}
+
+ // Show the current default.
+ if ($options['type'] != NODEWORDS_TYPE_DEFAULT) {
+ // Load the current default.
+ if (!empty($options['default']['og:description']['value'])) {
+ $default = $options['default']['og:description']['value'];
+ }
+ else {
+ $default = t('Not set.');
+ }
+
+ $form['og:description']['value']['#description'] .= '
' . t('The default is: %default', array('%default' => $default));
+ }
}
function nodewords_og_og_description_prepare(&$tags, $content, $options) {
@@ -375,7 +402,7 @@ function nodewords_og_og_description_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_email_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:email');
+ nodewords_og_form_default($form, $content, $options, 'og:email');
$form['og:email']['#weight'] = 0;
}
@@ -384,7 +411,7 @@ function nodewords_og_og_email_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_phone_number_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:phone_number');
+ nodewords_og_form_default($form, $content, $options, 'og:phone_number');
$form['og:phone_number']['#weight'] = 0;
}
@@ -393,7 +420,7 @@ function nodewords_og_og_phone_number_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_fax_number_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:fax_number');
+ nodewords_og_form_default($form, $content, $options, 'og:fax_number');
$form['og:fax_number']['#weight'] = 0;
}
@@ -402,7 +429,7 @@ function nodewords_og_og_fax_number_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_latitude_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:latitude');
+ nodewords_og_form_default($form, $content, $options, 'og:latitude');
$form['og:latitude']['#weight'] = -158;
}
@@ -411,7 +438,7 @@ function nodewords_og_og_latitude_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_longitude_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:longitude');
+ nodewords_og_form_default($form, $content, $options, 'og:longitude');
$form['og:longitude']['#weight'] = -157;
}
@@ -420,7 +447,7 @@ function nodewords_og_og_longitude_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_street_address_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:street-address');
+ nodewords_og_form_default($form, $content, $options, 'og:street-address');
$form['og:street-address']['#weight'] = -156;
}
@@ -429,7 +456,7 @@ function nodewords_og_og_street_address_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_locality_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:locality');
+ nodewords_og_form_default($form, $content, $options, 'og:locality');
$form['og:locality']['#weight'] = -155;
}
@@ -438,7 +465,7 @@ function nodewords_og_og_locality_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_region_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:region');
+ nodewords_og_form_default($form, $content, $options, 'og:region');
$form['og:region']['#weight'] = -154;
}
@@ -447,7 +474,7 @@ function nodewords_og_og_region_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_postal_code_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:postal-code');
+ nodewords_og_form_default($form, $content, $options, 'og:postal-code');
$form['og:postal-code']['#weight'] = -153;
}
@@ -456,7 +483,7 @@ function nodewords_og_og_postal_code_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_country_name_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:country-name');
+ nodewords_og_form_default($form, $content, $options, 'og:country-name');
$form['og:country-name']['#weight'] = -152;
}
@@ -465,7 +492,7 @@ function nodewords_og_og_country_name_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_video_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:video');
+ nodewords_og_form_default($form, $content, $options, 'og:video');
$form['og:video']['#weight'] = -147;
$form['og:video']['value'] += array(
@@ -492,7 +519,7 @@ function nodewords_og_og_video_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_video_width_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:video:width');
+ nodewords_og_form_default($form, $content, $options, 'og:video:width');
$form['og:video:width']['#weight'] = -146;
}
@@ -501,7 +528,7 @@ function nodewords_og_og_video_width_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_video_height_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:video:height');
+ nodewords_og_form_default($form, $content, $options, 'og:video:height');
$form['og:video:height']['#weight'] = -145;
}
@@ -510,7 +537,7 @@ function nodewords_og_og_video_height_prepare(&$tags, $content, $options) {
}
function nodewords_og_og_video_type_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'og:video:type');
+ nodewords_og_form_default($form, $content, $options, 'og:video:type');
$form['og:video:type']['#weight'] = -144;
}
@@ -519,7 +546,7 @@ function nodewords_og_og_video_type_prepare(&$tags, $content, $options) {
}
function nodewords_og_fb_admins_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'fb:admins');
+ nodewords_og_form_default($form, $content, $options, 'fb:admins');
$form['fb:admins']['#weight'] = -207;
$form['fb:admins']['value'] += array(
@@ -544,7 +571,7 @@ function nodewords_og_fb_admins_prepare(&$tags, $content, $options) {
}
function nodewords_og_fb_app_id_form(&$form, $content, $options) {
- nodewords_og_form_default($form, $content, 'fb:app_id');
+ nodewords_og_form_default($form, $content, $options, 'fb:app_id');
$form['fb:app_id']['#weight'] = -208;
}