Merge branch 'hotfix/23.16.9' into develop

aaxelb · Jan 9, 2024 · 393c965 · 393c965
2 parents 3fc6a9e + 900b33a
commit 393c965
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/addons/wiki/models.py b/addons/wiki/models.py
@@ -203,11 +203,7 @@ def check_spam(self):
         )
 
     def _get_spam_content(self, node):
-        content = []
-        content.append(self.raw_text(node))
-        if not content:
-            return None
-        return ' '.join(content)
+        return self.content or None
 
     def clone_version(self, wiki_page, user):
         """Clone a node wiki page.

diff --git a/osf_tests/test_notable_domains.py b/osf_tests/test_notable_domains.py
@@ -268,7 +268,7 @@ def test_extract_domains_from_wiki__public_project_extracts_domains_on_wiki_save
         project = wiki_version.wiki_page.node
         project.is_public = True
         project.save()
-        wiki_version.content = 'This has a domain: https://cos.io'
+        wiki_version.content = '[EXTREME VIDEO] <b><a href="https://cos.io/JAkeEloit">WATCH VIDEO</a></b>'
 
         request_context.g.current_session = {'auth_user_id': project.creator._id}
         with mock.patch.object(spam_tasks.requests, 'head'):