Merged in some changes missed in 12.6.1 as they weren't marked as ready to merge.

- Legacy-Id: 10700
This commit is contained in:
Henrik Levkowetz 2016-01-15 16:45:18 +00:00
commit b05605308f
2 changed files with 2 additions and 2 deletions

View file

@ -675,7 +675,7 @@ def document_bibtex(request, name, rev=None):
latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
replaced_by = [d.name for d in doc.related_that("replaces")]
published = doc.latest_event(type="published_rfc")
rfc = latest_revision.doc if latest_revision.doc.get_state_slug() == "rfc" else None
rfc = latest_revision.doc if latest_revision and latest_revision.doc.get_state_slug() == "rfc" else None
if rev != None and rev != doc.rev:
# find the entry in the history

View file

@ -11,7 +11,7 @@
@misc{% templatetag openbrace %}rfc{{ doc.rfc_number }},
series = {Request for Comments},
number= {{ doc.rfc_number }},
howpublished= {% templatetag openbrace %}{{ doc.stream }} RFC {{ doc.rfc_number }} ({{ doc.intended_std_level }}){% templatetag closebrace %},
howpublished= {% templatetag openbrace %}{{ doc.stream }} RFC {{ doc.rfc_number }}{% if doc.doc.intended_std_level %} ({{ doc.intended_std_level }}){% endif %}{% templatetag closebrace %},
publisher = {RFC Editor},
doi = {% templatetag openbrace %}10.17487/rfc{{ doc.rfc_number }}{% templatetag closebrace %},
url = {https://rfc-editor.org/rfc/rfc{{ doc.rfc_number }}.txt},{% else %}