diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-26 17:25:55 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-26 17:25:55 +0100 |
| commit | 669f2df353a7be1ad454a237f6be0d1cdc9a4029 (patch) | |
| tree | 9ac9fd13c06f624442c34d41867dbfc1b6e58ea2 /chimere/models.py | |
| parent | f5af2be96567dd8eda136355b54e183e2fa76bec (diff) | |
| parent | cf015e8af131655e48d0728827f45218cafb8d33 (diff) | |
| download | Chimère-669f2df353a7be1ad454a237f6be0d1cdc9a4029.tar.bz2 Chimère-669f2df353a7be1ad454a237f6be0d1cdc9a4029.zip | |
Merge branch 'v2.0'
Diffstat (limited to 'chimere/models.py')
| -rw-r--r-- | chimere/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/models.py b/chimere/models.py index 90cb06a..545d7e0 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -745,7 +745,7 @@ class MultimediaType(models.Model): return tuples IFRAME_LINKS = { - 'youtube':((re.compile(r'youtube.com\/watch\?v=([A-Za-z0-9_-]*)'), + 'youtube':((re.compile(r'youtube.com\/watch\?[A-Za-z0-9_\-\=\&]*v=([A-Za-z0-9_-]*)[A-Za-z0-9_\-\=\&]*'), re.compile(r'youtu.be\/([A-Za-z0-9_-]*)'), re.compile(r'youtube.com\/embed\/([A-Za-z0-9_-]*)')), "http://www.youtube.com/embed/%s"), |