lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4254 from pavog/patch-2

Browse Source 
Only use AboutApp when the setting "setting.app_about" is set
This commit is contained in:
James Brooks
2021-04-01 15:47:41 +01:00
committed by GitHub
parent 3c2479d84b d5ba835eed
commit a86a3d86b3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Composers/AppComposer.php
+7 -1
View File
@@ -61,7 +61,13 @@ class AppComposer
*/ */
public function compose(View $view) public function compose(View $view)
{ {
$view->withAboutApp(Markdown::convertToHtml($this->config->get('setting.app_about'))); if ($this->config->get('setting.app_about')) {
$about = Markdown::convertToHtml($this->config->get('setting.app_about'));
} else {
$about = '';
}
$view->withAboutApp($about);
$view->withAppAnalytics($this->config->get('setting.app_analytics')); $view->withAppAnalytics($this->config->get('setting.app_analytics'));
$view->withAppAnalyticsGoSquared($this->config->get('setting.app_analytics_gs')); $view->withAppAnalyticsGoSquared($this->config->get('setting.app_analytics_gs'));
$view->withAppAnalyticsPiwikUrl($this->config->get('setting.app_analytics_piwik_url')); $view->withAppAnalyticsPiwikUrl($this->config->get('setting.app_analytics_piwik_url'));