From 1ddfb1e453aef26590b649c77330d5206978917d Mon Sep 17 00:00:00 2001 From: David Steele Date: Sat, 4 Jun 2016 11:40:33 -0400 Subject: [PATCH] Fixed pgBackRest-specific xml that was loaded for non-pgBackRest projects. --- doc/lib/BackRestDoc/Common/DocRender.pm | 11 +++-------- doc/xml/release.xml | 4 ++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/lib/BackRestDoc/Common/DocRender.pm b/doc/lib/BackRestDoc/Common/DocRender.pm index 0794e7ed7..6de386687 100644 --- a/doc/lib/BackRestDoc/Common/DocRender.pm +++ b/doc/lib/BackRestDoc/Common/DocRender.pm @@ -175,20 +175,15 @@ sub new if (defined($self->{strRenderOutKey})) { # Copy page data to self - my $oRenderOut = $self->{oManifest}->renderOutGet($self->{strType} eq 'latex' ? 'pdf' : $self->{strType}, $self->{strRenderOutKey}); + my $oRenderOut = + $self->{oManifest}->renderOutGet($self->{strType} eq 'latex' ? 'pdf' : $self->{strType}, $self->{strRenderOutKey}); - # Determine if this is a custom source which signals special handling for different projects. - my $strSourceType = ${$self->{oManifest}->sourceGet('reference')}{strSourceType}; - - if (defined($strSourceType) && $strSourceType eq 'custom') - { - # Get the reference and release xml if this is the backrest project + # If these are the backrest docs then load the reference if ($self->{oManifest}->isBackRest()) { $self->{oReference} = new BackRestDoc::Common::DocConfig(${$self->{oManifest}->sourceGet('reference')}{doc}, $self); } - } if (defined($$oRenderOut{source}) && $$oRenderOut{source} eq 'reference' && $self->{oManifest}->isBackRest()) { diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 8a0a33406..9435313e2 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -90,6 +90,10 @@

Fixed DTD search path that did not work properly when --doc-path was used.

+ + +

Fixed -specific xml that was loaded for non- projects.

+