Skip to content

Commit

Permalink
Merge pull request #50 from thinkshout/version-filter-params-fix
Browse files Browse the repository at this point in the history
Version-filter-params-fix
  • Loading branch information
jamacon36 authored Jan 16, 2024
2 parents 829074a + 4f44d2c commit a4d8ccf
Show file tree
Hide file tree
Showing 112 changed files with 3,136 additions and 11,755 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ node_modules/
active_ids.json
active_ids_diff.json
pois.json
active_ids.php
active_ids.php
vendor/
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"authors": [
{
"name": "ThinkShout",
"homepage": "https://thinkshout.com/"
"homepage": "https://thinkshout.com/"
}
]
}
62 changes: 62 additions & 0 deletions composer.lock

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

24 changes: 0 additions & 24 deletions libraries/action-scheduler/.editorconfig

This file was deleted.

14 changes: 0 additions & 14 deletions libraries/action-scheduler/.gitattributes

This file was deleted.

15 changes: 0 additions & 15 deletions libraries/action-scheduler/.github/release-drafter.yml

This file was deleted.

5 changes: 0 additions & 5 deletions libraries/action-scheduler/.gitignore

This file was deleted.

45 changes: 0 additions & 45 deletions libraries/action-scheduler/.travis.yml

This file was deleted.

57 changes: 0 additions & 57 deletions libraries/action-scheduler/Gruntfile.js

This file was deleted.

38 changes: 25 additions & 13 deletions libraries/action-scheduler/action-scheduler.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<?php
/*
/**
* Plugin Name: Action Scheduler
* Plugin URI: https://actionscheduler.org
* Description: A robust scheduling library for use in WordPress plugins.
* Author: Automattic
* Author URI: https://automattic.com/
* Version: 3.2.1
* Version: 3.7.1
* License: GPLv3
* Requires at least: 6.2
* Tested up to: 6.4
* Requires PHP: 5.6
*
* Copyright 2019 Automattic, Inc. (https://automattic.com/contact/)
*
Expand All @@ -23,35 +26,44 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* @package ActionScheduler
*/

if ( ! function_exists( 'action_scheduler_register_3_dot_2_dot_1' ) ) {
if ( ! function_exists( 'action_scheduler_register_3_dot_7_dot_1' ) && function_exists( 'add_action' ) ) { // WRCS: DEFINED_VERSION.

if ( ! class_exists( 'ActionScheduler_Versions' ) ) {
require_once( 'classes/ActionScheduler_Versions.php' );
if ( ! class_exists( 'ActionScheduler_Versions', false ) ) {
require_once __DIR__ . '/classes/ActionScheduler_Versions.php';
add_action( 'plugins_loaded', array( 'ActionScheduler_Versions', 'initialize_latest_version' ), 1, 0 );
}

add_action( 'plugins_loaded', 'action_scheduler_register_3_dot_2_dot_1', 0, 0 );
add_action( 'plugins_loaded', 'action_scheduler_register_3_dot_7_dot_1', 0, 0 ); // WRCS: DEFINED_VERSION.

function action_scheduler_register_3_dot_2_dot_1() {
// phpcs:disable Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace
/**
* Registers this version of Action Scheduler.
*/
function action_scheduler_register_3_dot_7_dot_1() { // WRCS: DEFINED_VERSION.
$versions = ActionScheduler_Versions::instance();
$versions->register( '3.2.1', 'action_scheduler_initialize_3_dot_2_dot_1' );
$versions->register( '3.7.1', 'action_scheduler_initialize_3_dot_7_dot_1' ); // WRCS: DEFINED_VERSION.
}

function action_scheduler_initialize_3_dot_2_dot_1() {
// phpcs:disable Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace
/**
* Initializes this version of Action Scheduler.
*/
function action_scheduler_initialize_3_dot_7_dot_1() { // WRCS: DEFINED_VERSION.
// A final safety check is required even here, because historic versions of Action Scheduler
// followed a different pattern (in some unusual cases, we could reach this point and the
// ActionScheduler class is already defined—so we need to guard against that).
if ( ! class_exists( 'ActionScheduler' ) ) {
require_once( 'classes/abstracts/ActionScheduler.php' );
if ( ! class_exists( 'ActionScheduler', false ) ) {
require_once __DIR__ . '/classes/abstracts/ActionScheduler.php';
ActionScheduler::init( __FILE__ );
}
}

// Support usage in themes - load this version if no plugin has loaded a version yet.
if ( did_action( 'plugins_loaded' ) && ! doing_action( 'plugins_loaded' ) && ! class_exists( 'ActionScheduler' ) ) {
action_scheduler_initialize_3_dot_2_dot_1();
if ( did_action( 'plugins_loaded' ) && ! doing_action( 'plugins_loaded' ) && ! class_exists( 'ActionScheduler', false ) ) {
action_scheduler_initialize_3_dot_7_dot_1(); // WRCS: DEFINED_VERSION.
do_action( 'action_scheduler_pre_theme_init' );
ActionScheduler_Versions::initialize_latest_version();
}
Expand Down
Loading

0 comments on commit a4d8ccf

Please sign in to comment.