reset bibitem counter in the second updateBuffer() routine as well

Fixes: #8499
(cherry picked from commit 9370135c3e)

src/Buffer.cpp

@@ -5253,6 +5253,11 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 	// to resolve macros in it.
 	parit.text()->setMacrocontextPosition(parit);
 
+	// Reset bibitem counter in master (#8499)
+	Buffer const * const master = masterBuffer();
+	if (master == this && !d->ignore_parent)
+		master->params().documentClass().counters().reset(from_ascii("bibitem"));
+
 	depth_type maxdepth = 0;
 	pit_type const lastpit = parit.lastpit();
 	for ( ; parit.pit() <= lastpit ; ++parit.pit()) {

status.23x

@@ -50,7 +50,9 @@ What's new
 
 * USER INTERFACE
 
+- Fix counter issue with pasted bibitems (bug 8499).
 
+- Deal properly with orphaned bibitems (bug 7160).
 
 
 * INTERNALS