From 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Mon, 13 Jun 2016 18:42:42 -0400
Subject: Imported Upstream version 3.1.0

---
 Plugins/HtmlExport/htmlexport.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Plugins/HtmlExport/htmlexport.cpp')

diff --git a/Plugins/HtmlExport/htmlexport.cpp b/Plugins/HtmlExport/htmlexport.cpp
index 75b3868..86ac13e 100644
--- a/Plugins/HtmlExport/htmlexport.cpp
+++ b/Plugins/HtmlExport/htmlexport.cpp
@@ -347,13 +347,16 @@ bool HtmlExport::exportIndex(const QString& database, const QString& name, const
     decrIndent();
     writeln("</tr>");
 
-    for (SqliteIndexedColumn* idxCol : createIndex->indexedColumns)
+    QString collate;
+    for (SqliteOrderBy* idxCol : createIndex->indexedColumns)
     {
+        collate = idxCol->getCollation();
+
         writeln("<tr>");
         incrIndent();
-        writeln(QString("<td>%1</td>").arg(escape(idxCol->name)));
-        writeln(QString("<td align=\"center\">%1</td>").arg(idxCol->collate.isNull() ? "&nbsp;" : escape(idxCol->collate)));
-        writeln(QString("<td align=\"center\">%1</td>").arg(idxCol->sortOrder == SqliteSortOrder::null ? "&nbsp;" : sqliteSortOrder(idxCol->sortOrder)));
+        writeln(QString("<td>%1</td>").arg(escape(idxCol->getColumnString())));
+        writeln(QString("<td align=\"center\">%1</td>").arg(collate.isNull() ? "&nbsp;" : escape(collate)));
+        writeln(QString("<td align=\"center\">%1</td>").arg(idxCol->order == SqliteSortOrder::null ? "&nbsp;" : sqliteSortOrder(idxCol->order)));
         decrIndent();
         writeln("</tr>");
     }
-- 
cgit v1.2.3