From 69897f7546bd73fb014c06f106b71fde99dd02e8 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 27 Nov 2018 21:45:40 +0100
Subject: [PATCH] New bbcode to reference an other article

See #2638
---
 com.woltlab.wcf/bbcode.xml                    |  12 ++
 com.woltlab.wcf/objectType.xml                |   5 +
 .../files/acp/templates/__boxAddContent.tpl   |  12 --
 .../files/acp/templates/__pageAddContent.tpl  |  12 --
 .../acp/templates/__wysiwygCmsToolbar.tpl     |  25 +++-
 .../files/acp/templates/articleAdd.tpl        |   5 -
 .../redactor2/plugins/WoltLabArticle.js       |  13 ++
 .../js/WoltLabSuite/Core/Ui/Article/Search.js | 137 ++++++++++++++++++
 .../WoltLabSuite/Core/Ui/Redactor/Article.js  |  44 ++++++
 .../lib/data/article/ArticleAction.class.php  |  50 ++++++-
 .../WoltLabSuiteArticleBBCode.class.php       |  36 +++++
 ...icleMessageEmbeddedObjectHandler.class.php |  79 ++++++++++
 wcfsetup/install/lang/de.xml                  |   6 +
 wcfsetup/install/lang/en.xml                  |   6 +
 14 files changed, 411 insertions(+), 31 deletions(-)
 create mode 100644 wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabArticle.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Article/Search.js
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Article.js
 create mode 100644 wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteArticleBBCode.class.php
 create mode 100644 wcfsetup/install/files/lib/system/message/embedded/object/ArticleMessageEmbeddedObjectHandler.class.php

diff --git a/com.woltlab.wcf/bbcode.xml b/com.woltlab.wcf/bbcode.xml
index f16ed7d265..ca0e209b01 100644
--- a/com.woltlab.wcf/bbcode.xml
+++ b/com.woltlab.wcf/bbcode.xml
@@ -221,5 +221,17 @@
 			<buttonlabel>wcf.editor.button.woltlabHtml</buttonlabel>
 			<wysiwygicon>fa-html5</wysiwygicon>
 		</bbcode>
+		<bbcode name="wsa">
+			<classname>wcf\system\bbcode\WoltLabSuiteArticleBBCode</classname>
+			<attributes>
+				<attribute name="0">
+					<validationpattern><![CDATA[^\d+$]]></validationpattern>
+					<required>1</required>
+				</attribute>
+				<attribute name="1">
+					<usetext>1</usetext>
+				</attribute>
+			</attributes>
+		</bbcode>
 	</import>
 </data>
diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index f6f0a2493f..466b03c813 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -1185,6 +1185,11 @@
 			<definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
 			<classname>wcf\system\message\embedded\object\UserMessageEmbeddedObjectHandler</classname>
 		</type>
+		<type>
+			<name>com.woltlab.wcf.article</name>
+			<definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
+			<classname>wcf\system\message\embedded\object\ArticleMessageEmbeddedObjectHandler</classname>
+		</type>
 		<!-- embedded object handlers -->
 		<type>
 			<name>com.woltlab.wcf.payment.method.paypal</name>
diff --git a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
index 9dbb069dca..faa4cc3782 100644
--- a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
+++ b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
@@ -1,15 +1,3 @@
-<script data-relocate="true">
-	require(['Language'], function (Language) {
-		Language.addObject({
-			'wcf.page.search': '{lang}wcf.page.search{/lang}',
-			'wcf.page.search.error.tooShort': '{lang}wcf.page.search.error.tooShort{/lang}',
-			'wcf.page.search.error.noResults': '{lang}wcf.page.search.error.noResults{/lang}',
-			'wcf.page.search.name': '{lang}wcf.page.search.name{/lang}',
-			'wcf.page.search.results': '{lang}wcf.page.search.results{/lang}'
-		});
-	})
-</script>
-
 {if $boxType == 'html' || $boxType == 'tpl'}
 	<ul class="codemirrorToolbar">
 		<li><a href="#" id="codemirror-content{@$languageID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}"><span class="icon icon16 fa-file-o"></span></a></li>
diff --git a/wcfsetup/install/files/acp/templates/__pageAddContent.tpl b/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
index 92a86d2a98..57938d4946 100644
--- a/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
+++ b/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
@@ -1,17 +1,5 @@
 {assign var='__pageContentID' value='content'|concat:$languageID}
 
-<script data-relocate="true">
-	require(['Language'], function (Language) {
-		Language.addObject({
-			'wcf.page.search': '{lang}wcf.page.search{/lang}',
-			'wcf.page.search.error.tooShort': '{lang}wcf.page.search.error.tooShort{/lang}',
-			'wcf.page.search.error.noResults': '{lang}wcf.page.search.error.noResults{/lang}',
-			'wcf.page.search.name': '{lang}wcf.page.search.name{/lang}',
-			'wcf.page.search.results': '{lang}wcf.page.search.results{/lang}'
-		});
-	})
-</script>
-
 {if $pageType == 'html' || $pageType == 'tpl'}
 	<ul class="codemirrorToolbar">
 		<li><a href="#" id="codemirror-{@$__pageContentID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}"><span class="icon icon16 fa-file-o"></span></a></li>
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl b/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl
index aa37a453e8..81f2deba4b 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl
@@ -1,8 +1,31 @@
-{capture append='__redactorJavaScript'}, '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabPage.js?v={@LAST_UPDATE_TIME}'{/capture}
+<script data-relocate="true">
+	require(['Language'], function (Language) {
+		Language.addObject({
+			'wcf.article.search': '{lang}wcf.article.search{/lang}',
+			'wcf.article.search.error.tooShort': '{lang}wcf.article.search.error.tooShort{/lang}',
+			'wcf.article.search.error.noResults': '{lang}wcf.article.search.error.noResults{/lang}',
+			'wcf.article.search.name': '{lang}wcf.article.search.name{/lang}',
+			'wcf.article.search.results': '{lang}wcf.article.search.results{/lang}',
+			'wcf.page.search': '{lang}wcf.page.search{/lang}',
+			'wcf.page.search.error.tooShort': '{lang}wcf.page.search.error.tooShort{/lang}',
+			'wcf.page.search.error.noResults': '{lang}wcf.page.search.error.noResults{/lang}',
+			'wcf.page.search.name': '{lang}wcf.page.search.name{/lang}',
+			'wcf.page.search.results': '{lang}wcf.page.search.results{/lang}',
+		});
+	})
+</script>
+
+{capture append='__redactorJavaScript'}
+	, '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabArticle.js?v={@LAST_UPDATE_TIME}'
+	, '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabPage.js?v={@LAST_UPDATE_TIME}'
+{/capture}
 {capture append='__redactorConfig'}
+	buttonOptions.woltlabArticle = { icon: 'fa-file-word-o', title: '{lang}wcf.editor.button.article{/lang}' };
 	buttonOptions.woltlabPage = { icon: 'fa-file-text-o', title: '{lang}wcf.editor.button.page{/lang}' };
 	
 	buttons.push('woltlabPage');
+	buttons.push('woltlabArticle');
 	
+	config.plugins.push('WoltLabArticle');
 	config.plugins.push('WoltLabPage');
 {/capture}
diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 474c845bcd..748f307c2d 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -25,11 +25,6 @@
 			'wcf.acp.article.i18n.toI18n.confirmMessage': '{lang}wcf.acp.article.i18n.toI18n.confirmMessage{/lang}',
 			'wcf.acp.article.i18n.fromI18n.confirmMessage': '{lang}wcf.acp.article.i18n.fromI18n.confirmMessage{/lang}',
 			'wcf.message.status.deleted': '{lang}wcf.message.status.deleted{/lang}',
-			'wcf.page.search': '{lang}wcf.page.search{/lang}',
-			'wcf.page.search.error.tooShort': '{lang}wcf.page.search.error.tooShort{/lang}',
-			'wcf.page.search.error.noResults': '{lang}wcf.page.search.error.noResults{/lang}',
-			'wcf.page.search.name': '{lang}wcf.page.search.name{/lang}',
-			'wcf.page.search.results': '{lang}wcf.page.search.results{/lang}'
 		});
 		
 		new UiUserSearchInput(elBySel('input[name="username"]'));
diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabArticle.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabArticle.js
new file mode 100644
index 0000000000..2aa349d98e
--- /dev/null
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabArticle.js
@@ -0,0 +1,13 @@
+$.Redactor.prototype.WoltLabArticle = function() {
+	"use strict";
+	
+	return {
+		init: function() {
+			var button = this.button.add('woltlabArticle', '');
+			
+			require(['WoltLabSuite/Core/Ui/Redactor/Article'], (function (UiRedactorArticle) {
+				new UiRedactorArticle(this, button[0]);
+			}).bind(this));
+		}
+	};
+};
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Article/Search.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Article/Search.js
new file mode 100644
index 0000000000..4fdd5fa0a4
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Article/Search.js
@@ -0,0 +1,137 @@
+define(['Ajax', 'EventKey', 'Language', 'StringUtil', 'Dom/Util', 'Ui/Dialog'], function(Ajax, EventKey, Language, StringUtil, DomUtil, UiDialog) {
+	"use strict";
+	
+	if (!COMPILER_TARGET_DEFAULT) {
+		var Fake = function() {};
+		Fake.prototype = {
+			open: function() {},
+			_search: function() {},
+			_click: function() {},
+			_ajaxSuccess: function() {},
+			_ajaxSetup: function() {},
+			_dialogSetup: function() {}
+		};
+		return Fake;
+	}
+	
+	var _callbackSelect, _resultContainer, _resultList, _searchInput = null;
+	
+	return {
+		open: function(callbackSelect) {
+			_callbackSelect = callbackSelect;
+			
+			UiDialog.open(this);
+		},
+		
+		_search: function (event) {
+			event.preventDefault();
+			
+			var inputContainer = _searchInput.parentNode;
+			
+			var value = _searchInput.value.trim();
+			if (value.length < 3) {
+				elInnerError(inputContainer, Language.get('wcf.article.search.error.tooShort'));
+				return;
+			}
+			else {
+				elInnerError(inputContainer, false);
+			}
+			
+			Ajax.api(this, {
+				parameters: {
+					searchString: value
+				}
+			});
+		},
+		
+		_click: function (event) {
+			event.preventDefault();
+			
+			_callbackSelect(elData(event.currentTarget, 'article-id'));
+			
+			UiDialog.close(this);
+		},
+		
+		_ajaxSuccess: function(data) {
+			var html = '', article;
+			//noinspection JSUnresolvedVariable
+			for (var i = 0, length = data.returnValues.length; i < length; i++) {
+				//noinspection JSUnresolvedVariable
+				article = data.returnValues[i];
+				
+				html += '<li>'
+						+ '<div class="containerHeadline pointer" data-article-id="' + article.articleID + '">'
+							+ '<h3>' + StringUtil.escapeHTML(article.name) + '</h3>'
+							+ '<small>' + StringUtil.escapeHTML(article.displayLink) + '</small>'
+						+ '</div>'
+					+ '</li>';
+			}
+			
+			_resultList.innerHTML = html;
+			
+			window[html ? 'elShow' : 'elHide'](_resultContainer);
+			
+			if (html) {
+				elBySelAll('.containerHeadline', _resultList, (function(item) {
+					item.addEventListener(WCF_CLICK_EVENT, this._click.bind(this));
+				}).bind(this));
+			}
+			else {
+				elInnerError(_searchInput.parentNode, Language.get('wcf.article.search.error.noResults'));
+			}
+		},
+		
+		_ajaxSetup: function () {
+			return {
+				data: {
+					actionName: 'search',
+					className: 'wcf\\data\\article\\ArticleAction'
+				}
+			};
+		},
+		
+		_dialogSetup: function() {
+			return {
+				id: 'wcfUiArticleSearch',
+				options: {
+					onSetup: (function() {
+						var callbackSearch = this._search.bind(this);
+						
+						_searchInput = elById('wcfUiArticleSearchInput');
+						_searchInput.addEventListener('keydown', function(event) {
+							if (EventKey.Enter(event)) {
+								callbackSearch(event);
+							}
+						});
+						
+						_searchInput.nextElementSibling.addEventListener(WCF_CLICK_EVENT, callbackSearch);
+						
+						_resultContainer = elById('wcfUiArticleSearchResultContainer');
+						_resultList = elById('wcfUiArticleSearchResultList');
+					}).bind(this),
+					onShow: function() {
+						_searchInput.focus();
+					},
+					title: Language.get('wcf.article.search')
+				},
+				source: '<div class="section">'
+					+ '<dl>'
+						+ '<dt><label for="wcfUiArticleSearchInput">' + Language.get('wcf.article.search.name') + '</label></dt>'
+						+ '<dd>'
+							+ '<div class="inputAddon">'
+								+ '<input type="text" id="wcfUiArticleSearchInput" class="long">'
+								+ '<a href="#" class="inputSuffix"><span class="icon icon16 fa-search"></span></a>'
+							+ '</div>'
+						+ '</dd>'
+					+ '</dl>'
+				+ '</div>'
+				+ '<section id="wcfUiArticleSearchResultContainer" class="section" style="display: none;">'
+					+ '<header class="sectionHeader">'
+						+ '<h2 class="sectionTitle">' + Language.get('wcf.article.search.results') + '</h2>'
+					+ '</header>'
+					+ '<ol id="wcfUiArticleSearchResultList" class="containerList"></ol>'
+				+ '</section>'
+			};
+		}
+	};
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Article.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Article.js
new file mode 100644
index 0000000000..5749d7055e
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Article.js
@@ -0,0 +1,44 @@
+/**
+ * Converts `<woltlab-metacode>` into the bbcode representation.
+ * 
+ * @author      Alexander Ebert
+ * @copyright   2001-2018 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module      WoltLabSuite/Core/Ui/Redactor/Article
+ */
+define(['WoltLabSuite/Core/Ui/Article/Search'], function(UiArticleSearch) {
+	"use strict";
+	
+	if (!COMPILER_TARGET_DEFAULT) {
+		var Fake = function() {};
+		Fake.prototype = {
+			init: function() {},
+			_click: function() {},
+			_insert: function() {}
+		};
+		return Fake;
+	}
+	
+	function UiRedactorArticle(editor, button) { this.init(editor, button); }
+	UiRedactorArticle.prototype = {
+		init: function (editor, button) {
+			this._editor = editor;
+			
+			button.addEventListener(WCF_CLICK_EVENT, this._click.bind(this));
+		},
+		
+		_click: function (event) {
+			event.preventDefault();
+			
+			UiArticleSearch.open(this._insert.bind(this));
+		},
+		
+		_insert: function (articleId) {
+			this._editor.buffer.set();
+			
+			this._editor.insert.text("[wsa='" + articleId + "'][/wsa]");
+		}
+	};
+	
+	return UiRedactorArticle;
+});
diff --git a/wcfsetup/install/files/lib/data/article/ArticleAction.class.php b/wcfsetup/install/files/lib/data/article/ArticleAction.class.php
index 737c7b5757..cb0bc1f350 100644
--- a/wcfsetup/install/files/lib/data/article/ArticleAction.class.php
+++ b/wcfsetup/install/files/lib/data/article/ArticleAction.class.php
@@ -73,7 +73,7 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 	/**
 	 * @inheritDoc
 	 */
-	protected $requireACP = ['create', 'delete', 'restore', 'toggleI18n', 'trash', 'update'];
+	protected $requireACP = ['create', 'delete', 'restore', 'search', 'toggleI18n', 'trash', 'update'];
 	
 	/**
 	 * @inheritDoc
@@ -726,6 +726,54 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 		$this->unmarkItems();
 	}
 	
+	/**
+	 * Validates parameters to search for an article by its localized title.
+	 */
+	public function validateSearch() {
+		$this->readString('searchString');
+	}
+	
+	/**
+	 * Searches for an article by its localized title.
+	 * 
+	 * @return      array   list of matching articles
+	 */
+	public function search() {
+		$sql = "SELECT          DISTINCT articleID
+			FROM            wcf".WCF_N."_article_content
+			WHERE           title LIKE ?
+					AND (
+						languageID = ?
+						OR languageID IS NULL
+					)
+			ORDER BY        title";
+		$statement = WCF::getDB()->prepareStatement($sql, 5);
+		$statement->execute([
+			'%' . $this->parameters['searchString'] . '%',
+			WCF::getLanguage()->languageID,
+		]);
+		
+		$articleIDs = [];
+		while ($articleID = $statement->fetchColumn()) {
+			$articleIDs[] = $articleID;
+		}
+		
+		$articleList = new ArticleList();
+		$articleList->setObjectIDs($articleIDs);
+		$articleList->readObjects();
+		
+		$articles = [];
+		foreach ($articleList as $article) {
+			$articles[] = [
+				'displayLink' => $article->getLink(),
+				'name' => $article->getTitle(),
+				'articleID' => $article->articleID,	
+			];
+		}
+		
+		return $articles;
+	}
+	
 	/**
 	 * Unmarks articles.
 	 * 
diff --git a/wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteArticleBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteArticleBBCode.class.php
new file mode 100644
index 0000000000..ff6f75b0a4
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteArticleBBCode.class.php
@@ -0,0 +1,36 @@
+<?php
+namespace wcf\system\bbcode;
+use wcf\data\article\Article;
+use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
+use wcf\util\StringUtil;
+
+/**
+ * Parses the [wsa] bbcode tag.
+ * 
+ * @author      Alexander Ebert
+ * @copyright   2001-2018 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package     WoltLabSuite\Core\System\Bbcode
+ * @since       3.2
+ */
+class WoltLabSuiteArticleBBCode extends AbstractBBCode {
+	/**
+	 * @inheritDoc
+	 */
+	public function getParsedTag(array $openingTag, $content, array $closingTag, BBCodeParser $parser) {
+		$articleID = (!empty($openingTag['attributes'][0])) ? intval($openingTag['attributes'][0]) : 0;
+		if (!$articleID) {
+			return '';
+		}
+		
+		$title = (!empty($openingTag['attributes'][1])) ? StringUtil::trim($openingTag['attributes'][1]) : '';
+		
+		/** @var Article $article */
+		$article = MessageEmbeddedObjectManager::getInstance()->getObject('com.woltlab.wcf.article', $articleID);
+		if ($article !== null) {
+			return StringUtil::getAnchorTag($article->getLink(), $title ?: $article->getTitle());
+		}
+		
+		return '';
+	}
+}
diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/ArticleMessageEmbeddedObjectHandler.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/ArticleMessageEmbeddedObjectHandler.class.php
new file mode 100644
index 0000000000..79a36b61b0
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/message/embedded/object/ArticleMessageEmbeddedObjectHandler.class.php
@@ -0,0 +1,79 @@
+<?php
+namespace wcf\system\message\embedded\object;
+use wcf\data\article\Article;
+use wcf\data\article\ArticleList;
+use wcf\data\page\Page;
+use wcf\data\page\PageCache;
+use wcf\system\html\input\HtmlInputProcessor;
+
+/**
+ * Parses embedded articles and outputs their link or title.
+ * 
+ * @author      Alexander Ebert
+ * @copyright   2001-2018 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package     WoltLabSuite\Core\System\Message\Embedded\Object
+ */
+class ArticleMessageEmbeddedObjectHandler extends AbstractSimpleMessageEmbeddedObjectHandler {
+	/**
+	 * @inheritDoc
+	 */
+	public function parse(HtmlInputProcessor $htmlInputProcessor, array $embeddedData) {
+		$articleIDs = [];
+		if (!empty($embeddedData['wsa'])) {
+			for ($i = 0, $length = count($embeddedData['wsa']); $i < $length; $i++) {
+				$articleIDs[] = intval($embeddedData['wsa'][$i][0]);
+			}
+		}
+		
+		return array_unique($articleIDs);
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function loadObjects(array $objectIDs) {
+		$articleList = new ArticleList();
+		$articleList->setObjectIDs($objectIDs);
+		$articleList->readObjects();
+		
+		return $articleList->getObjects();
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function validateValues($objectType, $objectID, array $values) {
+		$articleList = new ArticleList();
+		$articleList->setObjectIDs($values);
+		$articleList->readObjects();
+		$articles = $articleList->getObjects();
+		
+		return array_filter($values, function($value) use ($articles) {
+			return isset($articles[$value]);
+		});
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function replaceSimple($objectType, $objectID, $value, array $attributes) {
+		/** @var Article $article */
+		$article = MessageEmbeddedObjectManager::getInstance()->getObject('com.woltlab.wcf.article', $value);
+		if ($article === null) {
+			return null;
+		}
+		
+		$return = (!empty($attributes['return'])) ? $attributes['return'] : 'link';
+		switch ($return) {
+			case 'title':
+				return $article->getTitle();
+				break;
+			
+			case 'link':
+			default:
+				return $article->getLink();
+				break;
+		}
+	}
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 874ad751d5..c9cf1b6baf 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2480,6 +2480,11 @@ Benutzerkontos nun in vollem Umfang nutzen.]]></item>
 		<item name="wcf.article.showArticlesWritten"><![CDATA[Artikel von {$user->username}]]></item>
 		<item name="wcf.article.recentActivity"><![CDATA[Hat den Artikel <a href="{$article->getLink()}">{$article->getTitle()}</a> verfasst.]]></item>
 		<item name="wcf.article.button.sort"><![CDATA[Sortieren]]></item>
+		<item name="wcf.article.search"><![CDATA[Artikel durchsuchen]]></item>
+		<item name="wcf.article.search.error.noResults"><![CDATA[Es wurden keine Ergebnisse gefunden.]]></item>
+		<item name="wcf.article.search.error.tooShort"><![CDATA[Der Suchbegriff ist zu kurz.]]></item>
+		<item name="wcf.article.search.name"><![CDATA[Titel durchsuchen]]></item>
+		<item name="wcf.article.search.results"><![CDATA[Suchergebnisse]]></item>
 	</category>
 	<category name="wcf.attachment">
 		<item name="wcf.attachment.file.info"><![CDATA[({@$attachment->filesize|filesize}, <b>{#$attachment->downloads}</b> Mal heruntergeladen{if $attachment->downloads > 0}, zuletzt: {@$attachment->lastDownloadTime|time}{/if})]]></item>
@@ -2912,6 +2917,7 @@ E-Mail-Adresse: {@$emailAddress} {* this line ends with a space *}
 		<item name="wcf.editor.autosave.keep"><![CDATA[Hinweis ausblenden]]></item>
 		<item name="wcf.editor.autosave.restored"><![CDATA[Entwurf wiederhergestellt]]></item>
 		<item name="wcf.editor.button.alignment"><![CDATA[Ausrichtung]]></item>
+		<item name="wcf.editor.button.article"><![CDATA[CMS-Artikel]]></item>
 		<item name="wcf.editor.button.bold"><![CDATA[Fett]]></item>
 		<item name="wcf.editor.button.code"><![CDATA[Code]]></item>
 		<item name="wcf.editor.button.color"><![CDATA[Schriftfarbe]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index af7b321a1a..daa695da62 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2830,6 +2830,11 @@ full extend.]]></item>
 		<item name="wcf.article.showArticlesWritten"><![CDATA[Articles by {$user->username}]]></item>
 		<item name="wcf.article.recentActivity"><![CDATA[Wrote the article <a href="{$article->getLink()}">{$article->getTitle()}</a>.]]></item>
 		<item name="wcf.article.button.sort"><![CDATA[Sort]]></item>
+		<item name="wcf.article.search"><![CDATA[Search Articles]]></item>
+		<item name="wcf.article.search.error.noResults"><![CDATA[The search returned no results.]]></item>
+		<item name="wcf.article.search.error.tooShort"><![CDATA[The entered keyword is too short.]]></item>
+		<item name="wcf.article.search.name"><![CDATA[Search Titles]]></item>
+		<item name="wcf.article.search.results"><![CDATA[Search Results]]></item>
 	</category>
 	<category name="wcf.attachment">
 		<item name="wcf.attachment.file.info"><![CDATA[({@$attachment->filesize|filesize}, downloaded <b>{#$attachment->downloads}</b> times{if $attachment->downloads > 0}, last: {@$attachment->lastDownloadTime|time}{/if})]]></item>
@@ -3284,6 +3289,7 @@ Email: {@$emailAddress} {* this line ends with a space *}
 		<item name="wcf.editor.autosave.keep"><![CDATA[Hide notice]]></item>
 		<item name="wcf.editor.autosave.restored"><![CDATA[Draft restored]]></item>
 		<item name="wcf.editor.button.alignment"><![CDATA[Alignment]]></item>
+		<item name="wcf.editor.button.article"><![CDATA[CMS Article]]></item>
 		<item name="wcf.editor.button.bold"><![CDATA[Bold]]></item>
 		<item name="wcf.editor.button.code"><![CDATA[Code]]></item>
 		<item name="wcf.editor.button.color"><![CDATA[Font Color]]></item>
-- 
2.20.1