From 0a14a4fb4e794f4618b59f233da41bc90045f864 Mon Sep 17 00:00:00 2001
From: tmortagne <thomas.mortagne@gmail.com>
Date: Fri, 23 Jan 2015 14:34:13 +0100
Subject: [PATCH] XWIKI-9971: Disable extracting title from document content by
default
---
.../xwiki/display/internal/AbstractDocumentTitleDisplayer.java | 2 ++
.../src/main/resources/xwiki.cfg.vm | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/src/main/java/org/xwiki/display/internal/AbstractDocumentTitleDisplayer.java b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/src/main/java/org/xwiki/display/internal/AbstractDocumentTitleDisplayer.java
index 3dc17303286..46932b8c132 100644
--- a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/src/main/java/org/xwiki/display/internal/AbstractDocumentTitleDisplayer.java
+++ b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/src/main/java/org/xwiki/display/internal/AbstractDocumentTitleDisplayer.java
@@ -246,7 +246,9 @@ private Map<Object, Object> getXWikiContextMap()
* @param document the document to extract the title from
* @param parameters display parameters
* @return the title XDOM
+ * @deprecated since 7.0M1
*/
+ @Deprecated
protected abstract XDOM extractTitleFromContent(DocumentModelBridge document,
DocumentDisplayerParameters parameters);
diff --git a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.cfg.vm b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.cfg.vm
index fb615fb480b..2920c80c726 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.cfg.vm
+++ b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.cfg.vm
@@ -559,7 +559,8 @@ xwiki.defaultskin=$xwikiCfgDefaultSkin
xwiki.defaultbaseskin=$!xwikiCfgDefaultBaseSkin
#-# Defines whether title handling should be using the compatibility mode or not. When the compatibility
-#-# mode is active, if the document's content first header (level 1 or level 2) matches the document's title
+#-# mode is active, XWiki will try to extract a title from the document content.
+#-# If the document's content first header (level 1 or level 2) matches the document's title
#-# the first header is stripped.
#-# The default value is 0.
# xwiki.title.compatibility=1
--
GitLab