Commit 03b657ba authored by git's avatar git Committed by Nicholas Thompson
Browse files

#1568696 - Fixing incorrect token use of taxonomy instead of term caused by...

#1568696 - Fixing incorrect token use of taxonomy instead of term caused by rushed port of the uc_catalog integration from D6.
parent ce490556
...@@ -41,8 +41,8 @@ function uc_catalog_page_title_pattern_alter(&$pattern, &$types) { ...@@ -41,8 +41,8 @@ function uc_catalog_page_title_pattern_alter(&$pattern, &$types) {
if ( !strncmp($menu_item['path'], 'catalog', 7) && if ( !strncmp($menu_item['path'], 'catalog', 7) &&
isset($menu_item['page_arguments'][0]) && isset($menu_item['page_arguments'][0]) &&
($term = taxonomy_term_load($menu_item['page_arguments'][0])) ) { ($term = taxonomy_term_load($menu_item['page_arguments'][0])) ) {
$types['taxonomy'] = $term; $types['term'] = $term;
$pattern = variable_get('page_title_uc_catalog_' . $types['taxonomy']->vid, ''); $pattern = variable_get('page_title_uc_catalog_' . $types['term']->vid, '');
} }
} }
...@@ -58,7 +58,7 @@ function uc_catalog_page_title_settings() { ...@@ -58,7 +58,7 @@ function uc_catalog_page_title_settings() {
$settings['page_title_uc_catalog_' . $vocab->vid] = array( $settings['page_title_uc_catalog_' . $vocab->vid] = array(
'label' => 'Ubercart Catalog - %vocab_name', 'label' => 'Ubercart Catalog - %vocab_name',
'label arguments' => array('%vocab_name' => $vocab->name), 'label arguments' => array('%vocab_name' => $vocab->name),
'scopes' => array('global', 'taxonomy'), 'scopes' => array('global', 'term'),
'show field' => FALSE, 'show field' => FALSE,
'description' => 'This pattern will be used for all %vocab_name Ubercart catalog pages.<br />' . 'description' => 'This pattern will be used for all %vocab_name Ubercart catalog pages.<br />' .
'The Show Field setting does not apply here. Use the matching Vocabulary row.', 'The Show Field setting does not apply here. Use the matching Vocabulary row.',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment