Merge pull request #63 from paulschreiber/master

Update for 6.6.2
phillord · Sep 12, 2024 · 0b7c686 · 0b7c686
2 parents ed41f8e + 2e1cc32
commit 0b7c686
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 Contributors: philliplord, sjcockell, knowledgeblog, d_swan, paulschreiber, jwenerd
 Tags: mathematics, math, latex, mathml, mathjax, science, res-comms, scholar, academic
 Requires at least: 3.0
-Tested up to: 6.1.1
+Tested up to: 6.6.2
 Stable tag: 1.3.12
 Requires PHP: 7.0.0
 License: GPLv2
@@ -118,10 +118,12 @@ this plugin! Thanks to Jared Wenerd and Paul Schreiber.
 1. Tested against MathJax2.1
 
 ### 1.0
+
 1. Compatibility with MathJax 1.1. Load a default configuration from the MathJax distribution.
 1. Use the MathJax Content Distribution Network to deliver the javascript library. Offers improved performance and stability.
 
 ### 0.2
+
 1. MathJax.js can be loaded form a configurable URL. Defaults to $PLUGIN/MathJax/MathJax.js
 
 == Upgrade Notice ==
@@ -140,6 +142,7 @@ Bug fix: Force load was not correctly applied.
 Security update. All users advised to update. Options will require resetting.
 
 ### 1.1
+
 Documentation updates only. Upgrade for existing users is optional.
 
 ### 1.0

diff --git a/class-mathjax-latex.php b/class-mathjax-latex.php
@@ -210,7 +210,10 @@ public static function add_script() {
 			$mathjax_location = get_option( 'kblog_mathjax_custom_location' );
 		}
 
-		$config      = get_option( 'kblog_mathjax_config' ) ?: 'default';
+		$config = get_option( 'kblog_mathjax_config' );
+		if ( ! $config ) {
+			$config = 'default';
+		}
 		$mathjax_url = add_query_arg( 'config', $config, $mathjax_location );
 
 		wp_enqueue_script( 'mathjax', $mathjax_url, false, MATHJAX_PLUGIN_VERSION, false );
@@ -305,7 +308,7 @@ public static function mathjax_settings_link( $actions, $plugin_file ) {
 	public static function filter_br_tags_on_math( $content ) {
 		$filtered_content = preg_replace_callback(
 			'/(<math.*>.*<\/math>)/isU',
-			function( $matches ) {
+			function ( $matches ) {
 				return str_replace( [ '<br/>', '<br />', '<br>' ], '', $matches[0] );
 			},
 			$content

diff --git a/composer.lock b/composer.lock
diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@
 Contributors: philliplord, sjcockell, knowledgeblog, d_swan, paulschreiber, jwenerd
 Tags: mathematics, math, latex, mathml, mathjax, science, res-comms, scholar, academic
 Requires at least: 3.0
-Tested up to: 6.1.1
+Tested up to: 6.6.2
 Stable tag: 1.3.12
 Requires PHP: 7.0.0
 License: GPLv2