[LyX/2.1.x] Fix bug #9296. The key may be multiple keys.

[Richard Heck]

commit bdb6abf9b717a098a06c1cb13c8b0afabc71ed15
Author: Richard Heck <rgh...@lyx.org>
Date:   Tue Oct 14 15:41:42 2014 -0400

    Fix bug #9296. The key may be multiple keys.
    
    (cherry picked from commit 080a4d84e295db1f2c2589af46fcfa981a716406)

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 55d65de..22da852 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -929,7 +929,9 @@ docstring const BiblioInfo::getLabel(vector<docstring> keys,
 
 bool BiblioInfo::isBibtex(docstring const & key) const
 {
-       BiblioInfo::const_iterator it = find(key);
+       docstring key1;
+       split(key, key1, ',');
+       BiblioInfo::const_iterator it = find(key1);
        if (it == end())
                return false;
        return it->second.isBibTeX();
diff --git a/status.21x b/status.21x
index a72d755..f5917fe 100644
--- a/status.21x
+++ b/status.21x
@@ -62,6 +62,9 @@ What's new
 
 - Fix export of xfig external insets (bug 9244).
 
+- Fix incorrect output of ampersands when multiple keys are given for a
+  citation (bug 9296).
+
 
 * LYX2LYX