[MERGE] Forward port of 11.0 to 12.0

This commit is contained in:
Martin Trigaux 2019-11-05 15:14:19 +01:00
commit 6571be3116

View File

@ -105,7 +105,13 @@ if toctree:
def resolve(old_resolve, tree, docname, *args, **kwargs):
if docname == tree.env.config.master_doc:
return resolve_content_toctree(tree.env, docname, *args, **kwargs)
return old_resolve(tree, docname, *args, **kwargs)
toc = old_resolve(tree, docname, *args, **kwargs)
if toc is None:
return None
navbarify(toc[0], navbar=kwargs.pop('navbar', None))
return toc
@monkey(sphinx.environment.BuildEnvironment)
def resolve_toctree(old_resolve, self, docname, *args, **kwargs):