diff --git a/src/main/scala/gitbucket/core/controller/WikiController.scala b/src/main/scala/gitbucket/core/controller/WikiController.scala index 625ba3453..a587c8eb5 100644 --- a/src/main/scala/gitbucket/core/controller/WikiController.scala +++ b/src/main/scala/gitbucket/core/controller/WikiController.scala @@ -39,7 +39,7 @@ trait WikiControllerBase extends ControllerBase { getWikiPage(repository.owner, repository.name, "Home").map { page => html.page("Home", page, getWikiPageList(repository.owner, repository.name), repository, hasWritePermission(repository.owner, repository.name, context.loginAccount), - getWikiSideBar(repository.owner, repository.name)) + getWikiPage(repository.owner, repository.name, "_Sidebar")) } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit") }) @@ -49,7 +49,7 @@ trait WikiControllerBase extends ControllerBase { getWikiPage(repository.owner, repository.name, pageName).map { page => html.page(pageName, page, getWikiPageList(repository.owner, repository.name), repository, hasWritePermission(repository.owner, repository.name, context.loginAccount), - getWikiSideBar(repository.owner, repository.name)) + getWikiPage(repository.owner, repository.name, "_Sidebar")) } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit") }) diff --git a/src/main/scala/gitbucket/core/service/WikiService.scala b/src/main/scala/gitbucket/core/service/WikiService.scala index b6a0c463e..29d8e56ce 100644 --- a/src/main/scala/gitbucket/core/service/WikiService.scala +++ b/src/main/scala/gitbucket/core/service/WikiService.scala @@ -71,20 +71,6 @@ trait WikiService { } } - /** - * Returns the wiki sidebar page. - */ - def getWikiSideBar(owner: String, repository: String): Option[WikiPageInfo] = { - using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git => - if(!JGitUtil.isEmpty(git)){ - JGitUtil.getFileList(git, "master", ".").find(_.name == "_Sidebar.md").map { file => - WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes), - file.author, file.time, file.commitId) - } - } else None - } - } - /** * Returns the content of the specified file. */