diff --git a/src/main/scala/gitbucket/core/controller/WikiController.scala b/src/main/scala/gitbucket/core/controller/WikiController.scala index 0c59854d1..41ea9c5ef 100644 --- a/src/main/scala/gitbucket/core/controller/WikiController.scala +++ b/src/main/scala/gitbucket/core/controller/WikiController.scala @@ -67,7 +67,8 @@ trait WikiControllerBase extends ControllerBase { repository, isEditable(repository), getWikiPage(repository.owner, repository.name, "_Sidebar", branch), - getWikiPage(repository.owner, repository.name, "_Footer", branch) + getWikiPage(repository.owner, repository.name, "_Footer", branch), + branch ) } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit") }) @@ -84,7 +85,8 @@ trait WikiControllerBase extends ControllerBase { repository, isEditable(repository), getWikiPage(repository.owner, repository.name, "_Sidebar", branch), - getWikiPage(repository.owner, repository.name, "_Footer", branch) + getWikiPage(repository.owner, repository.name, "_Footer", branch), + branch ) } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit") }) diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html index 494534935..5497ab5bc 100644 --- a/src/main/twirl/gitbucket/core/wiki/page.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html @@ -4,7 +4,8 @@ repository: gitbucket.core.service.RepositoryService.RepositoryInfo, isEditable: Boolean, sidebar: Option[gitbucket.core.service.WikiService.WikiPageInfo], - footer: Option[gitbucket.core.service.WikiService.WikiPageInfo])(implicit context: gitbucket.core.controller.Context) + footer: Option[gitbucket.core.service.WikiService.WikiPageInfo], + branch: String)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers @import gitbucket.core.service.WikiService @gitbucket.core.html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ @@ -62,7 +63,7 @@ @helpers.renderMarkup( filePath = sidebarPage.name.split("/").toList, fileContent = sidebarPage.content, - branch = "master", + branch = branch, repository = repository, enableWikiLink = true, enableRefsLink = false, @@ -95,7 +96,7 @@ @helpers.renderMarkup( filePath = page.name.split("/").toList, fileContent = page.content, - branch = "master", + branch = branch, repository = repository, enableWikiLink = true, enableRefsLink = false, @@ -112,7 +113,7 @@ @helpers.renderMarkup( filePath = footerPage.name.split("/").toList, fileContent = footerPage.content, - branch = "master", + branch = branch, repository = repository, enableWikiLink = true, enableRefsLink = false,