Commit e112da07 authored by tim.plunkett's avatar tim.plunkett
Browse files

menu_rebuild() renamed to menu_router_rebuild().

parent 5844ec54
......@@ -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');
}
}
......
......@@ -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();
......
......@@ -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.
}
}
......
......@@ -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));
......
......@@ -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');
......
......@@ -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'));
......
......@@ -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');
......
......@@ -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);
......
......@@ -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();
}
/**
......
......@@ -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();
}
}
......
......@@ -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();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment