From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 26 Mar 2018 13:50:35 +0000 (+0200)
Subject: Fix use of default biblio_style
X-Git-Tag: 2.3.1~133^2~13
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=953df3089463f3c240ba89adcf966064ebbc642a;p=features.git

Fix use of default biblio_style

Fixes: #11088
---

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index b709b16a54..827823d8ba 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -394,7 +394,7 @@ BufferParams::BufferParams()
 	papersize = PAPER_DEFAULT;
 	orientation = ORIENTATION_PORTRAIT;
 	use_geometry = false;
-	biblio_style = "plain";
+	biblio_style = string();
 	use_bibtopic = false;
 	multibib = string();
 	use_indices = false;
@@ -3426,6 +3426,9 @@ bool BufferParams::addCiteEngine(vector<string> const & engine)
 
 string const & BufferParams::defaultBiblioStyle() const
 {
+	if (!biblio_style.empty())
+		return biblio_style;
+
 	map<string, string> const & bs = documentClass().defaultBiblioStyle();
 	auto cit = bs.find(theCiteEnginesList.getTypeAsString(citeEngineType()));
 	if (cit != bs.end())
diff --git a/status.23x b/status.23x
index d86dbd5bff..7f78e1dce3 100644
--- a/status.23x
+++ b/status.23x
@@ -122,6 +122,9 @@ What's new
 - Take actual font height into account when drawing placeholder box
   for graphics (bug 11048).
 
+- Correctly set degault bibliography style in the Document Settings
+  dialog (bug 11088).
+
 
 * INTERNALS