Refs #2871 Forgot to update the forwarding for activate/deactivate actions

git-svn-id: http://code.elgg.org/elgg/trunk@9161 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php
index e04ee6298420a8d56fd4eb4ac525c9c891fbd049..feb986b27a15c282979ac600ad92c3bf1cc76231 100644 (file)
--- a/actions/admin/plugins/activate.php
+++ b/actions/admin/plugins/activate.php
@@ -39,7 +39,12 @@ elgg_invalidate_simplecache();
 elgg_filepath_cache_reset();
 
 if (count($activated_guids) === 1) {
-       forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
+       $url = 'admin/plugins';
+       $query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+       if ($query) {
+               $url .= "?$query";
+       }
+       forward($url . '#elgg-plugin-' . $plugin_guids[0]);
 } else {
        forward(REFERER);
 }
\ No newline at end of file

diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index 9ec620e1319bd92e89156ddc4ed3d25340fa50e2..6c9a55c159ecc895897d3247925543c4c215aebd 100644 (file)
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -38,7 +38,12 @@ elgg_invalidate_simplecache();
 elgg_filepath_cache_reset();
 
 if (count($plugin_guids) == 1) {
-       forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
+       $url = 'admin/plugins';
+       $query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+       if ($query) {
+               $url .= "?$query";
+       }
+       forward($url . '#elgg-plugin-' . $plugin_guids[0]);
 } else {
        forward(REFERER);
 }