aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-29 06:46:51 -0400
committerCash Costello <cash.costello@gmail.com>2011-06-29 06:46:51 -0400
commit8ed11a8881f65339446fccae64864e0d57dfff51 (patch)
tree3a9dd599067c79649e814f6d89b9bb5cf5bb26a5
parent0924491d5aa61c47ba60506c6398b14a30e1cb27 (diff)
downloadelgg-8ed11a8881f65339446fccae64864e0d57dfff51.tar.gz
elgg-8ed11a8881f65339446fccae64864e0d57dfff51.tar.bz2
Fixes #3630 using the plugin id for the css id
-rw-r--r--actions/admin/plugins/activate.php3
-rw-r--r--actions/admin/plugins/deactivate.php3
-rw-r--r--actions/admin/plugins/set_priority.php5
-rw-r--r--views/default/object/plugin/advanced.php2
4 files changed, 7 insertions, 6 deletions
diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php
index feb986b27..5a945e8eb 100644
--- a/actions/admin/plugins/activate.php
+++ b/actions/admin/plugins/activate.php
@@ -44,7 +44,8 @@ if (count($activated_guids) === 1) {
if ($query) {
$url .= "?$query";
}
- forward($url . '#elgg-plugin-' . $plugin_guids[0]);
+ $plugin = get_entity($plugin_guids[0]);
+ forward("$url#{$plugin->getID()}");
} else {
forward(REFERER);
} \ No newline at end of file
diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index 6c9a55c15..f5eca3aaa 100644
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -43,7 +43,8 @@ if (count($plugin_guids) == 1) {
if ($query) {
$url .= "?$query";
}
- forward($url . '#elgg-plugin-' . $plugin_guids[0]);
+ $plugin = get_entity($plugin_guids[0]);
+ forward("$url#{$plugin->getID()}");
} else {
forward(REFERER);
}
diff --git a/actions/admin/plugins/set_priority.php b/actions/admin/plugins/set_priority.php
index 702aae91b..1f8bc24af 100644
--- a/actions/admin/plugins/set_priority.php
+++ b/actions/admin/plugins/set_priority.php
@@ -6,9 +6,8 @@
* overriding as well as the order of view extensions. Plugins with higher
* priority are loaded after and override plugins with lower priorities.
*
- * NOTE: When viewing the admin page (advanced plugin admin in >= 1.8) plugins
- * LOWER on the page have HIGHER priority and will override views, etc
- * from plugins above them.
+ * NOTE: When viewing the plugin admin page, plugins LOWER on the page
+ * have HIGHER priority and will override views, etc from plugins above them.
*
* @package Elgg.Core
* @subpackage Administration.Plugins
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index 84fc0439b..9fdbc99ee 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -189,7 +189,7 @@ if ($files) {
?>
-<div class="<?php echo $draggable; ?> elgg-plugin <?php echo $active_class ?>" id="elgg-plugin-<?php echo $plugin->guid; ?>">
+<div class="<?php echo $draggable; ?> elgg-plugin <?php echo $active_class ?>" id="<?php echo $plugin->getID(); ?>">
<div class="elgg-image-block">
<div class="elgg-image-alt">
<?php if ($links) : ?>