# HG changeset patch
# User Chris Cannam
# Date 1395407025 0
# Node ID cadec15c77d5c79c18e22ec062138379ccb80712
# Parent  467282ce64a4475c703fbc59e542151814c59cd0# Parent  4d8c768855c69c9e1df596d8c9247d0cf084e8e6
Merge from branch "live"

diff -r 467282ce64a4 -r cadec15c77d5 Gemfile
--- a/Gemfile	Fri Mar 21 13:03:27 2014 +0000
+++ b/Gemfile	Fri Mar 21 13:03:45 2014 +0000
@@ -7,6 +7,10 @@
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
 
+#cc -- CiteProc v1.0.0 broke our citations (CiteProc.process returns nil).
+# Until I've managed to work out what's up and fix that...
+gem "citeproc", "0.0.6"
+
 # Optional gem for LDAP authentication
 group :ldap do
   gem "net-ldap", "~> 0.3.1"
diff -r 467282ce64a4 -r cadec15c77d5 app/helpers/activities_helper.rb
--- a/app/helpers/activities_helper.rb	Fri Mar 21 13:03:27 2014 +0000
+++ b/app/helpers/activities_helper.rb	Fri Mar 21 13:03:45 2014 +0000
@@ -138,7 +138,7 @@
       e.event_author unless !e.respond_to?(:event_author) 
     end.compact
     institutions = authors.map do |a|
-      if a.respond_to?(:ssamr_user_detail) and !a.ssamr_user_detail.nil?
+      if a.respond_to?(:ssamr_user_detail) and !a.ssamr_user_detail.nil? and a.ssamr_user_detail.institution_name != "none"
         a.ssamr_user_detail.institution_name
       end
     end
diff -r 467282ce64a4 -r cadec15c77d5 plugins/redmine_bibliography/app/helpers/publications_helper.rb
--- a/plugins/redmine_bibliography/app/helpers/publications_helper.rb	Fri Mar 21 13:03:27 2014 +0000
+++ b/plugins/redmine_bibliography/app/helpers/publications_helper.rb	Fri Mar 21 13:03:45 2014 +0000
@@ -96,7 +96,10 @@
 
   def print_ieee_format(publication)
     Rails.cache.fetch("publication-#{publication.id}-ieee") do
-      publication.print_entry(:ieee).html_safe
+      entry = publication.print_entry(:ieee)
+      if entry
+        entry.html_safe
+      end
     end
   end