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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c676b7c..e76a1e3 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -122,6 +122,7 @@ Views 4.7.x-dev
     o #73183: More missing t() in default views
     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

diff --git a/views.module b/views.module
index f165c0a..64c1d2d 100644 (file)
--- a/views.module
+++ b/views.module
@@ -924,7 +924,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;
   }
 

diff --git a/views_ui.module b/views_ui.module
index cad230e..466e2a2 100644 (file)
--- a/views_ui.module
+++ b/views_ui.module
@@ -206,6 +206,7 @@ function views_ui_admin_page() {
     if ($view->menu) {
       $provides[] = 'Menu';
     }
+
     $items[] = array(
       $view->name, 
       views_get_title($view, 'admin'),