keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4712 from MrPetovan/task/improve-text-highlight

Browse source 
Improve text highlight
This commit is contained in:
Michael Vogel 2018-03-30 07:27:42 +02:00 committed by GitHub
commit a2b6ff7b25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/text.php
View file

@ -2030,6 +2030,10 @@ function text_highlight($s, $lang) {
$lang = 'javascript'; $lang = 'javascript';
} }
if ($lang === 'bash') {
$lang = 'sh';
}
// @TODO: Replace Text_Highlighter_Renderer_Html by scrivo/highlight.php // @TODO: Replace Text_Highlighter_Renderer_Html by scrivo/highlight.php
// Autoload the library to make constants available // Autoload the library to make constants available

10
src/Content/Text/BBCode.php
View file

@ -1292,13 +1292,17 @@ class BBCode extends BaseObject
private static function textHighlightCallback($match) private static function textHighlightCallback($match)
{ {
// Fallback in case the language doesn't exist
$return = '[code]' . $match[2] . '[/code]';
if (in_array(strtolower($match[1]), if (in_array(strtolower($match[1]),
['php', 'css', 'mysql', 'sql', 'abap', 'diff', 'html', 'perl', 'ruby', ['php', 'css', 'mysql', 'sql', 'abap', 'diff', 'html', 'perl', 'ruby',
'vbscript', 'avrc', 'dtd', 'java', 'xml', 'cpp', 'python', 'javascript', 'js', 'sh']) 'vbscript', 'avrc', 'dtd', 'java', 'xml', 'cpp', 'python', 'javascript', 'js', 'sh', 'bash'])
) { ) {
return text_highlight($match[2], strtolower($match[1])); $return = text_highlight($match[2], strtolower($match[1]));
} }
return $match[0];
return $return;
} }
/** /**