db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-14 10:13:05 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
David Steele 2016-06-04 11:40:33 -04:00
parent 8ddfab0cbc
commit 1ddfb1e453
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/lib/BackRestDoc/Common/DocRender.pm
View File

@ -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())
{

4
doc/xml/release.xml
View File

@ -90,6 +90,10 @@
<release-item>
<p>Fixed DTD search path that did not work properly when <setting>--doc-path</setting> was used.</p>
</release-item>
<release-item>
<p>Fixed <backrest/>-specific xml that was loaded for non-<backrest/> projects.</p>
</release-item>
</release-bug-list>
<release-feature-list>