Commit ecbacd97 authored by merlinofchaos's avatar merlinofchaos
Browse files

Uninitialized $menu_args in new menu code

parent 0af2fa66
...@@ -100,7 +100,7 @@ function views_menu_inline_items(&$items) { ...@@ -100,7 +100,7 @@ function views_menu_inline_items(&$items) {
else { else {
// Do substitution on args. // Do substitution on args.
$use_view = $use_menu = FALSE; $use_view = $use_menu = FALSE;
$view_args = $menu_path = array(); $menu_args = $view_args = $menu_path = array();
foreach (explode('/', $url) as $num => $element) { foreach (explode('/', $url) as $num => $element) {
if ($element{0} == '$') { if ($element{0} == '$') {
......
...@@ -155,7 +155,6 @@ function views_ui_add_menu_items(&$items, $view, $url, $base = TRUE, $args = arr ...@@ -155,7 +155,6 @@ function views_ui_add_menu_items(&$items, $view, $url, $base = TRUE, $args = arr
'access' => user_access('administer views'), 'access' => user_access('administer views'),
'type' => MENU_CALLBACK); 'type' => MENU_CALLBACK);
} }
$items[] = array('path' => "$url/view", $items[] = array('path' => "$url/view",
'title' => t('View'), 'title' => t('View'),
'callback' => 'views_page', 'callback' => 'views_page',
...@@ -196,7 +195,7 @@ function views_ui_admin_page() { ...@@ -196,7 +195,7 @@ function views_ui_admin_page() {
$numViews = 25; $numViews = 25;
drupal_set_title(t('administer views')); drupal_set_title(t('Administer views'));
$result = pager_query("SELECT vid, name, description, menu_title, page_title, block_title, url, page, menu, block FROM {view_view} ORDER BY name", $numViews); $result = pager_query("SELECT vid, name, description, menu_title, page_title, block_title, url, page, menu, block FROM {view_view} ORDER BY name", $numViews);
...@@ -219,10 +218,10 @@ function views_ui_admin_page() { ...@@ -219,10 +218,10 @@ function views_ui_admin_page() {
implode(', ', $provides), implode(', ', $provides),
$url, $url,
theme('links', array( theme('links', array(
array('title' => t('Edit'), 'href' => "admin/build/views/$view->vid/edit"), array('title' => t('Edit'), 'href' => "admin/build/views/$view->name/edit"),
array('title' => t('Export'), 'href' => "admin/build/views/$view->vid/export"), array('title' => t('Export'), 'href' => "admin/build/views/$view->name/export"),
array('title' => t('Delete'), 'href' => "admin/build/views/delete/$view->vid"), array('title' => t('Delete'), 'href' => "admin/build/views/delete/$view->vid"),
array('title' => t('Clone'), 'href' => "admin/build/views/$view->vid/clone"), array('title' => t('Clone'), 'href' => "admin/build/views/$view->name/clone"),
)) ))
); );
} }
...@@ -1757,6 +1756,9 @@ function views_edit_view_submit($form_id, $form) { ...@@ -1757,6 +1756,9 @@ function views_edit_view_submit($form_id, $form) {
if ($form['op'] == t('Save')) { if ($form['op'] == t('Save')) {
$args = explode('/', $_GET['q']); $args = explode('/', $_GET['q']);
if ($args[0] == 'admin' && $args[1] == 'build' && $args [2] == 'views') {
return 'admin/build/views';
}
array_pop($args); array_pop($args);
return implode('/', $args); return implode('/', $args);
} }
......
Markdown is supported
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