Fixes a compatibility error with the feed api from django 1.1 and 1.2.

[osqa.git] / forum_modules / sximporter / importer.py

diff --git a/forum_modules/sximporter/importer.py b/forum_modules/sximporter/importer.py
index d63541c03c64eb86bf92c610d05d542533c66156..5277b8dd3720fa83bf68650e5d2a8288a11d05b6 100644 (file)
--- a/forum_modules/sximporter/importer.py
+++ b/forum_modules/sximporter/importer.py
@@ -787,12 +787,13 @@ def pages_import(dump, currid):
 
 sx2osqa_set_map = {
 u'theme.html.name': 'APP_TITLE',
-u'theme.html.footer': 'USE_CUSTOM_FOOTER',
+u'theme.html.footer': 'CUSTOM_FOOTER',
 u'theme.html.sidebar': 'SIDEBAR_UPPER_TEXT',
 u'theme.html.sidebar-low': 'SIDEBAR_LOWER_TEXT',
 u'theme.html.welcome': 'APP_INTRO',
 u'theme.html.head': 'CUSTOM_HEAD',
-u'theme.html.header': 'CUSTOM_HEADER'
+u'theme.html.header': 'CUSTOM_HEADER',
+u'theme.css': 'CUSTOM_CSS',
 }
 
 html_codes = (
@@ -855,7 +856,11 @@ def reset_sequences():
 
 
 def sximport(dump, options):
-    disable_triggers()
+    try:
+        disable_triggers()
+        triggers_disabled = True
+    except:
+        triggers_disabled = False
     uidmap = userimport(dump, options)
     tagmap = tagsimport(dump, uidmap)
     gc.collect()
@@ -882,7 +887,9 @@ def sximport(dump, options):
     db.commit_transaction()
 
     reset_sequences()
-    enable_triggers()
+
+    if triggers_disabled:
+        enable_triggers()
 
 
 PG_DISABLE_TRIGGERS = """