2 files changed, 6 insertions, 6 deletions

diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 1c42be14d..6b32035f3 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -39,8 +39,6 @@ foreach ($installed_plugins as $plugin) {
 	}
 }
 
-$ts = time();
-$token = generate_action_token($ts);
 $categories = array_merge(array('' => elgg_echo('admin:plugins:categories:all')), $categories);
 
 $category_dropdown = elgg_view('input/dropdown', array(
@@ -60,8 +58,10 @@ $category_form = elgg_view('input/form', array(
 
 // @todo Until "en/deactivate all" means "All plugins on this page" hide when not looking at all.
 if (!isset($show_category) || empty($show_category)) {
-	$activate_url = "{$CONFIG->url}action/admin/plugins/activate_all?__elgg_token=$token&__elgg_ts=$ts";
-	$deactivate_url = "{$CONFIG->url}action/admin/plugins/deactivate_all?__elgg_token=$token&__elgg_ts=$ts";
+	$activate_url = "action/admin/plugins/activate_all";
+	$activate_url = elgg_add_action_tokens_to_url($activate_url);
+	$deactivate_url = "action/admin/plugins/deactivate_all";
+	$deactivate_url = elgg_add_action_tokens_to_url($deactivate_url);
 
 	$buttons = "<div class=\"mbl\">";
 	$buttons .= "<a class='elgg-button-action' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> ';
diff --git a/views/default/forms/admin/menu/save.php b/views/default/forms/admin/menu/save.php
index 2cafaa89b..c55ff3367 100644
--- a/views/default/forms/admin/menu/save.php
+++ b/views/default/forms/admin/menu/save.php
@@ -4,8 +4,8 @@
  */
 
 // get site menu items
-global $CONFIG;
-$menu = $CONFIG->menus['site'];
+$menu = elgg_get_config('menus');
+$menu = $menu['site'];
 $builder = new ElggMenuBuilder($menu);
 $menu = $builder->getMenu('name');
 $menu_items = $menu['default'];