aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-06-29 11:31:29 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-06-29 11:31:29 +0200
commit385a0bb790e82776610fd62a5ad433ea10e93b42 (patch)
tree063282f04b7f658fb4f32b39f2195a743b0cc280 /phpBB
parentde14c3563b778f49c5fc97f63b223ac7b0e8f19f (diff)
parent353b3b4cfd7133ea0cef4a7fdb34d0451b16a0dd (diff)
downloadforums-385a0bb790e82776610fd62a5ad433ea10e93b42.tar
forums-385a0bb790e82776610fd62a5ad433ea10e93b42.tar.gz
forums-385a0bb790e82776610fd62a5ad433ea10e93b42.tar.bz2
forums-385a0bb790e82776610fd62a5ad433ea10e93b42.tar.xz
forums-385a0bb790e82776610fd62a5ad433ea10e93b42.zip
Merge pull request #3730 from s9e/ticket/13970
[ticket/13970] Save the value of the optional [code] parameter
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index e07a1b52ca..7ad728e6cc 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -66,7 +66,7 @@ class factory implements \phpbb\textformatter\cache_interface
protected $default_definitions = array(
'attachment' => '[ATTACHMENT index={NUMBER} filename={TEXT;useContent}]',
'b' => '[B]{TEXT}[/B]',
- 'code' => '[CODE]{TEXT}[/CODE]',
+ 'code' => '[CODE lang={IDENTIFIER;optional}]{TEXT}[/CODE]',
'color' => '[COLOR={COLOR}]{TEXT}[/COLOR]',
'email' => '[EMAIL={EMAIL;useContent} subject={TEXT;optional;postFilter=rawurlencode} body={TEXT;optional;postFilter=rawurlencode}]{TEXT}[/EMAIL]',
'flash' => '[FLASH={NUMBER1},{NUMBER2} width={NUMBER1;postFilter=#flashwidth} height={NUMBER2;postFilter=#flashheight} url={URL;useContent} /]',