[sword-svn] r3579 - trunk/utilities/diatheke

[scribe at crosswire.org]

Author: scribe
Date: 2018-03-27 15:39:16 -0700 (Tue, 27 Mar 2018)
New Revision: 3579

Modified:
   trunk/utilities/diatheke/corediatheke.cpp
Log:
Added missing call to SWModule::renderText before expecting entryAttributes to be populated. Patch from -Greg Hellings <greg.hellings at gmail.com>

Modified: trunk/utilities/diatheke/corediatheke.cpp
===================================================================
--- trunk/utilities/diatheke/corediatheke.cpp	2018-03-26 03:56:50 UTC (rev 3578)
+++ trunk/utilities/diatheke/corediatheke.cpp	2018-03-27 22:39:16 UTC (rev 3579)
@@ -302,6 +302,9 @@
 		for (listkey = TOP; !listkey.popError() && maxverses; listkey++) {
 			target->setKey(listkey);
 			VerseKey *vk = SWDYNAMIC_CAST(VerseKey, target->getKey());
+			// Call this before all the pre-verse handling, as it needs to be
+			// executed before the preverse headers are populated
+			SWBuf text = target->renderText();
 			
 			// if we've got a VerseKey (Bible or Commentary)
 			if (vk) {
@@ -375,7 +378,7 @@
 				*output << ": ";
 			}
 					
-			*output << target->renderText();
+			*output << text;
 			
 	
 			if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI) {