From 9026c8ae19d70830a0a872a0f9a3b6e5fa61c31b Mon Sep 17 00:00:00 2001 From: pewgeuges <73141620+pewgeuges@users.noreply.github.com> Date: Wed, 23 Dec 2020 10:12:06 +0000 Subject: [PATCH] urgent bugfix 2.2.8 fixing both bugs git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2444880 b8457f37-d9ea-0310-8a92-e5e31aec5664 --- class/task.php | 76 +++++++++++++++++++++++++----------------------- css/public.css | 4 +-- css/settings.css | 4 +-- footnotes.php | 4 +-- readme.txt | 7 +++-- 5 files changed, 51 insertions(+), 44 deletions(-) diff --git a/class/task.php b/class/task.php index 62ffcf9..edf4d25 100644 --- a/class/task.php +++ b/class/task.php @@ -8,46 +8,49 @@ * * Edited for v2.0.0 and following. * - * 2.0.5 Autoload / infinite scroll support added thanks to code from @docteurfitness + * @since 2.0.5 Autoload / infinite scroll support added thanks to code from @docteurfitness * @see * - * 2.0.9 DISABLED the_post HOOK 2020-11-08T1839+0100 + * @since 2.0.9 DISABLED the_post HOOK 2020-11-08T1839+0100 * - * 2.1.0 promoted the 'Continue reading' button from localization to customization 2020-11-08T2146+0100 - * 2.1.1 combining identical footnotes: fixed dead links, thanks to @happyches 2020-11-14T2233+0100 + * @since 2.1.0 promoted the 'Continue reading' button from localization to customization 2020-11-08T2146+0100 + * @since 2.1.1 combining identical footnotes: fixed dead links, thanks to @happyches 2020-11-14T2233+0100 * @see - * 2.1.1 fix start pages by option to hide ref container, thanks to @dragon013 + * @since 2.1.1 fix start pages by option to hide ref container, thanks to @dragon013 * @see - * 2.1.1 options fixing ref container layout and referrer vertical alignment 2020-11-16T2024+0100 - * 2.1.1 priority level option fixing ref container relative position, thanks to june01, @spaceling, @imeson 2020-11-17T0254+0100 + * @since 2.1.1 options fixing ref container layout and referrer vertical alignment 2020-11-16T2024+0100 + * @since 2.1.1 priority level option fixing ref container relative position, thanks to june01, @spaceling, @imeson 2020-11-17T0254+0100 * @see - * 2.1.2 priority level settings for all other hooks, thanks to @nikelaos 2020-11-19T1849+0100 + * @since 2.1.2 priority level settings for all other hooks, thanks to @nikelaos 2020-11-19T1849+0100 * @see - * 2.1.4 fix line wrapping of URLs based on pattern, not link element 2020-11-25T0837+0100 - * 2.1.4 fix issues with link elements by making them optional 2020-11-26T1051+0100 - * 2.1.4 support appending arrow when combining identicals is on 2020-11-26T1633+0100 - * 2.1.4 disable or select backlink separator and terminator 2020-11-28T1048+0100 - * 2.1.4 optional line breaks to stack enumerated backlinks 2020-11-28T1049+0100 - * 2.1.4 ref container column width and tooltip font size settings 2020-12-03T0954+0100 - * 2.1.4 scroll offset and duration settings 2020-12-05T0538+0100 - * 2.1.4 tooltip display duration settings 2020-12-06T1320+0100 - * 2.1.5 URL wrap: exclude image source too, thanks to @bjrnet21 + * @since 2.1.4 fix line wrapping of URLs based on pattern, not link element 2020-11-25T0837+0100 + * @since 2.1.4 fix issues with link elements by making them optional 2020-11-26T1051+0100 + * @since 2.1.4 support appending arrow when combining identicals is on 2020-11-26T1633+0100 + * @since 2.1.4 disable or select backlink separator and terminator 2020-11-28T1048+0100 + * @since 2.1.4 optional line breaks to stack enumerated backlinks 2020-11-28T1049+0100 + * @since 2.1.4 ref container column width and tooltip font size settings 2020-12-03T0954+0100 + * @since 2.1.4 scroll offset and duration settings 2020-12-05T0538+0100 + * @since 2.1.4 tooltip display duration settings 2020-12-06T1320+0100 + * @since 2.1.5 URL wrap: exclude image source too, thanks to @bjrnet21 * @see - * 2.1.6 option to disable URL line wrapping 2020-12-09T1606+0100 - * 2.1.6 add catch-all exclusion to fix URL line wrapping, thanks to @a223123131 2020-12-09T1921+0100 + * @since 2.1.6 option to disable URL line wrapping 2020-12-09T1606+0100 + * @since 2.1.6 add catch-all exclusion to fix URL line wrapping, thanks to @a223123131 2020-12-09T1921+0100 * @see - * 2.2.0 support for custom position shortcode for reference container, thanks to @hamshe 2020-12-13T2058+0100 + * @since 2.2.0 support for custom position shortcode for reference container, thanks to @hamshe 2020-12-13T2058+0100 * @see - * 2.2.3 custom CSS from new setting in header after legacy 2020-12-15T1128+0100 - * 2.2.5 connected alternative tooltips to position and timing settings 2020-12-18T1113+0100 - * 2.2.5 delete unused position shortcode when ref container in widget or footer, thanks to @hamshe 2020-12-18T1437+0100 + * @since 2.2.3 custom CSS from new setting in header after legacy 2020-12-15T1128+0100 + * @since 2.2.5 connected alternative tooltips to position and timing settings 2020-12-18T1113+0100 + * @since 2.2.5 delete unused position shortcode when ref container in widget or footer, thanks to @hamshe 2020-12-18T1437+0100 * @see - * 2.2.5 options for label element and label bottom border, thanks to @markhillyer 2020-12-18T1447+0100 + * @since 2.2.5 options for label element and label bottom border, thanks to @markhillyer 2020-12-18T1447+0100 * @see - * 2.2.6 URL wrap: make the quotation mark optional in the exclusion regex, thanks to @spiralofhope2 2020-12-23T0409+0100 + * @since 2.2.6 URL wrap: make the quotation mark optional in the exclusion regex, thanks to @spiralofhope2 2020-12-23T0409+0100 * @see + * @since 2.2.7 revert that change in the exclusion regex, thanks to @rjl20 and @spaceling 2020-12-23T1046+0100 + * @see + * @since 2.2.8 correct lookbehind by duplicating it with and without quotation mark class 2020-12-23T1108+0100 * - * Last modified: 2020-12-23T1047+0100 + * Last modified: 2020-12-23T1108+0100 */ // If called directly, abort: @@ -95,9 +98,9 @@ class MCI_Footnotes_Task { * @since 1.5.0 * * Edited for: - * 2.0.5 through v2.0.7 changes to priority 2020-11-02T0330+0100..2020-11-06T1344+0100 - * 2.1.1 add setting for the_content - * 2.1.2 add settings for 4 other hooks 2020-11-19T1248+0100 + * @since 2.0.5 through v2.0.7 changes to priority 2020-11-02T0330+0100..2020-11-06T1344+0100 + * @since 2.1.1 add setting for the_content + * @since 2.1.2 add settings for 4 other hooks 2020-11-19T1248+0100 * * Setting the_content priority to "10" instead of PHP_INT_MAX i.e. 9223372036854775807 * makes the footnotes reference container display beneath the post and above other @@ -171,11 +174,11 @@ class MCI_Footnotes_Task { * @since 1.5.0 * * Edited: - * 2.1.1 option to hide ref container from start page - * 2.1.1 script for alternative tooltips - * 2.1.3 raise settings priority to override theme style sheets - * 2.1.4 tootip font size and backlink column width settings - * 2.2.5 options for label element and label bottom border, thanks to @markhillyer 2020-12-18T1447+0100 + * @since 2.1.1 option to hide ref container from start page + * @since 2.1.1 script for alternative tooltips + * @since 2.1.3 raise settings priority to override theme style sheets + * @since 2.1.4 tootip font size and backlink column width settings + * @since 2.2.5 options for label element and label bottom border, thanks to @markhillyer 2020-12-18T1447+0100 * @see */ public function wp_head() { @@ -669,11 +672,12 @@ class MCI_Footnotes_Task { * URLs may be a query string in a URL: * @since 2.2.6 make the quotation mark optional in the exclusion regex, thanks to @spiralofhope2 2020-12-23T0409+0100 * @see - * @since 2.2.7 revert that change in the exclusion regex, thanks to @spiralofhope2 and @spaceling 2020-12-23T1046+0100 + * @since 2.2.7 revert that change in the exclusion regex, thanks to @rjl20 and @spaceling 2020-12-23T1046+0100 * @see + * @since 2.2.8 correct lookbehind by duplicating it with and without quotation mark class 2020-12-23T1107+0100 */ if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_FOOTNOTE_URL_WRAP_ENABLED))) { - $l_str_FootnoteText = preg_replace( '#(?$1', $l_str_FootnoteText ); + $l_str_FootnoteText = preg_replace( '#(?$1', $l_str_FootnoteText ); } // Text to be displayed instead of the footnote diff --git a/css/public.css b/css/public.css index 8303028..7ed94b9 100755 --- a/css/public.css +++ b/css/public.css @@ -5,7 +5,7 @@ * Created-Time: 16:21 * Since: 1.0 * - * Version: 2.2.6 + * Version: 2.2.8 * * Classes added to public.css may be added to the * list documenting CSS classes for Custom CSS if @@ -20,7 +20,7 @@ * @since 2.1.6 set z-index to maximum 2147483647 to address display issues with overlay content, thanks to @russianicons * @see * - * Last modified: 2020-12-23T0426+0100 + * Last modified: 2020-12-23T1109+0100 */ diff --git a/css/settings.css b/css/settings.css index 0ffe379..fd60519 100755 --- a/css/settings.css +++ b/css/settings.css @@ -5,9 +5,9 @@ * Created-Time: 16:21 * Since: 1.0 * - * Version: 2.2.6 + * Version: 2.2.8 * - * Last modified: 2020-12-23T0426+0100 + * Last modified: 2020-12-23T1110+0100 */ diff --git a/footnotes.php b/footnotes.php index e075c5c..a18bee6 100755 --- a/footnotes.php +++ b/footnotes.php @@ -4,12 +4,12 @@ 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 - Version: 2.2.7 + Version: 2.2.8 Author URI: http://cheret.de/plugins/footnotes-2/ Text Domain: footnotes Domain Path: /languages */ -define( 'FOOTNOTES_VERSION', '2.2.7' ); +define( 'FOOTNOTES_VERSION', '2.2.8' ); /* Copyright 2020 Mark Cheret (email: mark@cheret.de) diff --git a/readme.txt b/readme.txt index f222e29..318200d 100755 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: footnote, footnotes, bibliography, formatting, notes, Post, posts, referen Requires at least: 3.9 Tested up to: 5.6 Requires PHP: 5.6 -Stable Tag: 2.2.7 +Stable Tag: 2.2.8 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -80,8 +80,11 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest** == Changelog == += 2.2.8 = +- Bugfix: Reference container, tooltips: URL wrap: correct lookbehind by duplicating it with and without quotation mark class + = 2.2.7 = -- Bugfix: Reference container, tooltips: URL wrap: revert the change in the exclusion regex, thanks to @spiralofhope2 and @spaceling +- Bugfix: Reference container, tooltips: URL wrap: revert the change in the exclusion regex, thanks to @rjl20 and @spaceling = 2.2.6 = - Bugfix: Reference container, tooltips: URL wrap: make the quotation mark optional wrt query parameters, thanks to @spiralofhope2