Merge pull request #4254 from pavog/patch-2

Only use AboutApp when the setting "setting.app_about" is set
cachethq · Apr 1, 2021 · a86a3d8 · a86a3d8
2 parents 3c2479d + d5ba835
commit a86a3d8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
@@ -61,7 +61,13 @@ public function __construct(DateFactory $dates, Repository $config)
      */
     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->withAppAnalyticsGoSquared($this->config->get('setting.app_analytics_gs'));
         $view->withAppAnalyticsPiwikUrl($this->config->get('setting.app_analytics_piwik_url'));