Skip to content

Minor code corrections. Bump to 2.1.5 #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2019
Merged

Minor code corrections. Bump to 2.1.5 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions BBCodePlus/BBCodePlus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class BBCodePlusPlugin extends MantisFormattingPlugin {
# placeholders for MantisCoreFormatting values.
private $t_MantisCoreFormatting = OFF;
private $t_MantisCoreFormatting = OFF;
private $t_MantisCoreFormatting_process_text = OFF;
private $t_MantisCoreFormatting_process_urls = OFF;
private $t_MantisCoreFormatting_process_markdown = OFF;
Expand Down Expand Up @@ -305,7 +305,7 @@ function string_process_bbcode( $p_string, $p_multiline = TRUE ) {
}
# convert all remaining major html items to bbcode for uniform processing.
$p_string = $this->t_HTML->except('linebreak')->parse($p_string);
#escape all html code inside <code> tags.
# escape all html code inside <code> tags.
$p_string = $this->string_escape_code( $p_string );
# parse the BBCode.
$p_string = $this->t_bbCode->parse($p_string);
Expand All @@ -316,8 +316,6 @@ function string_process_bbcode( $p_string, $p_multiline = TRUE ) {
$p_string = string_nl2br($p_string);
}

# escape all html code inside <code> tags.
#$p_string = $this->string_escape_code( $p_string );
# remove extra breaks added by use of string_nl2br.
$p_string = preg_replace( '/(<ul.*?>)<br \/>/is', '$1', $p_string);
$p_string = preg_replace( '/(<ol.*?>)<br \/>/is', '$1', $p_string);
Expand Down Expand Up @@ -350,10 +348,14 @@ function string_process_bbcode( $p_string, $p_multiline = TRUE ) {
* @return string $p_string
*/
function string_escape_code( $p_string ) {
$p_string = preg_replace_callback('/\[code(.*?)\](.*?)\[\/code\]/s', function ($match) {
# store value in var (due to issues with $this inside callbacks.)
$mantisCoreFormatting = $this->t_MantisCoreFormatting;
$p_string = preg_replace_callback('/\[code(.*?)\](.*?)\[\/code\]/s', function ($match)
# use is only supported on PHP 5.3+.
use ( $mantisCoreFormatting ) {
# account for <br /> in code block (when using html syntax).
$code = $match[2];
if (ON == $this->t_MantisCoreFormatting) {
if ( ON == $mantisCoreFormatting ) {
# preview somehow uses \n only.
$code = preg_replace( '/<br \/>\n/is', "\n", $code );
# everywhere else uses \r\n.
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ If you would like to contribute to BBCode plus, please [read this guide first](h

## Change Log

### 2.1.5

- Corrected use of `$this` inside code replace callback (causes issues with older versions of PHP).

### 2.1.4

- Corrected issues with bug links and mentions.
Expand Down