Commit b3069171 authored by merlinofchaos's avatar merlinofchaos
Browse files

#119082: Fixed a problem with view titles on the admin page.

parent 5886592e
......@@ -145,6 +145,7 @@ Views --dev
o #115699: Don't show RSS feeds on block views (again)
o #88947: If NULL query don't try to run it at all.
o #113332: NULL entries for vocabulary summaries with nodes without terms.
o #119082: Fixed a problem with view titles on the admin page.
New features:
o #105620: (Attempt 2) allow modules to alter views tables + arguments
......
......@@ -670,7 +670,7 @@ function views_get_url($view, $args) {
* Figure out what the title of a view should be.
*/
function views_get_title($view, $context = 'menu', $args = NULL) {
if (($context == 'menu' || $context == 'admin' )&& $view->menu_title)
if (($context == 'menu' || $context == 'admin') && $view->menu_title)
return $view->menu_title;
if ($context == 'block-info') {
......@@ -696,7 +696,7 @@ function views_get_title($view, $context = 'menu', $args = NULL) {
$title = $view->page_title;
}
if (!$title && $context == 'block' || $context == 'admin') {
if (!$title && ($context == 'block' || $context == 'admin')) {
$title = $view->block_title;
}
......
......@@ -217,6 +217,7 @@ function views_ui_admin_page() {
if ($view->menu) {
$provides[] = 'Menu';
}
$items[] = array(
$view->name,
views_get_title($view, 'admin'),
......
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