summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dico <ddico@oerp.ca>2016-12-29 18:14:58 -0500
committerNicolas Lempereur <nle@odoo.com>2017-01-02 18:35:41 +0100
commitf984073251efe2f1ca35fb520139f268f91e86aa (patch)
tree5ae87e18ca807d5bb6ea2e5a3e359cd58f342f8a
parent3805eb620aaf602389a69b5bef9921d650e06f83 (diff)
[FIX] pad: get pad content with newlines
Some more recent versions of etherpad can have newlines in the pad content. Allowing newlines should not break anything that worked before and allow more etherpad versions to be used. closes #14877 opw-703173
-rw-r--r--addons/pad/pad.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 711bbd46fc5..286c80d203a 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -75,7 +75,7 @@ class pad_common(osv.osv_memory):
if url:
try:
page = urllib2.urlopen('%s/export/html'%url).read()
- mo = re.search('<body>(.*)</body>',page)
+ mo = re.search('<body>(.*)</body>', page, re.DOTALL)
if mo:
content = mo.group(1)
except: