From e49bb9e257a22e418b172978b5d2e812203b12e0 Mon Sep 17 00:00:00 2001 From: pewgeuges Date: Thu, 1 Apr 2021 06:48:43 +0000 Subject: [PATCH] Release urgent bugfix v2.6.5 (Stable Tag 2.6.5). Also add a temporary tag for another bugfix. = 2.6.5 = - Bugfix: Editor buttons: debug button by reverting name change in PHP file while JS file and HTML template remained unsynced, thanks to @gova bug report. - Bugfix: Hooks: default-disable the_excerpt hook with respect to theme-specific excerpt handling, thanks to @mmallett bug reports. = 2.5.13.1 = - Bugfix: Backlinks: remove the 'event.stopPropagation()' call in scroll-down function. Note: This bug is fixed in mainstream and is here only available temporarily while one known installation keeps using v2.5.13. git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2507205 b8457f37-d9ea-0310-8a92-e5e31aec5664 --- class/settings.php | 10 +++++++++- class/task.php | 19 ++++++++++++++++--- class/wysiwyg.php | 18 +++++++++++++++--- footnotes.php | 8 ++++---- js/wysiwyg-editor.js | 10 +++++----- readme.txt | 12 ++++++++---- 6 files changed, 57 insertions(+), 20 deletions(-) diff --git a/class/settings.php b/class/settings.php index c8defe0..1e81c24 100644 --- a/class/settings.php +++ b/class/settings.php @@ -248,6 +248,14 @@ class MCI_Footnotes_Settings { * * @since 2.1.3 * @since 2.6.3 Enable by default after debugging the 'Footnotes in excerpts' setting. + * + * - Bugfix: Hooks: default-disable the_excerpt hook with respect to theme-specific excerpt handling, thanks to @mmallett bug reports. + * + * @reporter @mmallett + * @link https://wordpress.org/support/topic/broken-662/ + * @link https://wordpress.org/support/topic/update-crashed-my-website-3/#post-14260969 + * + * @since 2.6.5 * @see C_STR_FOOTNOTES_IN_EXCERPT * @var str */ @@ -1416,7 +1424,7 @@ class MCI_Footnotes_Settings { self::C_STR_EXPERT_LOOKUP_THE_CONTENT => 'checked', self::C_INT_EXPERT_LOOKUP_THE_CONTENT_PRIORITY_LEVEL => 98, - self::C_STR_EXPERT_LOOKUP_THE_EXCERPT => 'checked', + self::C_STR_EXPERT_LOOKUP_THE_EXCERPT => '', self::C_INT_EXPERT_LOOKUP_THE_EXCERPT_PRIORITY_LEVEL => PHP_INT_MAX, self::C_STR_EXPERT_LOOKUP_WIDGET_TITLE => '', diff --git a/class/task.php b/class/task.php index 7bcf525..7a043c1 100644 --- a/class/task.php +++ b/class/task.php @@ -1151,7 +1151,7 @@ class MCI_Footnotes_Task { // Discard existing excerpt and start on the basis of the post. $p_str_content = get_the_content( get_the_id() ); - // Get delimiter shortcodes and unify them. + // Get footnote delimiter shortcodes and unify them. $p_str_content = self::unify_delimiters( $p_str_content ); // Remove footnotes. @@ -1190,6 +1190,19 @@ class MCI_Footnotes_Task { * @link https://wordpress.org/support/topic/problem-with-footnotes-in-excerpts-of-the-blog-page/ * * @since 2.6.3 + * + * - Bugfix: Process: remove trailing comma after last argument in multiline function calls for PHP < 7.3, thanks to @scroom @copylefter @lagoon24 bug reports. + * + * @reporter @scroom + * @link https://wordpress.org/support/topic/update-crashed-my-website-3/ + * + * @reporter @copylefter + * @link https://wordpress.org/support/topic/update-crashed-my-website-3/#post-14259151 + * + * @reporter @lagoon24 + * @link https://wordpress.org/support/topic/update-crashed-my-website-3/#post-14259396 + * + * @since 2.6.4 * @param string $p_str_content The post. * @return string $p_str_content An excerpt of the post. * Does not apply full WordPress excerpt processing. @@ -1202,7 +1215,7 @@ class MCI_Footnotes_Task { // Discard existing excerpt and start on the basis of the post. $p_str_content = get_the_content( get_the_id() ); - // Get delimiter shortcodes and unify them. + // Get footnote delimiter shortcodes and unify them. $p_str_content = self::unify_delimiters( $p_str_content ); // Apply WordPress excerpt processing. @@ -1486,7 +1499,7 @@ class MCI_Footnotes_Task { */ public function search( $p_str_content, $p_bool_hide_footnotes_text ) { - // Get delimiter shortcodes and unify them. + // Get footnote delimiter shortcodes and unify them. $p_str_content = self::unify_delimiters( $p_str_content ); /** diff --git a/class/wysiwyg.php b/class/wysiwyg.php index 898f133..8f5f18d 100644 --- a/class/wysiwyg.php +++ b/class/wysiwyg.php @@ -17,7 +17,15 @@ class MCI_Footnotes_WYSIWYG { /** * Registers Button hooks. + * + * @since 1.5.0 + * + * - Bugfix: Editor buttons: debug button by reverting name change in PHP file while JS file and HTML template remained unsynced, thanks to @gova bug report. + * + * @reporter @gova + * @link https://wordpress.org/support/topic/back-end-footnotes-not-working-400-bad-erro/ * + * @since 2.6.5 * @return void */ public static function register_hooks() { @@ -26,8 +34,12 @@ class MCI_Footnotes_WYSIWYG { add_filter( 'mce_external_plugins', array( 'MCI_Footnotes_WYSIWYG', 'include_scripts' ) ); - add_action( 'wp_ajax_nopriv_footnotes_get_tags', array( 'MCI_Footnotes_WYSIWYG', 'ajax_callback' ) ); - add_action( 'wp_ajax_footnotes_get_tags', array( 'MCI_Footnotes_WYSIWYG', 'ajax_callback' ) ); + // phpcs:disable + // 'footnotes_getTags' must match its instance in wysiwyg-editor.js. + // 'footnotes_getTags' must match its instance in editor-button.html. + add_action( 'wp_ajax_nopriv_footnotes_getTags', array( 'MCI_Footnotes_WYSIWYG', 'ajax_callback' ) ); + add_action( 'wp_ajax_footnotes_getTags', array( 'MCI_Footnotes_WYSIWYG', 'ajax_callback' ) ); + // phpcs:enable } @@ -81,7 +93,7 @@ class MCI_Footnotes_WYSIWYG { $l_str_starting_tag = MCI_Footnotes_Settings::instance()->get( MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_START_USER_DEFINED ); $l_str_ending_tag = MCI_Footnotes_Settings::instance()->get( MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_END_USER_DEFINED ); } - echo wp_json_encode( + echo json_encode( array( 'start' => htmlspecialchars( $l_str_starting_tag ), 'end' => htmlspecialchars( $l_str_ending_tag ), diff --git a/footnotes.php b/footnotes.php index db23bdb..31e01b4 100755 --- a/footnotes.php +++ b/footnotes.php @@ -4,8 +4,8 @@ * Plugin URI: https://wordpress.org/plugins/footnotes/ * Description: time to bring footnotes to your website! footnotes are known from offline publishing and everybody takes them for granted when reading a magazine. * Author: Mark Cheret - * Package V.: 2.6.4 - * Version: 2.6.4 + * Package V.: 2.6.5 + * Version: 2.6.5 * CAUTION: THIS V. FIELD IS PARSED FOR UPDATE CONFIGURATION. * Author URI: https://cheret.org/footnotes/ * Text Domain: footnotes @@ -21,9 +21,9 @@ * @since 2.1.4 * @since 2.5.3 (Hungarian) * @var str - * @lastmodified 2021-03-31T1525+0200 + * @lastmodified 2021-04-01T0721+0200 */ -define( 'C_STR_PACKAGE_VERSION', '2.6.4' ); +define( 'C_STR_PACKAGE_VERSION', '2.6.5' ); /** * Enables toggling the stylesheet enqueuing mode from production (true) to development (false). * @see Full docblock below next. diff --git a/js/wysiwyg-editor.js b/js/wysiwyg-editor.js index 612e0a5..64a2c60 100644 --- a/js/wysiwyg-editor.js +++ b/js/wysiwyg-editor.js @@ -42,13 +42,13 @@ }, /** - * Creates control instances based in the incomming name. This method is normally not - * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons + * Creates control instances based on the incoming name. This method is normally not + * needed since the addButton method of the tinymce.Editor class is an easier way of adding buttons, * but you sometimes need to create more complex controls like listboxes, split buttons etc then this * method can be used to create those. * * @param {String} n Name of the control to create. - * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control. + * @param {tinymce.ControlManager} cm Control manager to use in order to create new control. * @return {tinymce.ui.Control} New control instance or null if no control was created. */ createControl : function(n, cm) { @@ -61,7 +61,7 @@ * * @return {Object} Name/value array containing information about the plugin. * - * Edit: needs update the version number manually 2020-12-11T1224+0100 + * Edit: needs updating the version number manually 2020-12-11T1224+0100 */ getInfo : function() { return { @@ -69,7 +69,7 @@ author : 'Mark Cheret', authorurl : 'https://cheret.org/footnotes/', infourl : 'https://wordpress.org/plugins/footnotes/', - version : "2.6.4" + version : '2.6.5' }; } }); diff --git a/readme.txt b/readme.txt index 49b0ba2..6676f8e 100755 --- a/readme.txt +++ b/readme.txt @@ -4,9 +4,9 @@ Tags: footnote, footnotes, bibliography, formatting, notes, Post, posts, referen Requires at least: 3.9 Tested up to: 5.7 Requires PHP: 5.6 -Package Version: 2.6.4 -Version: 2.6.4 -Stable Tag: 2.6.4 +Package Version: 2.6.5 +Version: 2.6.5 +Stable Tag: 2.6.5 CAUTION: THE S. T. FIELD IS PARSED FOR RELEASE CONFIGURATION. License: GPLv3 or later License URI: https://www.gnu.org/licenses/gpl-3.0.html @@ -80,8 +80,12 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest** == Changelog == += 2.6.5 = +- Bugfix: Editor buttons: debug button by reverting name change in PHP file while JS file and HTML template remained unsynced, thanks to @gova bug report. +- Bugfix: Hooks: default-disable the_excerpt hook with respect to theme-specific excerpt handling, thanks to @mmallett bug reports. + = 2.6.4 = -- Bugfix: Process: remove trailing comma after last argument in multiline function calls for PHP < 7.3, thanks to @scroom bug report. +- Bugfix: Process: remove trailing comma after last argument in multiline function calls for PHP < 7.3, thanks to @scroom @copylefter @lagoon24 bug reports. = 2.6.3 = - Bugfix: Reference container: debug footnotes number text color in the table header cells required for accessibility, thanks to @spaceling bug report.