diff options
| -rw-r--r-- | mod/embed/views/default/embed/embed.php | 5 | ||||
| -rw-r--r-- | views/default/navigation/tabs.php | 21 |
2 files changed, 14 insertions, 12 deletions
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php index 21b296db4..7e84a9d72 100644 --- a/mod/embed/views/default/embed/embed.php +++ b/mod/embed/views/default/embed/embed.php @@ -30,8 +30,7 @@ if (!$sections) { 'title' => $section_info['name'], 'url' => '#', 'url_class' => 'embed_section', - // abusing the js attribute. - 'url_js' => "id=\"$section_id\"" + 'url_id' => $section_id, ); if ($section_id == $active_section) { @@ -46,7 +45,7 @@ if (!$sections) { 'title' => elgg_echo('embed:upload'), 'url' => '#', 'url_class' => 'embed_section', - 'url_js' => 'id="upload"', + 'url_id' => 'upload', 'selected' => ($active_section == 'upload') ); } diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php index e3398a99d..21fae8202 100644 --- a/views/default/navigation/tabs.php +++ b/views/default/navigation/tabs.php @@ -6,10 +6,11 @@ * @uses array $vars['tabs'] A multi-dimensional array of tab entries in the format array( * 'title' => string, // Title of link * 'url' => string, // URL for the link - * 'url_js' => string, // JS to pass to the link + * 'class' => string // Class of the li element + * 'id' => string, // ID of the li element + * 'selected' => bool // if this li element is currently selected * 'url_class' => string, // Class to pass to the link - * 'class' => string // Class of the li element. - * 'selected' => bool // if this link is currently selected + * 'url_id' => string, // ID to pass to the link * ) */ @@ -26,6 +27,7 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) { <?php foreach ($vars['tabs'] as $info) { $class = elgg_get_array_value('class', $info, ''); + $id = elgg_get_array_value('id', $info, ''); $selected = elgg_get_array_value('selected', $info, FALSE); if ($selected) { @@ -33,8 +35,9 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) { } $class_str = ($class) ? "class=\"$class\"" : ''; - $title = htmlentities($info['title'], ENT_QUOTES, 'UTF-8'); - $url = htmlentities($info['url'], ENT_QUOTES, 'UTF-8'); + $id_str = ($id) ? "id=\"$id\"" : ''; + $title = htmlspecialchars($info['title'], ENT_QUOTES, 'UTF-8'); + $url = htmlspecialchars($info['url'], ENT_QUOTES, 'UTF-8'); $options = array( 'href' => $url, @@ -42,14 +45,14 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) { 'text' => $title ); - if (isset($info['url_js'])) { - $options['js'] = $info['url_js']; - } - if (isset($info['url_class'])) { $options['class'] = $info['url_class']; } + if (isset($info['url_id'])) { + $options['internalid'] = $info['url_id']; + } + $link = elgg_view('output/url', $options); echo "<li $class_str $js>$link</li>"; |