summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--template.php15
-rw-r--r--templates/page.tpl.php3
3 files changed, 18 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3663636..44cd9bc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
Zen 7.x-3.x-dev, xxxx-xx-xx (development release)
---------------------------
+- #1079010: The secondary links heading, "Secondary menu", is wrong
- #1072302: Use element-focusable class for skip link accessibility
- #1072268: Zen theme doesn't load RTL styles
- #929630 by juan_g and akalata: URL for overriding stylesheets documentation has changed
diff --git a/template.php b/template.php
index 66e4ffe..eed905b 100644
--- a/template.php
+++ b/template.php
@@ -213,6 +213,21 @@ function zen_preprocess_html(&$variables, $hook) {
}
/**
+ * Override or insert variables into the page template.
+ *
+ * @param $variables
+ * An array of variables to pass to the theme template.
+ * @param $hook
+ * The name of the template being rendered ("page" in this case.)
+ */
+function zen_preprocess_page(&$variables, $hook) {
+ // Find the title of the menu used by the secondary links.
+ $secondary_links = variable_get('menu_secondary_links_source', 'user-menu');
+ $menus = menu_get_menus();
+ $variables['secondary_menu_heading'] = $menus[$secondary_links];
+}
+
+/**
* Override or insert variables into the maintenance page template.
*
* @param $variables
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 65cc7cf..470b65c 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -29,6 +29,7 @@
* site, if they have been configured.
* - $secondary_menu (array): An array containing the Secondary menu links for
* the site, if they have been configured.
+ * - $secondary_menu_heading: The title of the menu used by the secondary links.
* - $breadcrumb: The breadcrumb trail for the current page.
*
* Page content (in order of occurrence in the default page.tpl.php):
@@ -103,7 +104,7 @@
'class' => array('links', 'clearfix'),
),
'heading' => array(
- 'text' => t('Secondary menu'),
+ 'text' => $secondary_menu_heading,
'level' => 'h2',
'class' => array('element-invisible'),
),