update also htmlToMarkdown in the crash report

qgis · Mar 30, 2020 · 65aeae3 · 65aeae3
1 parent ca05a8b
commit 65aeae3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/qgsstringutils.cpp b/src/core/qgsstringutils.cpp
@@ -450,7 +450,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( "**" ) );
@@ -461,7 +461,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 );