From 03b657ba2f78085154687a7f52149dc11074bc9d Mon Sep 17 00:00:00 2001
From: git <git@746356.no-reply.drupal.org>
Date: Fri, 11 May 2012 10:43:02 +0100
Subject: [PATCH] #1568696 - Fixing incorrect token use of taxonomy instead of
term caused by rushed port of the uc_catalog integration from D6.
---
modules/uc_catalog.page_title.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/uc_catalog.page_title.inc b/modules/uc_catalog.page_title.inc
index 3bd9910..2562c6e 100644
--- a/modules/uc_catalog.page_title.inc
+++ b/modules/uc_catalog.page_title.inc
@@ -41,8 +41,8 @@ function uc_catalog_page_title_pattern_alter(&$pattern, &$types) {
if ( !strncmp($menu_item['path'], 'catalog', 7) &&
isset($menu_item['page_arguments'][0]) &&
($term = taxonomy_term_load($menu_item['page_arguments'][0])) ) {
- $types['taxonomy'] = $term;
- $pattern = variable_get('page_title_uc_catalog_' . $types['taxonomy']->vid, '');
+ $types['term'] = $term;
+ $pattern = variable_get('page_title_uc_catalog_' . $types['term']->vid, '');
}
}
@@ -58,7 +58,7 @@ function uc_catalog_page_title_settings() {
$settings['page_title_uc_catalog_' . $vocab->vid] = array(
'label' => 'Ubercart Catalog - %vocab_name',
'label arguments' => array('%vocab_name' => $vocab->name),
- 'scopes' => array('global', 'taxonomy'),
+ 'scopes' => array('global', 'term'),
'show field' => FALSE,
'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.',
--
GitLab