update also htmlToMarkdown in the crash report fix #31629

Gustry · nyalldawson · commit 55ca2a4dde8d · 2020-03-31T01:10:16.000+10:00
diff --git a/src/core/qgsstringutils.cpp b/src/core/qgsstringutils.cpp
@@ -556,7 +556,7 @@ QString QgsStringUtils::insertLinks( const QString &string, bool *foundLinks )
 
 QString QgsStringUtils::htmlToMarkdown( const QString &html )
 {
-
+  // Any changes in this function must be copied to qgscrashreport.cpp too
   QString converted = html;
   converted.replace( QLatin1String( "<br>" ), QLatin1String( "\n" ) );
   converted.replace( QLatin1String( "<b>" ), QLatin1String( "**" ) );
@@ -567,7 +567,7 @@ QString QgsStringUtils::htmlToMarkdown( const QString &html )
   while ( hrefRegEx.indexIn( converted, offset ) != -1 )
   {
     QString url = hrefRegEx.cap( 1 ).replace( QStringLiteral( "\"" ), QString() );
-    url.replace( QStringLiteral( "'" ), QString() );
+    url.replace( '\'', QString() );
     QString name = hrefRegEx.cap( 2 );
     QString anchor = QStringLiteral( "[%1](%2)" ).arg( name, url );
     converted.replace( hrefRegEx, anchor );
diff --git a/src/crashhandler/qgscrashreport.cpp b/src/crashhandler/qgscrashreport.cpp
@@ -171,6 +171,7 @@ QString QgsCrashReport::crashReportFolder()
 
 QString QgsCrashReport::htmlToMarkdown( const QString &html )
 {
+  // Any changes in this function must be copied to qgsstringutils.cpp too
   QString converted = html;
   converted.replace( QLatin1String( "<br>" ), QLatin1String( "\n" ) );
   converted.replace( QLatin1String( "<b>" ), QLatin1String( "**" ) );
@@ -181,6 +182,7 @@ QString QgsCrashReport::htmlToMarkdown( const QString &html )
   while ( hrefRegEx.indexIn( converted, offset ) != -1 )
   {
     QString url = hrefRegEx.cap( 1 ).replace( QStringLiteral( "\"" ), QString() );
+    url.replace( '\'', QString() );
     QString name = hrefRegEx.cap( 2 );
     QString anchor = QStringLiteral( "[%1](%2)" ).arg( name, url );
     converted.replace( hrefRegEx, anchor );

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ QString QgsCrashReport::crashReportFolder()`
`171`	`171`
`172`	`172`	`QString QgsCrashReport::htmlToMarkdown( const QString &html )`
`173`	`173`	`{`
	`174`	`+ // Any changes in this function must be copied to qgsstringutils.cpp too`
`174`	`175`	`QString converted = html;`
`175`	`176`	`converted.replace( QLatin1String( "<br>" ), QLatin1String( "\n" ) );`
`176`	`177`	`converted.replace( QLatin1String( "<b>" ), QLatin1String( "**" ) );`
`@@ -181,6 +182,7 @@ QString QgsCrashReport::htmlToMarkdown( const QString &html )`
`181`	`182`	`while ( hrefRegEx.indexIn( converted, offset ) != -1 )`
`182`	`183`	`{`
`183`	`184`	`QString url = hrefRegEx.cap( 1 ).replace( QStringLiteral( "\"" ), QString() );`
	`185`	`+ url.replace( '\'', QString() );`
`184`	`186`	`QString name = hrefRegEx.cap( 2 );`
`185`	`187`	`QString anchor = QStringLiteral( "[%1](%2)" ).arg( name, url );`
`186`	`188`	`converted.replace( hrefRegEx, anchor );`