From ef7cd1ad46c0713229fd6b9343b93f3665a182ae Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sun, 8 Mar 2020 22:52:39 +0300
Subject: [PATCH] fix(core): fix incorrect data merging of manifest and
 settings for plugins and themes #404

---
 site/themes/default/templates/partials/base.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/themes/default/templates/partials/base.html b/site/themes/default/templates/partials/base.html
index beea7e8d..59b3631f 100644
--- a/site/themes/default/templates/partials/base.html
+++ b/site/themes/default/templates/partials/base.html
@@ -4,9 +4,9 @@
         {% block head %}
             <meta charset="{{ registry.flextype.charset|lower }}">
             <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-            <meta name="description" content="{% if entry.description %}{{ entry.description }}{% else %}{{ registry.plugins.site.description }}{% endif %}">
-            <meta name="keywords" content="{% if entry.keywords %}{{ entry.keywords }}{% else %}{{ registry.plugins.site.keywords }}{% endif %}">
-            <meta name="robots" content="{% if entry.robots %}{{ entry.robots }}{% else %}{{ registry.plugins.site.robots }}{% endif %}">
+            <meta name="description" content="{% if entry.description %}{{ entry.description }}{% else %}{{ registry.plugins.site.settings.description }}{% endif %}">
+            <meta name="keywords" content="{% if entry.keywords %}{{ entry.keywords }}{% else %}{{ registry.plugins.site.settings.keywords }}{% endif %}">
+            <meta name="robots" content="{% if entry.robots %}{{ entry.robots }}{% else %}{{ registry.plugins.site.settings.robots }}{% endif %}">
             <meta name="generator" content="Powered by Flextype {{ FLEXTYPE_VERSION }}"/>
 
             {% do
@@ -15,7 +15,7 @@
             <title>
                 {% if entry.title %}{{ entry.title|e('html') }}
                     |
-                {% endif %}{{ registry.plugins.site.title|e('html') }}</title>
+                {% endif %}{{ registry.plugins.site.settings.title|e('html') }}</title>
 
             <link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i,900,900i&display=swap&subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
 
@@ -39,7 +39,7 @@
                 <div class="w-full lg:w-2/12
                           text-center lg:text-left
                           float-left text-white py-2 uppercase tracking-wide">
-                    <a href="{{ url() }}" class="w-full lg:w-2/12 text-center text-base no-underline">{{ registry.plugins.site.title|e('html') }}</a>
+                    <a href="{{ url() }}" class="w-full lg:w-2/12 text-center text-base no-underline">{{ registry.plugins.site.settings.title|e('html') }}</a>
                 </div>
                 <div class="w-full float-right lg:w-9/12 font-noirpro-semibold">
                     <div class="text-right p-2">