diff options
| -rw-r--r-- | actions/admin/plugins/disable.php | 5 | ||||
| -rw-r--r-- | actions/admin/plugins/disableall.php | 5 | ||||
| -rw-r--r-- | actions/admin/plugins/enable.php | 5 | ||||
| -rw-r--r-- | actions/admin/plugins/enableall.php | 5 | ||||
| -rw-r--r-- | actions/admin/plugins/reorder.php | 4 | ||||
| -rw-r--r-- | actions/admin/plugins/simple_update_states.php | 5 |
6 files changed, 18 insertions, 11 deletions
diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php index 3207e6800..5ad49d2c7 100644 --- a/actions/admin/plugins/disable.php +++ b/actions/admin/plugins/disable.php @@ -27,8 +27,9 @@ foreach ($plugin as $p) { } } -// need to reset caches for new view locations and cached view output. -elgg_view_regenerate_simplecache(); +// don't regenerate the simplecache because the plugin won't be +// loaded until next run. Just invalidate and let it regnerate as needed +elgg_invalidate_simplecache(); elgg_filepath_cache_reset(); forward($_SERVER['HTTP_REFERER']); diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php index 8cba6252a..f2545fb0e 100644 --- a/actions/admin/plugins/disableall.php +++ b/actions/admin/plugins/disableall.php @@ -22,8 +22,9 @@ foreach ($plugins as $p => $data) { } } -// need to reset caches for new view locations and cached view output. -elgg_view_regenerate_simplecache(); +// don't regenerate the simplecache because the plugin won't be +// loaded until next run. Just invalidate and let it regnerate as needed +elgg_invalidate_simplecache(); elgg_filepath_cache_reset(); forward($_SERVER['HTTP_REFERER']); diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php index 0510fafa8..92ccd185b 100644 --- a/actions/admin/plugins/enable.php +++ b/actions/admin/plugins/enable.php @@ -28,8 +28,9 @@ foreach ($plugin as $p) { } } -// need to reset caches for new view locations and cached view output. -elgg_view_regenerate_simplecache(); +// don't regenerate the simplecache because the plugin won't be +// loaded until next run. Just invalidate and let it regnerate as needed +elgg_invalidate_simplecache(); elgg_filepath_cache_reset(); forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file diff --git a/actions/admin/plugins/enableall.php b/actions/admin/plugins/enableall.php index f3325d2a6..5a85b6e07 100644 --- a/actions/admin/plugins/enableall.php +++ b/actions/admin/plugins/enableall.php @@ -22,8 +22,9 @@ foreach ($plugins as $p => $data) { } } -// need to reset caches for new view locations and cached view output. -elgg_view_regenerate_simplecache(); +// don't regenerate the simplecache because the plugin won't be +// loaded until next run. Just invalidate and let it regnerate as needed +elgg_invalidate_simplecache(); elgg_filepath_cache_reset(); forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file diff --git a/actions/admin/plugins/reorder.php b/actions/admin/plugins/reorder.php index e3f5c4a0a..165495050 100644 --- a/actions/admin/plugins/reorder.php +++ b/actions/admin/plugins/reorder.php @@ -45,7 +45,9 @@ if (regenerate_plugin_list($plugins)) { register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin)); } -elgg_view_regenerate_simplecache(); +// don't regenerate the simplecache because the plugin won't be +// loaded until next run. Just invalidate and let it regnerate as needed +elgg_invalidate_simplecache(); elgg_filepath_cache_reset(); forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file diff --git a/actions/admin/plugins/simple_update_states.php b/actions/admin/plugins/simple_update_states.php index 1945868f2..d9d8fd3e8 100644 --- a/actions/admin/plugins/simple_update_states.php +++ b/actions/admin/plugins/simple_update_states.php @@ -44,8 +44,9 @@ if ($success) { register_error(elgg_echo('admins:plugins:simple_simple_fail')); } -// need to reset caches for new view locations and cached view output. -elgg_view_regenerate_simplecache(); +// don't regenerate the simplecache because the plugin won't be +// loaded until next run. Just invalidate and let it regnerate as needed +elgg_invalidate_simplecache(); elgg_filepath_cache_reset(); forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file |