From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 18 Mar 2015 14:54:08 +0000 (+0100)
Subject: Improved detection of filenames for code highlighters
X-Git-Tag: 2.1.2~33
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a714a0305f2ac9fdd08c764318b151732ec28fd8;p=GitHub%2FWoltLab%2FWCF.git

Improved detection of filenames for code highlighters
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index 52a2c1a48f..34e47c29ac 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -1345,7 +1345,7 @@ RedactorPlugins.wbbcode = function() {
 							parameters = parameters.split(',');
 							
 							var $isNumber = function(string) { return string.match(/^\d+$/); };
-							var $isFilename = function(string) { return (string.indexOf('.') !== -1); };
+							var $isFilename = function(string) { return (string.indexOf('.') !== -1) || (string.match(/^(["']).*\1$/)); };
 							var $isHighlighter = function(string) { return  (__REDACTOR_CODE_HIGHLIGHTERS[parameters[0]] !== undefined); };
 							
 							var $unquoteFilename = function(filename) {
@@ -1369,12 +1369,12 @@ RedactorPlugins.wbbcode = function() {
 									if ($isNumber(parameters[0])) {
 										$lineNumber = (parseInt(parameters[0]) > 1) ? parameters[0] : 0;
 										
-										if ($isFilename(parameters[1])) {
-											$filename = $unquoteFilename(parameters[1]);
-										}
-										else if ($isHighlighter(parameters[1])) {
+										if ($isHighlighter(parameters[1])) {
 											$highlighter = parameters[1];
 										}
+										else if ($isFilename(parameters[1])) {
+											$filename = $unquoteFilename(parameters[1]);
+										}
 									}
 									else {
 										if ($isHighlighter(parameters[0])) $highlighter = parameters[0];
@@ -1412,7 +1412,7 @@ RedactorPlugins.wbbcode = function() {
 							+ '</div>'
 						+ '</div>';
 					}).bind(this));
-					
+					console.debug($value);
 					data = data.replace($regex, $value);
 				}
 			}