From 8543b51b6b95cda08f917866c4b41f55150a2fd6 Mon Sep 17 00:00:00 2001
From: Mickael Kerjean <mickael@kerjean.me>
Date: Sun, 8 Aug 2021 22:01:56 +1000
Subject: [PATCH] merge

---
 client/pages/filespage.js |  2 +-
 server/common/config.go   | 40 +++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/client/pages/filespage.js b/client/pages/filespage.js
index 5ed717b1..dcd099cd 100644
--- a/client/pages/filespage.js
+++ b/client/pages/filespage.js
@@ -266,7 +266,7 @@ export class FilesPage extends React.Component {
                     <InfiniteScroll pageStart={0} loader={$moreLoading} hasMore={this.state.files.length > 70}
                                     initialLoad={false} useWindow={false} loadMore={this.loadMore.bind(this)} threshold={100}>
                       <NgShow className="container" cond={!!this.state.is_search || !this.state.loading}>
-                        <NgIf cond={this.state.path === "/"}>
+                        <NgIf cond={this.state.path === "/" && CONFIG["hide_menubar"] === false}>
                           <FrequentlyAccess files={this.state.frequents} />
                         </NgIf>
                         <Submenu path={this.state.path} sort={this.state.sort} view={this.state.view} onSearch={this.onSearch.bind(this)} onViewUpdate={(value) => this.onView(value)} onSortUpdate={(value) => this.onSort(value)} accessRight={this.state.metadata || {}} selected={this.state.selected}></Submenu>
diff --git a/server/common/config.go b/server/common/config.go
index 341e4918..17a1e22b 100644
--- a/server/common/config.go
+++ b/server/common/config.go
@@ -349,28 +349,28 @@ func (this Configuration) Save() Configuration {
 
 func (this Configuration) Export() interface{} {
 	return struct {
-		Editor        string            `json:"editor"`
-		ForkButton    bool              `json:"fork_button"`
-		DisplayHidden bool              `json:"display_hidden"`
-		AutoConnect   bool              `json:"auto_connect"`
-		Name          string            `json:"name"`
-		UploadButton  bool              `json:"upload_button"`
-		Connections   interface{}       `json:"connections"`
-		EnableShare   bool              `json:"enable_share"`
-		Logout        string            `json:"logout"`
-		MimeTypes     map[string]string `json:"mime"`
+		Editor         string            `json:"editor"`
+		ForkButton     bool              `json:"fork_button"`
+		DisplayHidden  bool              `json:"display_hidden"`
+		AutoConnect    bool              `json:"auto_connect"`
+		Name           string            `json:"name"`
+		UploadButton   bool              `json:"upload_button"`
+		Connections    interface{}       `json:"connections"`
+		EnableShare    bool              `json:"enable_share"`
+		Logout         string            `json:"logout"`
+		MimeTypes      map[string]string `json:"mime"`
 		UploadPoolSize int               `json:"upload_pool_size"`
 	}{
-		Editor:        this.Get("general.editor").String(),
-		ForkButton:    this.Get("general.fork_button").Bool(),
-		DisplayHidden: this.Get("general.display_hidden").Bool(),
-		AutoConnect:   this.Get("general.auto_connect").Bool(),
-		Name:          this.Get("general.name").String(),
-		UploadButton:  this.Get("general.upload_button").Bool(),
-		Connections:   this.Conn,
-		EnableShare:   this.Get("features.share.enable").Bool(),
-		Logout:        this.Get("general.logout").String(),
-		MimeTypes:     AllMimeTypes(),
+		Editor:         this.Get("general.editor").String(),
+		ForkButton:     this.Get("general.fork_button").Bool(),
+		DisplayHidden:  this.Get("general.display_hidden").Bool(),
+		AutoConnect:    this.Get("general.auto_connect").Bool(),
+		Name:           this.Get("general.name").String(),
+		UploadButton:   this.Get("general.upload_button").Bool(),
+		Connections:    this.Conn,
+		EnableShare:    this.Get("features.share.enable").Bool(),
+		Logout:         this.Get("general.logout").String(),
+		MimeTypes:      AllMimeTypes(),
 		UploadPoolSize: this.Get("general.upload_pool_size").Int(),
 	}
 }