Commit fac225780cf5579a566977ee78e320ad3f40fd0e
1 parent
5a949e60
Exists in
spb-stable
and in
2 other branches
A bit clearer naming for gollum_wiki.
Showing
1 changed file
with
6 additions
and
4 deletions
Show diff stats
app/models/wiki_page.rb
... | ... | @@ -175,7 +175,8 @@ class WikiPage |
175 | 175 | end |
176 | 176 | |
177 | 177 | def save(method, *args) |
178 | - if valid? && wiki.send(method, *args) | |
178 | + project_wiki = wiki | |
179 | + if valid? && project_wiki.send(method, *args) | |
179 | 180 | |
180 | 181 | page_details = if method == :update_page |
181 | 182 | @page.path |
... | ... | @@ -183,14 +184,15 @@ class WikiPage |
183 | 184 | title |
184 | 185 | end |
185 | 186 | |
186 | - page_title, page_dir = wiki.page_title_and_dir(page_details) | |
187 | - @page = wiki.wiki.paged(page_title, page_dir) | |
187 | + page_title, page_dir = project_wiki.page_title_and_dir(page_details) | |
188 | + gollum_wiki = project_wiki.wiki | |
189 | + @page = gollum_wiki.paged(page_title, page_dir) | |
188 | 190 | |
189 | 191 | set_attributes |
190 | 192 | |
191 | 193 | @persisted = true |
192 | 194 | else |
193 | - errors.add(:base, wiki.error_message) if wiki.error_message | |
195 | + errors.add(:base, project_wiki.error_message) if project_wiki.error_message | |
194 | 196 | @persisted = false |
195 | 197 | end |
196 | 198 | @persisted | ... | ... |