diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-07-21 17:46:33 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-07-21 17:46:33 +0530 |
| commit | 2ba5e6259e14f9bc9f60201da249a5a313bbd0db (patch) | |
| tree | e20b719a8868f0cbd314310f29441e1e4af72c54 | |
| parent | 71b8ca038b38a12fdc1dc7463b57a67fb8b7fcb2 (diff) | |
| download | gitlab-ce-20079-new-wiki-page-500.tar.gz | |
Don't use `params[:id]` while building `markdown_preview_path`.20079-new-wiki-page-500
1. Instead, use `@page.title`, since it's always guaranteed to be around
in a wiki.
2. `params[:id]` is _not_ always guaranteed to be around - if a page is
created with errors, `render :edit` is called, and `params[:id]` is
`nil`.
3. More context: https://gitlab.com/gitlab-org/gitlab-ce/issues/20079#note_13223240
| -rw-r--r-- | app/views/layouts/project.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 2049b204956..d03d5e2ca6a 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -6,7 +6,7 @@ - content_for :scripts_body_top do - project = @target_project || @project - if @project_wiki && @page - - markdown_preview_path = namespace_project_wiki_markdown_preview_path(project.namespace, project, params[:id]) + - markdown_preview_path = namespace_project_wiki_markdown_preview_path(project.namespace, project, @page.title) - else - markdown_preview_path = markdown_preview_namespace_project_path(project.namespace, project) - if current_user |