heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitorious/master'

Browse Source
This commit is contained in:
Jef van Schendel 2011-06-21 11:22:31 +02:00
commit 4e5a55787b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/db/migrations.py
View File

@ -40,7 +40,8 @@ class MediaEntryMigration(DocumentMigration):
Now that we can have rich descriptions via Markdown, we should Now that we can have rich descriptions via Markdown, we should
update all existing entries to record the rich description versions. update all existing entries to record the rich description versions.
""" """
self.target = {'description_html': {'$exists': False}} self.target = {'description_html': {'$exists': False},
'description': {'$exists': True}}
if not self.status: if not self.status:
for doc in self.collection.find(self.target): for doc in self.collection.find(self.target):

5
mediagoblin/util.py
View File

@ -383,6 +383,11 @@ def cleaned_markdown_conversion(text):
""" """
Take a block of text, run it through MarkDown, and clean its HTML. Take a block of text, run it through MarkDown, and clean its HTML.
""" """
# Markdown will do nothing with and clean_html can do nothing with
# an empty string :)
if not text:
return u''
return clean_html(MARKDOWN_INSTANCE.convert(text)) return clean_html(MARKDOWN_INSTANCE.convert(text))