diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/navigation/pagination.php | 5 | ||||
| -rw-r--r-- | views/default/object/plugin/full.php | 7 | ||||
| -rw-r--r-- | views/default/object/plugin/invalid.php | 5 | ||||
| -rw-r--r-- | views/default/page/components/list.php | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php index ad4689d83..e0d355327 100644 --- a/views/default/navigation/pagination.php +++ b/views/default/navigation/pagination.php @@ -8,7 +8,7 @@ * @uses int $vars['offset'] The offset in the list * @uses int $vars['limit'] Number of items per page * @uses int $vars['count'] Number of items in list - * @uses string $vars['baseurl'] Base URL to use in links + * @uses string $vars['base_url'] Base URL to use in links * @uses string $vars['offset_key'] The string to use for offet in the URL */ @@ -28,6 +28,9 @@ $offset_key = elgg_extract('offset_key', $vars, 'offset'); // some views pass an empty string for base_url if (isset($vars['base_url']) && $vars['base_url']) { $base_url = $vars['base_url']; +} else if (isset($vars['baseurl']) && $vars['baseurl']) { + elgg_deprecated_notice("Use 'base_url' instead of 'baseurl' for the navigation/pagination view", 1.8); + $base_url = $vars['baseurl']; } else { $base_url = current_page_url(); } diff --git a/views/default/object/plugin/full.php b/views/default/object/plugin/full.php index 8955178a6..74bd31d1c 100644 --- a/views/default/object/plugin/full.php +++ b/views/default/object/plugin/full.php @@ -21,6 +21,7 @@ $name = $plugin->getManifest()->getName(); $can_activate = $plugin->canActivate(); $max_priority = elgg_get_max_plugin_priority(); $actions_base = '/action/admin/plugins/'; +$css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID()); $ts = time(); $token = generate_action_token($ts); @@ -196,7 +197,7 @@ if ($files) { ?> -<div class="<?php echo $draggable; ?> elgg-plugin <?php echo $active_class ?>" id="<?php echo $plugin->getID(); ?>"> +<div class="<?php echo $draggable; ?> elgg-plugin <?php echo $active_class ?>" id="<?php echo $css_id; ?>"> <div class="elgg-image-block"> <div class="elgg-image-alt"> <?php if ($links) : ?> @@ -247,7 +248,7 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new) <div class="pts"> <?php echo elgg_view('output/url', array( - 'href' => "#elgg-plugin-manifest-{$plugin->getID()}", + 'href' => "#elgg-plugin-manifest-$css_id", 'text' => elgg_echo("admin:plugins:label:moreinfo"), 'rel' => 'toggle', )); @@ -255,7 +256,7 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new) </div> </div> </div> - <div class="elgg-plugin-more hidden" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>"> + <div class="elgg-plugin-more hidden" id="elgg-plugin-manifest-<?php echo $css_id; ?>"> <?php if ($screenshots_html) { diff --git a/views/default/object/plugin/invalid.php b/views/default/object/plugin/invalid.php index bb518cd53..f24e1836c 100644 --- a/views/default/object/plugin/invalid.php +++ b/views/default/object/plugin/invalid.php @@ -16,6 +16,7 @@ $id = $plugin->getID(); $path = htmlspecialchars($plugin->getPath()); $message = elgg_echo('admin:plugins:warning:invalid', array($id)); $error = $plugin->getError(); +$css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID()); ?> @@ -27,14 +28,14 @@ $error = $plugin->getError(); <div class="pts"> <?php echo elgg_view('output/url', array( - 'href' => "#elgg-plugin-manifest-{$plugin->getID()}", + 'href' => "#elgg-plugin-manifest-$css_id", 'text' => elgg_echo("admin:plugins:label:moreinfo"), 'rel' => 'toggle', )); ?> </div> - <div class="hidden elgg-plugin-more" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>"> + <div class="hidden elgg-plugin-more" id="elgg-plugin-manifest-<?php echo $css_id; ?>"> <p><?php echo elgg_echo('admin:plugins:label:location') . ": " . $path; ?></p> <p><?php echo $error; ?></p> </div> diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php index c0db50bc5..28c907ab6 100644 --- a/views/default/page/components/list.php +++ b/views/default/page/components/list.php @@ -40,7 +40,7 @@ $nav = ""; if ($pagination && $count) { $nav .= elgg_view('navigation/pagination', array( - 'baseurl' => $base_url, + 'base_url' => $base_url, 'offset' => $offset, 'count' => $count, 'limit' => $limit, |