Merge remote-tracking branch 'mike/master' into dev

This commit is contained in:
Mario Vavti 2018-12-06 12:50:23 +01:00
commit 7f65d82a74

View File

@ -375,8 +375,7 @@ class Display extends \Zotlabs\Web\Controller {
}
$o .= '</noscript>';
if ($items[0]['title'])
\App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title'];
\App::$page['title'] = (($items[0]['title']) ? $items[0]['title'] . " - " . \App::$page['title'] : \App::$page['title']);
$o .= conversation($items, 'display', $update, 'client');
}