summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--askbot/media/js/wmd/wmd.js2
-rw-r--r--askbot/migrations_api/__init__.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/askbot/media/js/wmd/wmd.js b/askbot/media/js/wmd/wmd.js
index 5aeacd98..91d98694 100644
--- a/askbot/media/js/wmd/wmd.js
+++ b/askbot/media/js/wmd/wmd.js
@@ -122,7 +122,7 @@ Attacklab.wmdBase = function(){
// Adds a listener callback to a DOM element which is fired on a specified
// event.
util.addEvent = function(elem, event, listener){
- if (elem.attachEvent) {
+ if (elem && elem.attachEvent) {
// IE only. The "on" is mandatory.
elem.attachEvent("on" + event, listener);
}
diff --git a/askbot/migrations_api/__init__.py b/askbot/migrations_api/__init__.py
index 3ea250f2..2e172a99 100644
--- a/askbot/migrations_api/__init__.py
+++ b/askbot/migrations_api/__init__.py
@@ -23,8 +23,8 @@ def safe_add_column(table, column, column_data, keep_default = False):
db.add_column(table, column, column_data, keep_default = keep_default)
db.commit_transaction()
return True
- except:
- db.rollback_transaction()
+ except:
+ db.rollback_transaction()
return False