From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 10 Nov 2013 09:49:47 +0000 (+0000)
Subject: Merged r12245 (#15235).
X-Git-Tag: 2.3.4~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7632d173e31698607ccb7ac5030e66f9ce7a07cc;p=redmine.git

Merged r12245 (#15235).

git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12259 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/wiki/show.api.rsb b/app/views/wiki/show.api.rsb
index c35316104..8e082e123 100644
--- a/app/views/wiki/show.api.rsb
+++ b/app/views/wiki/show.api.rsb
@@ -6,7 +6,7 @@ api.wiki_page do
   api.text @content.text
   api.version @content.version
   api.author(:id => @content.author_id, :name => @content.author.name)
-  api.comments @page.content.comments
+  api.comments @content.comments
   api.created_on @page.created_on
   api.updated_on @content.updated_on
 
diff --git a/test/integration/api_test/wiki_pages_test.rb b/test/integration/api_test/wiki_pages_test.rb
index 02c764fa7..d299911a6 100644
--- a/test/integration/api_test/wiki_pages_test.rb
+++ b/test/integration/api_test/wiki_pages_test.rb
@@ -90,6 +90,7 @@ class Redmine::ApiTest::WikiPagesTest < Redmine::ApiTest::Base
       assert_select 'version', :text => '2'
       assert_select 'text'
       assert_select 'author'
+      assert_select 'comments', :text => 'Small update'
       assert_select 'created_on'
       assert_select 'updated_on'
     end