From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 28 Jul 2019 14:00:18 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_4~28
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eefd925210a7f5a6039fd2a31ec80aadaf58df55;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

eefd925210a7f5a6039fd2a31ec80aadaf58df55
diff --cc wcfsetup/install/files/lib/system/bbcode/highlighter/CssHighlighter.class.php
index 66adb92eb0,a11fd37f9f..eba421b2e5
--- a/wcfsetup/install/files/lib/system/bbcode/highlighter/CssHighlighter.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/highlighter/CssHighlighter.class.php
@@@ -5,26 -5,11 +5,12 @@@ namespace wcf\system\bbcode\highlighter
   * Highlights syntax of cascading style sheets.
   * 
   * @author	Tim Duesterhus
 - * @copyright	2001-2018 WoltLab GmbH
 + * @copyright	2001-2019 WoltLab GmbH
   * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
   * @package	WoltLabSuite\Core\System\Bbcode\Highlighter
 + * @deprecated	since 5.2, use Prism to highlight your code.
   */
  class CssHighlighter extends Highlighter {
- 	/**
- 	 * temporary string replacement map for properties that can also be tags
- 	 * @var	string[]
- 	 */
- 	public static $duplicates = [
- 		'table:' => 't@@able:',
- 		'caption:' => 'c@@aption:',
- 		'menu:' => 'm@@enu:',
- 		'code:' => 'c@@ode:',
- 		'sub:' => 's@@ub:',
- 		'pre:' => 'p@@re:',
- 		'small:' => 's@@mall:'
- 	];
- 	
  	/**
  	 * @inheritDoc
  	 */