Commit dac6c57e authored by merlinofchaos's avatar merlinofchaos
Browse files

#110648: Block title not showing up in admin if view only provides block.

parent 33a2b658
......@@ -116,6 +116,7 @@ Views --dev
o 106464: Taxonomy links showed up as Array | Array | Array rather than the taxonomy terms.
o 110212: Text patch to clarify date fields.
o 110299: Change nodes per block max size from 2 chars wide to 3, as it was meant to be.
o 110648: Block title not showing up in admin if view only provides block.
New features:
o 107471: Spiffy new theme wizard features. Thanks Crell!!
......
......@@ -618,7 +618,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' && $view->menu_title)
if (($context == 'menu' || $context == 'admin' )&& $view->menu_title)
return $view->menu_title;
if ($context == 'block-info') {
......@@ -640,11 +640,11 @@ function views_get_title($view, $context = 'menu', $args = NULL) {
}
}
if (!$title && ($context == 'menu' || $context == 'page')) {
if (!$title && ($context == 'menu' || $context == 'page' || $context == 'admin')) {
$title = $view->page_title;
}
if (!$title && $context == 'block') {
if (!$title && $context == 'block' || $context == 'admin') {
$title = $view->block_title;
}
......
......@@ -178,7 +178,7 @@ function views_ui_admin_page() {
}
$items[] = array(
$view->name,
views_get_title($view, 'menu'),
views_get_title($view, 'admin'),
$view->description,
implode(', ', $provides),
$url,
......
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