makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-03-08 21:09:40 +01:00
commit 37ee22a0e6
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/language/en/help/bbcode.php
View file

@ -52,7 +52,7 @@ $lang = array_merge($lang, array(
'HELP_BBCODE_OTHERS_CUSTOM_ANSWER' => 'If you are an administrator on this board and have the proper permissions, you can add further BBCodes through the Custom BBCodes section.',
'HELP_BBCODE_OTHERS_CUSTOM_QUESTION' => 'Can I add my own tags?',
'HELP_BBCODE_QUOTES_CODE_ANSWER' => 'If you want to output a piece of code or in fact anything that requires a fixed width, e.g. Courier type font you should enclose the text in <strong>[code][/code]</strong> tags, e.g.<br /><br /><strong>[code]</strong>echo &quot;This is some code&quot;;<strong>[/code]</strong><br /><br />All formatting used within <strong>[code][/code]</strong> tags is retained when you later view it. PHP syntax highlighting can be enabled using <strong>[code=php][/code]</strong> and is recommended when posting PHP code samples as it improves readability.',
'HELP_BBCODE_QUOTES_CODE_ANSWER' => 'If you want to output a piece of code or in fact anything that requires a fixed width, e.g. Courier type font you should enclose the text in <strong>[code][/code]</strong> tags, e.g.<br /><br /><strong>[code]</strong>echo &quot;This is some code&quot;;<strong>[/code]</strong><br /><br />All formatting used within <strong>[code][/code]</strong> tags is retained when you later view it.',
'HELP_BBCODE_QUOTES_CODE_QUESTION' => 'Outputting code or fixed width data',
'HELP_BBCODE_QUOTES_TEXT_ANSWER' => 'There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a <strong>[quote=&quot;&quot;][/quote]</strong> block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><strong>[quote=&quot;Mr. Blobby&quot;]</strong>The text Mr. Blobby wrote would go here<strong>[/quote]</strong><br /><br />The resulting output will automatically add &quot;Mr. Blobby wrote:&quot; before the actual text. Remember you <strong>must</strong> include the quotation marks &quot;&quot; around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in <strong>[quote][/quote]</strong> tags. When you view the message it will simply show the text within a quotation block.</li></ul>',
'HELP_BBCODE_QUOTES_TEXT_QUESTION' => 'Quoting text in replies',

24
phpBB/styles/prosilver/theme/colours.css
View file

@ -458,30 +458,6 @@ blockquote blockquote blockquote {
color: #2e8b57;
}
.syntaxbg {
color: #ffffff;
}
.syntaxcomment {
color: #ff8000;
}
.syntaxdefault {
color: #0000bb;
}
.syntaxhtml {
color: #000000;
}
.syntaxkeyword {
color: #007700;
}
.syntaxstring {
color: #dd0000;
}
/* attachments */
.attachbox {
background-color: #ffffff;

5
tests/bbcode/parser_test.php
View file

@ -65,11 +65,6 @@ class phpbb_bbcode_parser_test extends \phpbb_test_case
'[code]unparsed code[/code]',
'[code:]unparsed code[/code:]',
),
array(
'Test default bbcodes: simple php code',
'[code=php]unparsed code[/code]',
'[code=php:]<span class="syntaxdefault">unparsed&nbsp;code</span>[/code:]',
),
array(
'Test default bbcodes: simple list',
'[list]no item[/list]',