diff options
Diffstat (limited to 'actions/admin/plugins/activate.php')
| -rw-r--r-- | actions/admin/plugins/activate.php | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php index ad588f3db..5234a4ca5 100644 --- a/actions/admin/plugins/activate.php +++ b/actions/admin/plugins/activate.php @@ -17,6 +17,7 @@ if (!is_array($plugin_guids)) { $plugin_guids = array($plugin_guids); } +$activated_guids = array(); foreach ($plugin_guids as $guid) { $plugin = get_entity($guid); @@ -26,19 +27,33 @@ foreach ($plugin_guids as $guid) { } if ($plugin->activate()) { - //system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->manifest->getName()))); + $activated_guids[] = $guid; } else { - register_error(elgg_echo('admin:plugins:activate:no', array($plugin->manifest->getName()))); + $msg = $plugin->getError(); + $string = ($msg) ? 'admin:plugins:activate:no_with_msg' : 'admin:plugins:activate:no'; + register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError()))); } } // don't regenerate the simplecache because the plugin won't be -// loaded until next run. Just invalidate and let it regnerate as needed +// loaded until next run. Just invalidate and let it regenerate as needed elgg_invalidate_simplecache(); -elgg_filepath_cache_reset(); +elgg_reset_system_cache(); -if (count($plugin_guids) == 1) { - forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]); +if (count($activated_guids) === 1) { + $url = 'admin/plugins'; + $query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY); + if ($query) { + $url .= "?$query"; + } + $plugin = get_entity($plugin_guids[0]); + $id = $css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID()); + forward("$url#$id"); } else { - forward(REFERER); + // forward to top of page with a failure so remove any #foo + $url = $_SERVER['HTTP_REFERER']; + if (strpos($url, '#')) { + $url = substr(0, strpos($url, '#')); + } + forward($url); }
\ No newline at end of file |