Skip to content

Commit

Permalink
Merge branch 'release/1.20.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
danieliser committed Sep 23, 2024
2 parents 13ec8e9 + 80bf982 commit 1c22290
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 12 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Unreleased

## v1.20.1 - 2024-09-18

* Fix: Notice when popup is enqueued before init.
* Fix: Popups with titles had their popup ID # rendered below site footer in some cases.

## v1.20.0 - 2024-09-14

* Important: Popup Maker will be transitioning to new minimum PHP & WP versions over the next few releases. [Read about our plans here](https://wppopupmaker.com/blog/popup-maker-new-minimum-php-and-wp-versions-coming-soon/).
Expand Down
3 changes: 3 additions & 0 deletions classes/Site/Popups.php
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ public static function preload_popup( $popup ) {
// Add to the $loaded_ids list.
self::$loaded_ids[] = $popup->ID;

// Ensure the loaded query is up to date.
self::get_loaded_popups();

// Add to the $loaded query.
self::$loaded->posts[] = $popup;
++self::$loaded->post_count;
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "popupmaker/popup-maker",
"description": "The easiest way to create any popup imaginable with WordPress.",
"version": "1.20.0",
"version": "1.20.1",
"type": "wordpress-plugin",
"license": "GPL-2.0-or-later",
"keywords": [
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "popup-maker",
"version": "1.20.0",
"version": "1.20.1",
"description": "WordPress Popup Plugin",
"author": "Code Atlantic LLC",
"license": "GPL-2.0-or-later",
Expand Down
4 changes: 2 additions & 2 deletions popup-maker.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Popup Maker
* Plugin URI: https://wppopupmaker.com/?utm_campaign=plugin-info&utm_source=plugin-header&utm_medium=plugin-uri
* Description: Easily create & style popups with any content. Theme editor to quickly style your popups. Add forms, social media boxes, videos & more.
* Version: 1.20.0
* Version: 1.20.1
* Requires PHP: 5.6
* Requires at least: 4.9
* Author: Popup Maker
Expand Down Expand Up @@ -31,7 +31,7 @@ function popup_maker_config() {
return [
'name' => __( 'Popup Maker', 'popup-maker' ),
'slug' => 'popup-maker',
'version' => '1.20.0',
'version' => '1.20.1',
'option_prefix' => 'popup_maker',
'text_domain' => 'popup-maker',
'fullname' => __( 'Popup Maker', 'popup-maker' ),
Expand Down
7 changes: 6 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Tags: marketing, popup, popups, optin, conversion
Requires at least: 4.9
Tested up to: 6.6.2
Requires PHP: 5.6
Stable tag: 1.20.0
Stable tag: 1.20.1
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -183,6 +183,11 @@ There are several common causes for this, check [this guide for help](https://do

View our [complete changelog](https://github.com/PopupMaker/Popup-Maker/blob/master/CHANGELOG.md) for up-to-date information on what has been going on with the development of Popup Maker.

= v1.20.1 - 2024-09-18 =

* Fix: Notice when popup is enqueued before init.
* Fix: Popups with titles had their popup ID # rendered below site footer in some cases.

= v1.20.0 - 2024-09-14 =

* Important: Popup Maker will be transitioning to new minimum PHP & WP versions over the next few releases. [Read about our plans here](https://wppopupmaker.com/announcements/upcoming-php-wp-requirement-changes/).
Expand Down
2 changes: 1 addition & 1 deletion templates/popup.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @copyright Copyright (c) 2024, Code Atlantic LLC
*/

$labelledby = pum_get_popup_title() !== '' ? 'aria-labelledby="pum_popup_title_' . pum_popup_ID() . '"' : '';
$labelledby = pum_get_popup_title() !== '' ? 'aria-labelledby="pum_popup_title_' . pum_get_popup_id() . '"' : '';

?>
<div id="pum-<?php pum_popup_ID(); ?>" role="dialog" aria-modal="false" <?php echo esc_attr( $labelledby ); ?> class="<?php pum_popup_classes(); ?>" <?php pum_popup_data_attr(); ?>>
Expand Down

0 comments on commit 1c22290

Please sign in to comment.