From e112da072ad87ddf46139ceccb35e4d0855745d8 Mon Sep 17 00:00:00 2001
From: Tim Plunkett <git@plnktt.com>
Date: Tue, 15 May 2012 12:31:32 -0400
Subject: [PATCH] menu_rebuild() renamed to menu_router_rebuild().
---
drush/views.drush.inc | 2 +-
includes/admin.inc | 4 ++--
includes/view.inc | 2 +-
plugins/export_ui/views_ui.class.php | 2 +-
tests/handlers/views_handler_filter_date.test | 2 +-
tests/views_analyze.test | 2 +-
tests/views_exposed_form.test | 4 ++--
tests/views_handlers.test | 2 +-
tests/views_query.test | 2 +-
views.install | 2 +-
views.module | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drush/views.drush.inc b/drush/views.drush.inc
index 07de3ad467d4..771c1c38dafd 100644
--- a/drush/views.drush.inc
+++ b/drush/views.drush.inc
@@ -483,7 +483,7 @@ function _views_drush_changestatus($viewnames = array(), $status = NULL) {
variable_set('views_defaults', $views_status);
views_invalidate_cache();
drush_log(dt("Views cache was cleared"), 'ok');
- menu_rebuild();
+ menu_router_rebuild();
drush_log(dt("Menu cache was cleared"), 'ok');
}
}
diff --git a/includes/admin.inc b/includes/admin.inc
index accad0a9fb5e..ce519fb25fb4 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -717,7 +717,7 @@ function views_ui_add_form_save_submit($form, &$form_state) {
$form_state['redirect'] = 'admin/structure/views';
}
$view->save();
- menu_rebuild();
+ menu_router_rebuild();
cache('cache_views')->flush();
cache_clear_all();
$form_state['redirect'] = 'admin/structure/views';
@@ -2149,7 +2149,7 @@ function views_ui_edit_view_form_submit($form, &$form_state) {
drupal_set_message(t('The view %name has been saved.', array('%name' => $form_state['view']->get_human_name())));
// Make sure menu items get rebuilt as neces
- menu_rebuild();
+ menu_router_rebuild();
// Clear the views cache.
cache('cache_views')->flush();
diff --git a/includes/view.inc b/includes/view.inc
index a896a5e5714c..45176d5b1bd6 100644
--- a/includes/view.inc
+++ b/includes/view.inc
@@ -1795,7 +1795,7 @@ function delete($clear = TRUE) {
if ($clear) {
cache_clear_all(); // this clears the block and page caches only.
- menu_rebuild(); // force a menu rebuild when a view is deleted.
+ menu_router_rebuild(); // force a menu rebuild when a view is deleted.
}
}
diff --git a/plugins/export_ui/views_ui.class.php b/plugins/export_ui/views_ui.class.php
index 4938248cbbee..6235b01b219d 100644
--- a/plugins/export_ui/views_ui.class.php
+++ b/plugins/export_ui/views_ui.class.php
@@ -365,7 +365,7 @@ function add_template_page($js, $input, $name, $step = NULL) {
function set_item_state($state, $js, $input, $item) {
ctools_export_set_object_status($item, $state);
- menu_rebuild();
+ menu_router_rebuild();
if (!$js) {
drupal_goto(ctools_export_ui_plugin_base_path($this->plugin));
diff --git a/tests/handlers/views_handler_filter_date.test b/tests/handlers/views_handler_filter_date.test
index bd313ac1c49f..cc1eced7899c 100644
--- a/tests/handlers/views_handler_filter_date.test
+++ b/tests/handlers/views_handler_filter_date.test
@@ -139,7 +139,7 @@ class ViewsHandlerFilterDateTest extends ViewsSqlTest {
$admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
$this->drupalLogin($admin_user);
- menu_rebuild();
+ menu_router_rebuild();
$this->drupalGet('admin/structure/views/view/test_filter_date_between/edit');
$this->drupalGet('admin/structure/views/nojs/config-item/test_filter_date_between/default/filter/created');
diff --git a/tests/views_analyze.test b/tests/views_analyze.test
index c21a4bb627bb..e9311e57f381 100644
--- a/tests/views_analyze.test
+++ b/tests/views_analyze.test
@@ -23,7 +23,7 @@ class ViewsAnalyzeTest extends ViewsSqlTest {
// @TODO Figure out why it's required to clear the cache here.
views_module_include('views_default', TRUE);
views_get_all_views(TRUE);
- menu_rebuild();
+ menu_router_rebuild();
// Add an admin user will full rights;
$this->admin = $this->drupalCreateUser(array('administer views'));
diff --git a/tests/views_exposed_form.test b/tests/views_exposed_form.test
index 65efe67bee0a..3b2933baad8e 100644
--- a/tests/views_exposed_form.test
+++ b/tests/views_exposed_form.test
@@ -23,7 +23,7 @@ class ViewsExposedFormTest extends ViewsSqlTest {
// @TODO Figure out why it's required to clear the cache here.
views_module_include('views_default', TRUE);
views_get_all_views(TRUE);
- menu_rebuild();
+ menu_router_rebuild();
}
/**
@@ -62,7 +62,7 @@ class ViewsExposedFormTest extends ViewsSqlTest {
function testExposedAdminUi() {
$admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
$this->drupalLogin($admin_user);
- menu_rebuild();
+ menu_router_rebuild();
$edit = array();
$this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
diff --git a/tests/views_handlers.test b/tests/views_handlers.test
index 7ce76db3f6ab..0a743613221a 100644
--- a/tests/views_handlers.test
+++ b/tests/views_handlers.test
@@ -25,7 +25,7 @@ class ViewsHandlersTest extends ViewsSqlTest {
function testFilterInOperatorUi() {
$admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
$this->drupalLogin($admin_user);
- menu_rebuild();
+ menu_router_rebuild();
$path = 'admin/structure/views/nojs/config-item/test_filter_in_operator_ui/default/filter/type';
$this->drupalGet($path);
diff --git a/tests/views_query.test b/tests/views_query.test
index ea4e2bcff125..3d1f6b714a3b 100644
--- a/tests/views_query.test
+++ b/tests/views_query.test
@@ -158,7 +158,7 @@ abstract class ViewsSqlTest extends ViewsTestCase {
// @TODO Figure out why it's required to clear the cache here.
views_module_include('views_default', TRUE);
views_get_all_views(TRUE);
- menu_rebuild();
+ menu_router_rebuild();
}
/**
diff --git a/views.install b/views.install
index 4e7f745ebe20..95ed67e97a96 100644
--- a/views.install
+++ b/views.install
@@ -593,7 +593,7 @@ function views_update_7001() {
->condition('link_path', 'admin/structure/views/%', 'LIKE')
->execute();
cache('cache_menu')->expire();
- menu_rebuild();
+ menu_router_rebuild();
}
}
diff --git a/views.module b/views.module
index 696fbf1b25cf..790afd66023b 100644
--- a/views.module
+++ b/views.module
@@ -302,7 +302,7 @@ function views_permission() {
* Implement hook_menu().
*/
function views_menu() {
- // Any event which causes a menu_rebuild could potentially mean that the
+ // Any event which causes a menu rebuild could potentially mean that the
// Views data is updated -- module changes, profile changes, etc.
views_invalidate_cache();
$items = array();
--
GitLab