Version Description
= [6.0] = Please see the changelog for the complete list of changes in this release. Previous versions of The Events Calendar are not cross-compatible with 6.X add-ons. Remember to always make a backup of your database and files before updating!
Download this release
Release Info
| Developer | bordoni |
| Plugin | |
| Version | 6.0.3 |
| Comparing to | |
| See all releases | |
Code changes from version 6.0.2 to 6.0.3
- common/lang/tribe-common-de_DE.mo +0 -0
- common/vendor/autoload.php +1 -1
- common/vendor/autoload_52.php +1 -1
- common/vendor/composer/autoload_real.php +4 -4
- common/vendor/composer/autoload_real_52.php +3 -3
- common/vendor/composer/autoload_static.php +5 -5
- lang/the-events-calendar-bg_BG.mo +0 -0
- lang/the-events-calendar-ca.mo +0 -0
- lang/the-events-calendar-cs_CZ.mo +0 -0
- lang/the-events-calendar-da_DK.mo +0 -0
- lang/the-events-calendar-de_CH.mo +0 -0
- lang/the-events-calendar-de_DE.mo +0 -0
- lang/the-events-calendar-en_AU.mo +0 -0
- lang/the-events-calendar-en_CA.mo +0 -0
- lang/the-events-calendar-en_GB.mo +0 -0
- lang/the-events-calendar-en_NZ.mo +0 -0
- lang/the-events-calendar-en_ZA.mo +0 -0
- lang/the-events-calendar-es_AR.mo +0 -0
- lang/the-events-calendar-es_CO.mo +0 -0
- lang/the-events-calendar-es_DO.mo +0 -0
- lang/the-events-calendar-es_EC.mo +0 -0
- lang/the-events-calendar-es_ES.mo +0 -0
- lang/the-events-calendar-es_MX.mo +0 -0
- lang/the-events-calendar-es_VE.mo +0 -0
- lang/the-events-calendar-et.mo +0 -0
- lang/the-events-calendar-fi.mo +0 -0
- lang/the-events-calendar-fr_FR.mo +0 -0
- lang/the-events-calendar-gl_ES.mo +0 -0
- lang/the-events-calendar-he_IL.mo +0 -0
- lang/the-events-calendar-hr.mo +0 -0
- lang/the-events-calendar-hu_HU.mo +0 -0
- lang/the-events-calendar-it_IT.mo +0 -0
- lang/the-events-calendar-ja.mo +0 -0
- lang/the-events-calendar-ko_KR.mo +0 -0
- lang/the-events-calendar-lt_LT.mo +0 -0
- lang/the-events-calendar-nb_NO.mo +0 -0
- lang/the-events-calendar-nl_NL.mo +0 -0
- lang/the-events-calendar-nn_NO.mo +0 -0
- lang/the-events-calendar-pl_PL.mo +0 -0
- lang/the-events-calendar-pt_BR.mo +0 -0
- lang/the-events-calendar-pt_PT.mo +0 -0
- lang/the-events-calendar-ro_RO.mo +0 -0
- lang/the-events-calendar-ru_RU.mo +0 -0
- lang/the-events-calendar-sv_SE.mo +0 -0
- lang/the-events-calendar-tr_TR.mo +0 -0
- lang/the-events-calendar-zh_CN.mo +0 -0
- readme.txt +6 -1
- src/Events/Custom_Tables/V1/WP_Query/Custom_Tables_Query.php +6 -2
- src/Events/Custom_Tables/V1/WP_Query/Repository/Custom_Tables_Query_Filters.php +45 -0
- src/Tribe/Main.php +1 -1
- src/Tribe/Plugin_Register.php +2 -2
- src/Tribe/REST/V1/Endpoints/Archive_Event.php +3 -0
- the-events-calendar.php +1 -1
- vendor/autoload.php +1 -1
- vendor/composer/autoload_real.php +4 -4
- vendor/composer/autoload_static.php +4 -4
common/lang/tribe-common-de_DE.mo
CHANGED
|
Binary file
|
common/vendor/autoload.php
CHANGED
|
@@ -4,4 +4,4 @@
|
|
| 4 |
|
| 5 |
require_once __DIR__ . '/composer/autoload_real.php';
|
| 6 |
|
| 7 |
-
return
|
| 4 |
|
| 5 |
require_once __DIR__ . '/composer/autoload_real.php';
|
| 6 |
|
| 7 |
+
return ComposerAutoloaderInitd859b498033b0033d130b8bfa9e109cb::getLoader();
|
common/vendor/autoload_52.php
CHANGED
|
@@ -4,4 +4,4 @@
|
|
| 4 |
|
| 5 |
require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
|
| 6 |
|
| 7 |
-
return
|
| 4 |
|
| 5 |
require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
|
| 6 |
|
| 7 |
+
return ComposerAutoloaderInit2b83e7ed6e0ca71be6b23d3d7d27b447::getLoader();
|
common/vendor/composer/autoload_real.php
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
|
| 3 |
// autoload_real.php @generated by Composer
|
| 4 |
|
| 5 |
-
class
|
| 6 |
{
|
| 7 |
private static $loader;
|
| 8 |
|
|
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit056ca7b243d7bf42befa037b52fc996b
|
|
| 19 |
return self::$loader;
|
| 20 |
}
|
| 21 |
|
| 22 |
-
spl_autoload_register(array('
|
| 23 |
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
|
| 24 |
-
spl_autoload_unregister(array('
|
| 25 |
|
| 26 |
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
| 27 |
if ($useStaticLoader) {
|
| 28 |
require_once __DIR__ . '/autoload_static.php';
|
| 29 |
|
| 30 |
-
call_user_func(\Composer\Autoload\
|
| 31 |
} else {
|
| 32 |
$map = require __DIR__ . '/autoload_namespaces.php';
|
| 33 |
foreach ($map as $namespace => $path) {
|
| 2 |
|
| 3 |
// autoload_real.php @generated by Composer
|
| 4 |
|
| 5 |
+
class ComposerAutoloaderInitd859b498033b0033d130b8bfa9e109cb
|
| 6 |
{
|
| 7 |
private static $loader;
|
| 8 |
|
| 19 |
return self::$loader;
|
| 20 |
}
|
| 21 |
|
| 22 |
+
spl_autoload_register(array('ComposerAutoloaderInitd859b498033b0033d130b8bfa9e109cb', 'loadClassLoader'), true, true);
|
| 23 |
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
|
| 24 |
+
spl_autoload_unregister(array('ComposerAutoloaderInitd859b498033b0033d130b8bfa9e109cb', 'loadClassLoader'));
|
| 25 |
|
| 26 |
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
| 27 |
if ($useStaticLoader) {
|
| 28 |
require_once __DIR__ . '/autoload_static.php';
|
| 29 |
|
| 30 |
+
call_user_func(\Composer\Autoload\ComposerStaticInitd859b498033b0033d130b8bfa9e109cb::getInitializer($loader));
|
| 31 |
} else {
|
| 32 |
$map = require __DIR__ . '/autoload_namespaces.php';
|
| 33 |
foreach ($map as $namespace => $path) {
|
common/vendor/composer/autoload_real_52.php
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
|
| 3 |
// autoload_real_52.php generated by xrstf/composer-php52
|
| 4 |
|
| 5 |
-
class
|
| 6 |
private static $loader;
|
| 7 |
|
| 8 |
public static function loadClassLoader($class) {
|
|
@@ -19,9 +19,9 @@ class ComposerAutoloaderIniteb458fcdd0ecec791f874bb2e9421548 {
|
|
| 19 |
return self::$loader;
|
| 20 |
}
|
| 21 |
|
| 22 |
-
spl_autoload_register(array('
|
| 23 |
self::$loader = $loader = new xrstf_Composer52_ClassLoader();
|
| 24 |
-
spl_autoload_unregister(array('
|
| 25 |
|
| 26 |
$vendorDir = dirname(dirname(__FILE__));
|
| 27 |
$baseDir = dirname($vendorDir);
|
| 2 |
|
| 3 |
// autoload_real_52.php generated by xrstf/composer-php52
|
| 4 |
|
| 5 |
+
class ComposerAutoloaderInit2b83e7ed6e0ca71be6b23d3d7d27b447 {
|
| 6 |
private static $loader;
|
| 7 |
|
| 8 |
public static function loadClassLoader($class) {
|
| 19 |
return self::$loader;
|
| 20 |
}
|
| 21 |
|
| 22 |
+
spl_autoload_register(array('ComposerAutoloaderInit2b83e7ed6e0ca71be6b23d3d7d27b447', 'loadClassLoader'), true /*, true */);
|
| 23 |
self::$loader = $loader = new xrstf_Composer52_ClassLoader();
|
| 24 |
+
spl_autoload_unregister(array('ComposerAutoloaderInit2b83e7ed6e0ca71be6b23d3d7d27b447', 'loadClassLoader'));
|
| 25 |
|
| 26 |
$vendorDir = dirname(dirname(__FILE__));
|
| 27 |
$baseDir = dirname($vendorDir);
|
common/vendor/composer/autoload_static.php
CHANGED
|
@@ -4,7 +4,7 @@
|
|
| 4 |
|
| 5 |
namespace Composer\Autoload;
|
| 6 |
|
| 7 |
-
class
|
| 8 |
{
|
| 9 |
public static $prefixLengthsPsr4 = array (
|
| 10 |
'T' =>
|
|
@@ -273,10 +273,10 @@ class ComposerStaticInit056ca7b243d7bf42befa037b52fc996b
|
|
| 273 |
public static function getInitializer(ClassLoader $loader)
|
| 274 |
{
|
| 275 |
return \Closure::bind(function () use ($loader) {
|
| 276 |
-
$loader->prefixLengthsPsr4 =
|
| 277 |
-
$loader->prefixDirsPsr4 =
|
| 278 |
-
$loader->prefixesPsr0 =
|
| 279 |
-
$loader->classMap =
|
| 280 |
|
| 281 |
}, null, ClassLoader::class);
|
| 282 |
}
|
| 4 |
|
| 5 |
namespace Composer\Autoload;
|
| 6 |
|
| 7 |
+
class ComposerStaticInitd859b498033b0033d130b8bfa9e109cb
|
| 8 |
{
|
| 9 |
public static $prefixLengthsPsr4 = array (
|
| 10 |
'T' =>
|
| 273 |
public static function getInitializer(ClassLoader $loader)
|
| 274 |
{
|
| 275 |
return \Closure::bind(function () use ($loader) {
|
| 276 |
+
$loader->prefixLengthsPsr4 = ComposerStaticInitd859b498033b0033d130b8bfa9e109cb::$prefixLengthsPsr4;
|
| 277 |
+
$loader->prefixDirsPsr4 = ComposerStaticInitd859b498033b0033d130b8bfa9e109cb::$prefixDirsPsr4;
|
| 278 |
+
$loader->prefixesPsr0 = ComposerStaticInitd859b498033b0033d130b8bfa9e109cb::$prefixesPsr0;
|
| 279 |
+
$loader->classMap = ComposerStaticInitd859b498033b0033d130b8bfa9e109cb::$classMap;
|
| 280 |
|
| 281 |
}, null, ClassLoader::class);
|
| 282 |
}
|
lang/the-events-calendar-bg_BG.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-ca.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-cs_CZ.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-da_DK.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-de_CH.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-de_DE.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-en_AU.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-en_CA.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-en_GB.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-en_NZ.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-en_ZA.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-es_AR.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-es_CO.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-es_DO.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-es_EC.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-es_ES.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-es_MX.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-es_VE.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-et.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-fi.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-fr_FR.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-gl_ES.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-he_IL.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-hr.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-hu_HU.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-it_IT.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-ja.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-ko_KR.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-lt_LT.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-nb_NO.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-nl_NL.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-nn_NO.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-pl_PL.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-pt_BR.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-pt_PT.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-ro_RO.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-ru_RU.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-sv_SE.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-tr_TR.mo
CHANGED
|
Binary file
|
lang/the-events-calendar-zh_CN.mo
CHANGED
|
Binary file
|
readme.txt
CHANGED
|
@@ -4,7 +4,7 @@ Contributors: theeventscalendar, borkweb, bordoni, brianjessee, aguseo, camwynsp
|
|
| 4 |
Tags: events, calendar, event, schedule, organizer
|
| 5 |
Donate link: https://evnt.is/29
|
| 6 |
Requires at least: 5.8.5
|
| 7 |
-
Stable tag: 6.0.
|
| 8 |
Tested up to: 6.0.3
|
| 9 |
Requires PHP: 7.3
|
| 10 |
License: GPLv2 or later
|
|
@@ -229,6 +229,10 @@ Remember to always make a backup of your database and files before updating!
|
|
| 229 |
|
| 230 |
== Changelog ==
|
| 231 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 232 |
= [6.0.2] 2022-10-20 =
|
| 233 |
|
| 234 |
* Feature - Add initial integration with Restrict Content Pro. This hides any events on the calendar views that the user is not allowed to view. [ [TEC-4457]]
|
|
@@ -263,6 +267,7 @@ Remember to always make a backup of your database and files before updating!
|
|
| 263 |
* Tweak - Speed up the Custom Tables v1 migration process if a browser window is open on the migration UI. [TEC-4517]
|
| 264 |
* Language - 11 new strings added, 149 updated, 2 fuzzied, and 2 obsoleted.
|
| 265 |
|
|
|
|
| 266 |
= [6.0.1.1] 2022-09-29 =
|
| 267 |
|
| 268 |
* Fix - Prevent Google Calendar duplicated Events from Importing with Aggregator. [TEC-4497]
|
| 4 |
Tags: events, calendar, event, schedule, organizer
|
| 5 |
Donate link: https://evnt.is/29
|
| 6 |
Requires at least: 5.8.5
|
| 7 |
+
Stable tag: 6.0.3
|
| 8 |
Tested up to: 6.0.3
|
| 9 |
Requires PHP: 7.3
|
| 10 |
License: GPLv2 or later
|
| 229 |
|
| 230 |
== Changelog ==
|
| 231 |
|
| 232 |
+
= [6.0.3] 2022-10-31 =
|
| 233 |
+
|
| 234 |
+
* Fix - Handle repository query filters correctly in custom tables context; fix a REST API issue. [ET-1567]
|
| 235 |
+
|
| 236 |
= [6.0.2] 2022-10-20 =
|
| 237 |
|
| 238 |
* Feature - Add initial integration with Restrict Content Pro. This hides any events on the calendar views that the user is not allowed to view. [ [TEC-4457]]
|
| 267 |
* Tweak - Speed up the Custom Tables v1 migration process if a browser window is open on the migration UI. [TEC-4517]
|
| 268 |
* Language - 11 new strings added, 149 updated, 2 fuzzied, and 2 obsoleted.
|
| 269 |
|
| 270 |
+
|
| 271 |
= [6.0.1.1] 2022-09-29 =
|
| 272 |
|
| 273 |
* Fix - Prevent Google Calendar duplicated Events from Importing with Aggregator. [TEC-4497]
|
src/Events/Custom_Tables/V1/WP_Query/Custom_Tables_Query.php
CHANGED
|
@@ -73,7 +73,6 @@ class Custom_Tables_Query extends WP_Query {
|
|
| 73 |
* @var Custom_Tables_Query_Filters $query_filters
|
| 74 |
*/
|
| 75 |
$query_filters = $wp_query->builder->filter_query;
|
| 76 |
-
$query_filters->set_query_var_mask( 'join', false );
|
| 77 |
$query_filters->set_query( $ct_query );
|
| 78 |
}
|
| 79 |
|
|
@@ -484,7 +483,12 @@ class Custom_Tables_Query extends WP_Query {
|
|
| 484 |
}
|
| 485 |
|
| 486 |
global $wpdb;
|
| 487 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 488 |
|
| 489 |
return $join;
|
| 490 |
}
|
| 73 |
* @var Custom_Tables_Query_Filters $query_filters
|
| 74 |
*/
|
| 75 |
$query_filters = $wp_query->builder->filter_query;
|
|
|
|
| 76 |
$query_filters->set_query( $ct_query );
|
| 77 |
}
|
| 78 |
|
| 483 |
}
|
| 484 |
|
| 485 |
global $wpdb;
|
| 486 |
+
$str = "JOIN {$occurrences} ON {$wpdb->posts}.ID = {$occurrences}.post_id";
|
| 487 |
+
|
| 488 |
+
if ( strpos( $join, $str ) === false ) {
|
| 489 |
+
// Let's add the JOIN clause only if we did not already.
|
| 490 |
+
$join .= ' ' . $str;
|
| 491 |
+
}
|
| 492 |
|
| 493 |
return $join;
|
| 494 |
}
|
src/Events/Custom_Tables/V1/WP_Query/Repository/Custom_Tables_Query_Filters.php
CHANGED
|
@@ -222,6 +222,8 @@ class Custom_Tables_Query_Filters extends Query_Filters {
|
|
| 222 |
global $wpdb;
|
| 223 |
$occurrences = Occurrences::table_name( true );
|
| 224 |
$this->query_vars['join'][] = "JOIN {$occurrences} ON {$wpdb->posts}.ID = {$occurrences}.post_id";
|
|
|
|
|
|
|
| 225 |
}
|
| 226 |
|
| 227 |
return parent::filter_posts_join( $join, $query );
|
|
@@ -421,4 +423,47 @@ class Custom_Tables_Query_Filters extends Query_Filters {
|
|
| 421 |
public function reset_query_vars_mask() {
|
| 422 |
$this->query_vars_mask = self::$default_query_vars_mask;
|
| 423 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 424 |
}
|
| 222 |
global $wpdb;
|
| 223 |
$occurrences = Occurrences::table_name( true );
|
| 224 |
$this->query_vars['join'][] = "JOIN {$occurrences} ON {$wpdb->posts}.ID = {$occurrences}.post_id";
|
| 225 |
+
} else if ( ! empty( $this->query_vars['join'] ) ) {
|
| 226 |
+
$join = $this->deduplicate_joins( $join );
|
| 227 |
}
|
| 228 |
|
| 229 |
return parent::filter_posts_join( $join, $query );
|
| 423 |
public function reset_query_vars_mask() {
|
| 424 |
$this->query_vars_mask = self::$default_query_vars_mask;
|
| 425 |
}
|
| 426 |
+
|
| 427 |
+
/**
|
| 428 |
+
* Returns a de-duplicated version of the query input JOIN clause that will not contain JOINs
|
| 429 |
+
* that would duplicated the ones set in the this object `join` query variables.
|
| 430 |
+
*
|
| 431 |
+
* @param string $query_join The query input JOIN clause.
|
| 432 |
+
*
|
| 433 |
+
* @return string The de-duplicated JOIN clause.
|
| 434 |
+
*/
|
| 435 |
+
protected function deduplicate_joins( $query_join ): string {
|
| 436 |
+
if ( ! is_string( $query_join ) || empty( $query_join ) || empty( $this->query_vars['join'] ) ) {
|
| 437 |
+
// Nothing to deduplicate.
|
| 438 |
+
return $query_join;
|
| 439 |
+
}
|
| 440 |
+
|
| 441 |
+
// Break each current JOIN clause into a set of couples in the shape `['JOIN' 'table on ...']`.
|
| 442 |
+
$query_vars_join_couples = [];
|
| 443 |
+
$preg_split_flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE;
|
| 444 |
+
foreach ( ( $this->query_vars['join'] ?? [] ) as $query_var_join ) {
|
| 445 |
+
$split = array_filter( preg_split( '/((?:LEFT|INNER|RIGHT)?\\s?JOIN)/', trim( $query_var_join ), 2, $preg_split_flags ) );
|
| 446 |
+
if ( count( $split ) !== 2 ) {
|
| 447 |
+
continue;
|
| 448 |
+
}
|
| 449 |
+
$query_vars_join_couples[] = [ reset( $split ), trim( end( $split ) ) ];
|
| 450 |
+
}
|
| 451 |
+
|
| 452 |
+
// Break the input query JOIN clause into a set of couples in the shape `['JOIN' 'table on ...']`.
|
| 453 |
+
$string_joins = array_filter( preg_split( '/((?:LEFT|INNER|RIGHT)?\\s?JOIN)/', trim( $query_join ), - 1, $preg_split_flags ) );
|
| 454 |
+
$query_join_couples = array_chunk( array_map( 'trim', $string_joins ), 2 );
|
| 455 |
+
|
| 456 |
+
// Now remove from the input query JOIN any JOIN already handled by this filter.
|
| 457 |
+
$b_join_whats = array_column( $query_join_couples, 1 );
|
| 458 |
+
foreach ( $query_vars_join_couples as $k => [$join_type, $join_what] ) {
|
| 459 |
+
if ( ! in_array( $join_what, $b_join_whats, true ) ) {
|
| 460 |
+
continue;
|
| 461 |
+
}
|
| 462 |
+
// Remove the JOIN clause from the query JOIN: it should be overridden by the filter's JOIN.
|
| 463 |
+
unset( $query_join_couples[ array_search( $join_what, $b_join_whats, true ) ] );
|
| 464 |
+
}
|
| 465 |
+
|
| 466 |
+
// Re-assemble the JOIN clause, minus the JOIN clauses removed as already handled by this filter.
|
| 467 |
+
return implode( ' ', array_merge( ...$query_join_couples ) );
|
| 468 |
+
}
|
| 469 |
}
|
src/Tribe/Main.php
CHANGED
|
@@ -37,7 +37,7 @@ if ( ! class_exists( 'Tribe__Events__Main' ) ) {
|
|
| 37 |
const VENUE_POST_TYPE = 'tribe_venue';
|
| 38 |
const ORGANIZER_POST_TYPE = 'tribe_organizer';
|
| 39 |
|
| 40 |
-
const VERSION = '6.0.
|
| 41 |
|
| 42 |
/**
|
| 43 |
* Min Pro Addon
|
| 37 |
const VENUE_POST_TYPE = 'tribe_venue';
|
| 38 |
const ORGANIZER_POST_TYPE = 'tribe_organizer';
|
| 39 |
|
| 40 |
+
const VERSION = '6.0.3';
|
| 41 |
|
| 42 |
/**
|
| 43 |
* Min Pro Addon
|
src/Tribe/Plugin_Register.php
CHANGED
|
@@ -11,8 +11,8 @@ class Tribe__Events__Plugin_Register extends Tribe__Abstract_Plugin_Register {
|
|
| 11 |
'Tribe__Events__Community__Main' => '4.10.0-dev',
|
| 12 |
'Tribe__Events__Community__Tickets__Main' => '4.8.0-dev',
|
| 13 |
// @todo @moraleida update the version below to the actual version of ET that will be released to support RBE
|
| 14 |
-
'Tribe__Tickets__Main' => '5.5.
|
| 15 |
-
'Tribe__Tickets_Plus__Main' => '5.6.
|
| 16 |
'Tribe__Events__Tickets__Eventbrite__Main' => '4.6.11-dev',
|
| 17 |
],
|
| 18 |
];
|
| 11 |
'Tribe__Events__Community__Main' => '4.10.0-dev',
|
| 12 |
'Tribe__Events__Community__Tickets__Main' => '4.8.0-dev',
|
| 13 |
// @todo @moraleida update the version below to the actual version of ET that will be released to support RBE
|
| 14 |
+
'Tribe__Tickets__Main' => '5.5.3-dev',
|
| 15 |
+
'Tribe__Tickets_Plus__Main' => '5.6.2-dev',
|
| 16 |
'Tribe__Events__Tickets__Eventbrite__Main' => '4.6.11-dev',
|
| 17 |
],
|
| 18 |
];
|
src/Tribe/REST/V1/Endpoints/Archive_Event.php
CHANGED
|
@@ -28,6 +28,7 @@ class Tribe__Events__REST__V1__Endpoints__Archive_Event
|
|
| 28 |
'starts_after' => 'starts_after',
|
| 29 |
'ends_before' => 'ends_before',
|
| 30 |
'ends_after' => 'ends_after',
|
|
|
|
| 31 |
];
|
| 32 |
|
| 33 |
/**
|
|
@@ -101,6 +102,8 @@ class Tribe__Events__REST__V1__Endpoints__Archive_Event
|
|
| 101 |
|
| 102 |
$args['post_parent'] = $request['post_parent'];
|
| 103 |
|
|
|
|
|
|
|
| 104 |
|
| 105 |
// Allow REST API users to define the default behavior of the inclusive date parameters.
|
| 106 |
$use_inclusive_start_end_dates = isset( $request['strict_dates'] ) ? ! filter_var( $request['strict_dates'], FILTER_VALIDATE_BOOLEAN ) : true;
|
| 28 |
'starts_after' => 'starts_after',
|
| 29 |
'ends_before' => 'ends_before',
|
| 30 |
'ends_after' => 'ends_after',
|
| 31 |
+
'ticketed' => 'ticketed',
|
| 32 |
];
|
| 33 |
|
| 34 |
/**
|
| 102 |
|
| 103 |
$args['post_parent'] = $request['post_parent'];
|
| 104 |
|
| 105 |
+
$args['ticketed'] = $request['ticketed'];
|
| 106 |
+
|
| 107 |
|
| 108 |
// Allow REST API users to define the default behavior of the inclusive date parameters.
|
| 109 |
$use_inclusive_start_end_dates = isset( $request['strict_dates'] ) ? ! filter_var( $request['strict_dates'], FILTER_VALIDATE_BOOLEAN ) : true;
|
the-events-calendar.php
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
/**
|
| 3 |
* Plugin Name: The Events Calendar
|
| 4 |
* Description: The Events Calendar is a carefully crafted, extensible plugin that lets you easily share your events. Beautiful. Solid. Awesome.
|
| 5 |
-
* Version: 6.0.
|
| 6 |
* Author: The Events Calendar
|
| 7 |
* Author URI: https://evnt.is/1x
|
| 8 |
* Text Domain: the-events-calendar
|
| 2 |
/**
|
| 3 |
* Plugin Name: The Events Calendar
|
| 4 |
* Description: The Events Calendar is a carefully crafted, extensible plugin that lets you easily share your events. Beautiful. Solid. Awesome.
|
| 5 |
+
* Version: 6.0.3
|
| 6 |
* Author: The Events Calendar
|
| 7 |
* Author URI: https://evnt.is/1x
|
| 8 |
* Text Domain: the-events-calendar
|
vendor/autoload.php
CHANGED
|
@@ -4,4 +4,4 @@
|
|
| 4 |
|
| 5 |
require_once __DIR__ . '/composer/autoload_real.php';
|
| 6 |
|
| 7 |
-
return
|
| 4 |
|
| 5 |
require_once __DIR__ . '/composer/autoload_real.php';
|
| 6 |
|
| 7 |
+
return ComposerAutoloaderInit7f946b61ad36942b6c3d8cb558a71695::getLoader();
|
vendor/composer/autoload_real.php
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
|
| 3 |
// autoload_real.php @generated by Composer
|
| 4 |
|
| 5 |
-
class
|
| 6 |
{
|
| 7 |
private static $loader;
|
| 8 |
|
|
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit6552effd43c97709ba80e8d54b06b08f
|
|
| 19 |
return self::$loader;
|
| 20 |
}
|
| 21 |
|
| 22 |
-
spl_autoload_register(array('
|
| 23 |
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
|
| 24 |
-
spl_autoload_unregister(array('
|
| 25 |
|
| 26 |
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
| 27 |
if ($useStaticLoader) {
|
| 28 |
require_once __DIR__ . '/autoload_static.php';
|
| 29 |
|
| 30 |
-
call_user_func(\Composer\Autoload\
|
| 31 |
} else {
|
| 32 |
$map = require __DIR__ . '/autoload_namespaces.php';
|
| 33 |
foreach ($map as $namespace => $path) {
|
| 2 |
|
| 3 |
// autoload_real.php @generated by Composer
|
| 4 |
|
| 5 |
+
class ComposerAutoloaderInit7f946b61ad36942b6c3d8cb558a71695
|
| 6 |
{
|
| 7 |
private static $loader;
|
| 8 |
|
| 19 |
return self::$loader;
|
| 20 |
}
|
| 21 |
|
| 22 |
+
spl_autoload_register(array('ComposerAutoloaderInit7f946b61ad36942b6c3d8cb558a71695', 'loadClassLoader'), true, true);
|
| 23 |
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
|
| 24 |
+
spl_autoload_unregister(array('ComposerAutoloaderInit7f946b61ad36942b6c3d8cb558a71695', 'loadClassLoader'));
|
| 25 |
|
| 26 |
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
| 27 |
if ($useStaticLoader) {
|
| 28 |
require_once __DIR__ . '/autoload_static.php';
|
| 29 |
|
| 30 |
+
call_user_func(\Composer\Autoload\ComposerStaticInit7f946b61ad36942b6c3d8cb558a71695::getInitializer($loader));
|
| 31 |
} else {
|
| 32 |
$map = require __DIR__ . '/autoload_namespaces.php';
|
| 33 |
foreach ($map as $namespace => $path) {
|
vendor/composer/autoload_static.php
CHANGED
|
@@ -4,7 +4,7 @@
|
|
| 4 |
|
| 5 |
namespace Composer\Autoload;
|
| 6 |
|
| 7 |
-
class
|
| 8 |
{
|
| 9 |
public static $prefixLengthsPsr4 = array (
|
| 10 |
'T' =>
|
|
@@ -276,9 +276,9 @@ class ComposerStaticInit6552effd43c97709ba80e8d54b06b08f
|
|
| 276 |
public static function getInitializer(ClassLoader $loader)
|
| 277 |
{
|
| 278 |
return \Closure::bind(function () use ($loader) {
|
| 279 |
-
$loader->prefixLengthsPsr4 =
|
| 280 |
-
$loader->prefixDirsPsr4 =
|
| 281 |
-
$loader->classMap =
|
| 282 |
|
| 283 |
}, null, ClassLoader::class);
|
| 284 |
}
|
| 4 |
|
| 5 |
namespace Composer\Autoload;
|
| 6 |
|
| 7 |
+
class ComposerStaticInit7f946b61ad36942b6c3d8cb558a71695
|
| 8 |
{
|
| 9 |
public static $prefixLengthsPsr4 = array (
|
| 10 |
'T' =>
|
| 276 |
public static function getInitializer(ClassLoader $loader)
|
| 277 |
{
|
| 278 |
return \Closure::bind(function () use ($loader) {
|
| 279 |
+
$loader->prefixLengthsPsr4 = ComposerStaticInit7f946b61ad36942b6c3d8cb558a71695::$prefixLengthsPsr4;
|
| 280 |
+
$loader->prefixDirsPsr4 = ComposerStaticInit7f946b61ad36942b6c3d8cb558a71695::$prefixDirsPsr4;
|
| 281 |
+
$loader->classMap = ComposerStaticInit7f946b61ad36942b6c3d8cb558a71695::$classMap;
|
| 282 |
|
| 283 |
}, null, ClassLoader::class);
|
| 284 |
}
|
