Fix the issue where author is displaying as array

layouts/archive/list.html

@@ -9,7 +9,6 @@
     {{ .Content }}
   </div>
 </header>
-<<<<<<< HEAD
 <main class="main archive">
   <div class="archive__container">
     {{ $filteredPages := .Site.RegularPages }}
@@ -20,20 +19,6 @@
   {{ if gt (len $filteredPages) 0 }}
     {{ $paginator := .Paginate ($filteredPages.GroupByDate ($.Param "archiveGroupByDate" | default "2006")) ($.Param "archivePaginate") }}
     {{ range ($paginator).PageGroups }}
-=======
-{{ if .Pages }}
-  <main class="main archive">
-    <div class="archive__container">
-      {{ $filteredPages := .Site.RegularPages }}
-      {{ range $.Param "notAllowedTypesInArchive" }}
-        {{ $filteredPages = (where $filteredPages "Type" "!=" (lower .)) }}
-      {{ end }}
-  
-      {{ $paginator := .Paginate ($filteredPages.GroupByDate ($.Param "archiveGroupByDate" | default "2006")) ($.Param "archivePaginate") }}
-  
-    {{ if $paginator }}
-      {{ range ($paginator).PageGroups }}
->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
       <span class="archive__key" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">{{ .Key }}</span>
       <ul class="archive__ul" data-dir="{{ $.Param "languagedir" | default "ltr" }}">
         {{ range .Pages }}
@@ -51,7 +36,6 @@
         </li>
         {{ end }}
       </ul>
-<<<<<<< HEAD
     {{ end }}
   {{ else }}
     {{ i18n "no-contents" | default "There is nothing to display" }}
@@ -66,17 +50,3 @@
   {{ partial "script/archive-script" . }}
 </main>
 {{ end }}
-=======
-      {{ end }}    
-    {{ end }}
-    </div>
-    <div class="grow"></div>
-    {{ partial "pagination/pagination" . }}
-    <div class="hide">
-      {{ partial "search/site-search" . }}
-    </div>
-    {{ partial "script/archive-script" . }}
-  </main>
-{{ end }}
-{{ end }}
->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a

layouts/partials/body/infos.html

@@ -6,11 +6,7 @@
   {{ end }}
   &nbsp;&middot;&nbsp; <span class="single__info" title="{{ i18n "tooltip-reading-time" }}"> {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }}&nbsp;{{ .ReadingTime }}&nbsp;{{ i18n "reading-time" }} </span>
   {{ with .Params.Author }}
-<<<<<<< HEAD
+  &nbsp;&middot;&nbsp; <span class="single__info" title="{{ i18n "single-writtenBy" }}">{{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
-  &nbsp;&middot;&nbsp; <span class="single__info" title="{{ i18n "single-writtenBy" }}">{{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
-=======
-  &nbsp;&middot;&nbsp; <span class="single__info" title="{{ i18n "single-writtenBy" }}">{{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}✍️{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
   {{ end }}
   <span class="single__info">
     {{ if (and .Site.Params.enableBusuanzi .Site.Params.busuanziPagePV) }} &middot; {{ ($.Site.Params.pagePvIcon | safeHTML) | default "👀" }}<span id="busuanzi_value_page_pv">...</span> {{ i18n "counter-page-pv" }}{{ end }}

layouts/partials/summary/card.html

@@ -8,11 +8,7 @@
       {{ end }} 
       <span title="{{ i18n "tooltip-reading-time" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}"> &middot; {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }}</span>
       {{ with $.Param "author" }}
-<<<<<<< HEAD
+      &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
-      &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
-=======
-      &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}✍️{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
       {{ end }}
     </h6>
   </header>

layouts/partials/summary/classic.html

@@ -25,11 +25,7 @@
           {{ end }}
           <span title="{{ i18n "tooltip-reading-time" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}"> &middot; {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }}&nbsp;{{ .ReadingTime }}&nbsp;{{ i18n "reading-time" }} </span>
           {{ with $.Param "author" }}
-<<<<<<< HEAD
+          &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
-          &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
-=======
-          &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}✍️{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
           {{ end }}
         </h6>
       </header>

layouts/partials/summary/compact.html

@@ -11,11 +11,7 @@
           {{ end }} 
           <span title="{{ i18n "tooltip-reading-time" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}"> &middot; {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }}</span>
           {{ with $params.Author }}
-<<<<<<< HEAD
+          &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
-          &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }}&nbsp;{{ . }}</span>
-=======
-          &middot; <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}✍️{{ end }}&nbsp;{{ partial "head/author.html" . }}</span>
->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
           {{ end }}
         </h6>
       </header>