diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-12 13:07:40 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-12 13:07:40 -0700 |
| commit | 4e52b417b748446d58484815237c4502f28420cc (patch) | |
| tree | 1a0fd7c4929092a5cbe458e09ff270e56153fb4f | |
| parent | 3e50311e30e304c8b399cf0b33c8b90fecc94626 (diff) | |
| parent | 6e4b359ff102fdbf9ce516526858ce1dcaa088d7 (diff) | |
Merge branch 'hotfix/0.11.0.11' into rails-3-develop
| -rw-r--r-- | app/views/general/blog.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/general/blog.html.erb b/app/views/general/blog.html.erb index 7146aab5d..ef587421e 100644 --- a/app/views/general/blog.html.erb +++ b/app/views/general/blog.html.erb @@ -23,7 +23,7 @@ <% @blog_items.each do |item| %> <div class="blog_post"> <h2 id="<%= Time.parse(item['pubDate'][0]).to_i %>"><a href="<%=item['link'][0]%>"><%=h item['title'][0] %></a></h2> - <p class="subtitle"><%= _("Posted on {{date}} by {{author}}", :date=>simple_date(Time.parse(item['pubDate'][0])), :author=>item['creator'][0]) %></p> + <p class="subtitle"><%= _("Posted on {{date}} by {{author}}", :date=>simple_date(Time.parse(item['pubDate'][0])), :author=> item['creator'] ? item['creator'][0] : item['author'][0]) %></p> <div> <% if item['encoded'] %> <%= raw item['encoded'][0] %> |