summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--askbot/doc/source/changelog.rst2
-rw-r--r--askbot/media/js/wmd/wmd.js2
-rw-r--r--askbot/migrations_api/__init__.py4
-rw-r--r--askbot/templates/widgets/footer.html2
4 files changed, 5 insertions, 5 deletions
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index 0c54f173..31224850 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -9,7 +9,7 @@ Development version
Portugese, Romanian, Russian, Spanish, Swedish, Turkish.
* repost answer as a comment under the previous (older) answer
* minor edit option for question and answer, to suppress email alerts
-* allowed tags to be created updon marking them as interesting/ignored/subscribed
+* allowed tags to be created upon marking them as interesting/ignored/subscribed
0.7.48 (Jan 28, 2013)
---------------------
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
diff --git a/askbot/templates/widgets/footer.html b/askbot/templates/widgets/footer.html
index 75721e50..e57aad99 100644
--- a/askbot/templates/widgets/footer.html
+++ b/askbot/templates/widgets/footer.html
@@ -53,7 +53,7 @@
{% endspaceless %}
</div>
<div class="powered-link">
- <a href="http://askbot.org" target="_blank">
+ <a href="http://askbot.com" target="_blank">
Powered by Askbot version {{settings.ASKBOT_VERSION}}
</a>
</div>