From c32b0e8e4f2b7feff762ed7fc58314fa4dcf1b6f Mon Sep 17 00:00:00 2001
From: Adrian Moennich <adrian.moennich@cern.ch>
Date: Thu, 13 Nov 2014 14:39:07 +0100
Subject: [PATCH] Convert settings to unicode just in case

---
 piwik/indico_piwik/zodbimport.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/piwik/indico_piwik/zodbimport.py b/piwik/indico_piwik/zodbimport.py
index fc765de..86cac89 100644
--- a/piwik/indico_piwik/zodbimport.py
+++ b/piwik/indico_piwik/zodbimport.py
@@ -46,5 +46,8 @@ class PiwikImporter(Importer):
                         'jsHookEnabled': 'enabled_for_events',
                         'downloadTrackingEnabled': 'enabled_for_downloads'}
         for old, new in settings_map.iteritems():
-            PiwikPlugin.settings.set(new, opts[old].getValue())
+            value = opts[old].getValue()
+            if isinstance(value, basestring):
+                value = convert_to_unicode(value).strip()
+            PiwikPlugin.settings.set(new, value)
         db.session.commit()