Merge pull request #6871 from borysiasty/dbmanager_unicode_fix

borysiasty · web-flow · commit 85fd681e432c · 2018-04-27T18:10:09.000+02:00
[DBManager] Fix encoding error if a field/table/database/file name co…
diff --git a/python/plugins/db_manager/db_plugins/html_elems.py b/python/plugins/db_manager/db_plugins/html_elems.py
@@ -36,7 +36,14 @@ def toHtml(self):
         if hasattr(self.data, 'toHtml'):
             return self.data.toHtml()
 
-        html = unicode(self.data).replace("\n", "<br>")
+        if isinstance(self.data, str):
+            html = unicode(self.data, encoding='utf-8', errors='replace')
+        elif isinstance(self.data, unicode):
+            html = self.data
+        else:
+            html = unicode(self.data)
+        html = html.replace("\n", "<br>")
+
         return html
 
     def hasContents(self):
