Merge pull request #153 from Automattic/release/3.5.5

Release 3.5.5
Automattic · Jun 25, 2020 · 8ab937d · 8ab937d
2 parents 8d4c3e9 + d4d7e62
commit 8ab937d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "syntaxhighlighter",
-	"version": "3.5.4",
+	"version": "3.5.5",
 	"description": "Easily post syntax-highlighted code to your WordPress site without having to modify the code at all.",
 	"homepage": "https://alex.blog/wordpress-plugins/syntaxhighlighter/",
 	"author": "Alex Mills (Viper007Bond)",

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://alex.blog/2019/03/13/in-memory-of-alex-donation-link-update
 Tags: code, sourcecode, block, php, xhtml, html, css, WordPress.com
 Requires at least: 4.2.3
 Tested up to: 5.4
-Stable tag: 3.5.4
+Stable tag: 3.5.5
 
 Easily post syntax-highlighted code to your site without having to modify the code at all. As seen on WordPress.com.
 
@@ -40,6 +40,13 @@ Try excluding this plugin's Javascript from any performance optimizations your s
 
 == ChangeLog ==
 
+= Version 3.5.5 =
+
+* Allow setting text to include br and code tags. #144
+* Add Arduino Brush. #136
+* Fix tags issue while alternating visual and text mode in the classic editor. #139
+* Fix adding classname when using SyntaxHighlighter block. #138
+
 = Version 3.5.4 =
 
 * Add missing shBrushYaml file.

diff --git a/syntaxhighlighter.php b/syntaxhighlighter.php
@@ -4,7 +4,7 @@
 
 Plugin Name:  SyntaxHighlighter Evolved
 Plugin URI:   https://alex.blog/wordpress-plugins/syntaxhighlighter/
-Version:      3.5.4
+Version:      3.5.5
 Description:  Easily post syntax-highlighted code to your site without having to modify the code at all. Uses Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a>. Includes a new editor block.
 Author:       Alex Mills (Viper007Bond)
 Author URI:   https://alex.blog/
@@ -16,7 +16,7 @@
 
 class SyntaxHighlighter {
 	// All of these variables are private. Filters are provided for things that can be modified.
-	var $pluginver            = '3.5.4';  // Plugin version
+	var $pluginver            = '3.5.5';  // Plugin version
 	var $agshver              = false;    // Alex Gorbatchev's SyntaxHighlighter version (dynamically set below due to v2 vs v3)
 	var $shfolder             = false;    // Controls what subfolder to load SyntaxHighlighter from (v2 or v3)
 	var $settings             = array();  // Contains the user's settings