Toolset Types – Custom Post Types, Custom Fields and Taxonomies - Version 2.3.2

Version Description

  • An upgrade to the Installer component to prevent the notification about a possible upgrade to Types 3.0 for non-subscription users.
Download this release

Release Info

Developer zaantar
Plugin Icon 128x128 Toolset Types – Custom Post Types, Custom Fields and Taxonomies
Version 2.3.2
Comparing to
See all releases

Code changes from version 2.3.1 to 2.3.2

Files changed (9) hide show
  1. readme.txt +4 -1
  2. vendor/autoload.php +1 -1
  3. vendor/composer/autoload_real.php +7 -7
  4. vendor/composer/autoload_static.php +5 -5
  5. vendor/composer/installed.json +4 -4
  6. vendor/otgs/installer/changelog.txt +7 -1
  7. vendor/otgs/installer/includes/class-wp-installer.php +21 -1
  8. vendor/otgs/installer/loader.php +1 -1
  9. wpcf.php +2 -2
readme.txt CHANGED
@@ -8,7 +8,7 @@ License: GPLv2
8
  Requires at least: 3.7
9
  Requires PHP: 5.3
10
  Tested up to: 4.9
11
- Stable tag: 2.3.1
12
 
13
  The complete and reliable plugin for managing custom post types, custom taxonomies and custom fields.
14
 
@@ -171,6 +171,9 @@ Additionally, Types is the only plugin that lets you define parent/child relatio
171
 
172
  == Changelog ==
173
 
 
 
 
174
  = 2.3.1 =
175
  * Bring back the upgraded Installer in order to remedy upgrade issues for both subscription and non-subscription clients.
176
 
8
  Requires at least: 3.7
9
  Requires PHP: 5.3
10
  Tested up to: 4.9
11
+ Stable tag: 2.3.2
12
 
13
  The complete and reliable plugin for managing custom post types, custom taxonomies and custom fields.
14
 
171
 
172
  == Changelog ==
173
 
174
+ = 2.3.2 =
175
+ * An upgrade to the Installer component to prevent the notification about a possible upgrade to Types 3.0 for non-subscription users.
176
+
177
  = 2.3.1 =
178
  * Bring back the upgraded Installer in order to remedy upgrade issues for both subscription and non-subscription clients.
179
 
vendor/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
- return ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4::getLoader();
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInit39d4b17bdb5377514bee52a66c64b5fc::getLoader();
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4
6
  {
7
  private static $loader;
8
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4', '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\ComposerStaticInit7c997738567ea77204ed10983f70c9f4::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4
48
  $loader->register(true);
49
 
50
  if ($useStaticLoader) {
51
- $includeFiles = Composer\Autoload\ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
- composerRequire7c997738567ea77204ed10983f70c9f4($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
- function composerRequire7c997738567ea77204ed10983f70c9f4($fileIdentifier, $file)
64
  {
65
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66
  require $file;
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
+ class ComposerAutoloaderInit39d4b17bdb5377514bee52a66c64b5fc
6
  {
7
  private static $loader;
8
 
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInit39d4b17bdb5377514bee52a66c64b5fc', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInit39d4b17bdb5377514bee52a66c64b5fc', '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\ComposerStaticInit39d4b17bdb5377514bee52a66c64b5fc::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
48
  $loader->register(true);
49
 
50
  if ($useStaticLoader) {
51
+ $includeFiles = Composer\Autoload\ComposerStaticInit39d4b17bdb5377514bee52a66c64b5fc::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
+ composerRequire39d4b17bdb5377514bee52a66c64b5fc($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
+ function composerRequire39d4b17bdb5377514bee52a66c64b5fc($fileIdentifier, $file)
64
  {
65
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66
  require $file;
vendor/composer/autoload_static.php CHANGED
@@ -4,7 +4,7 @@
4
 
5
  namespace Composer\Autoload;
6
 
7
- class ComposerStaticInit7c997738567ea77204ed10983f70c9f4
8
  {
9
  public static $files = array (
10
  'a52c1eba913b4ecdd3571194b37baea9' => __DIR__ . '/../..' . '/application/functions.php',
@@ -919,10 +919,10 @@ class ComposerStaticInit7c997738567ea77204ed10983f70c9f4
919
  public static function getInitializer(ClassLoader $loader)
920
  {
921
  return \Closure::bind(function () use ($loader) {
922
- $loader->prefixLengthsPsr4 = ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$prefixLengthsPsr4;
923
- $loader->prefixDirsPsr4 = ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$prefixDirsPsr4;
924
- $loader->prefixesPsr0 = ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$prefixesPsr0;
925
- $loader->classMap = ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$classMap;
926
 
927
  }, null, ClassLoader::class);
928
  }
4
 
5
  namespace Composer\Autoload;
6
 
7
+ class ComposerStaticInit39d4b17bdb5377514bee52a66c64b5fc
8
  {
9
  public static $files = array (
10
  'a52c1eba913b4ecdd3571194b37baea9' => __DIR__ . '/../..' . '/application/functions.php',
919
  public static function getInitializer(ClassLoader $loader)
920
  {
921
  return \Closure::bind(function () use ($loader) {
922
+ $loader->prefixLengthsPsr4 = ComposerStaticInit39d4b17bdb5377514bee52a66c64b5fc::$prefixLengthsPsr4;
923
+ $loader->prefixDirsPsr4 = ComposerStaticInit39d4b17bdb5377514bee52a66c64b5fc::$prefixDirsPsr4;
924
+ $loader->prefixesPsr0 = ComposerStaticInit39d4b17bdb5377514bee52a66c64b5fc::$prefixesPsr0;
925
+ $loader->classMap = ComposerStaticInit39d4b17bdb5377514bee52a66c64b5fc::$classMap;
926
 
927
  }, null, ClassLoader::class);
928
  }
vendor/composer/installed.json CHANGED
@@ -138,12 +138,12 @@
138
  },
139
  {
140
  "name": "otgs/installer",
141
- "version": "1.8.18",
142
- "version_normalized": "1.8.18.0",
143
  "source": {
144
  "type": "git",
145
  "url": "ssh://git@git.onthegosystems.com:10022/installer/installer.git",
146
- "reference": "df1ab1ff7b017dadc0aae62b29f2d51ae8b7fd0d"
147
  },
148
  "require": {
149
  "composer/installers": "~1.0",
@@ -159,7 +159,7 @@
159
  "otgs/unit-tests-framework": "~1.2.0",
160
  "sebastian/phpcpd": "^3.0"
161
  },
162
- "time": "2018-06-06T08:51:23+00:00",
163
  "type": "library",
164
  "extra": {
165
  "branch-alias": {
138
  },
139
  {
140
  "name": "otgs/installer",
141
+ "version": "1.8.20",
142
+ "version_normalized": "1.8.20.0",
143
  "source": {
144
  "type": "git",
145
  "url": "ssh://git@git.onthegosystems.com:10022/installer/installer.git",
146
+ "reference": "b0e7b74f6f2c8436529fb84f11ca0e636d6ae4dd"
147
  },
148
  "require": {
149
  "composer/installers": "~1.0",
159
  "otgs/unit-tests-framework": "~1.2.0",
160
  "sebastian/phpcpd": "^3.0"
161
  },
162
+ "time": "2018-06-13T17:26:51+00:00",
163
  "type": "library",
164
  "extra": {
165
  "branch-alias": {
vendor/otgs/installer/changelog.txt CHANGED
@@ -1,3 +1,10 @@
 
 
 
 
 
 
 
1
  = 1.8.18 =
2
  * Fixed a scenario where the `get_plugins` function might not be defined yet
3
 
@@ -17,7 +24,6 @@
17
  * Fixed Warning when components storage cache is empty
18
 
19
  = 1.8.14 =
20
-
21
  * Optionally collect some site information and send to our Toolset and WPML servers, such as PHP version, theme and plugins
22
  * Resolved PHP fatal error when Types release/3.0 was active with WPML 3.9.4
23
  * Skipped sending reports when site key is missing
1
+ = 1.8.20 =
2
+ * Display a link for Toolset Types upgrade if there is an available paid update
3
+ * Do not include the plugin in the list of updates if it is not part of the current user subscription
4
+
5
+ = 1.8.19 =
6
+ * Fixed a bug that was preventing Types from being downloaded from wordpress.org
7
+
8
  = 1.8.18 =
9
  * Fixed a scenario where the `get_plugins` function might not be defined yet
10
 
24
  * Fixed Warning when components storage cache is empty
25
 
26
  = 1.8.14 =
 
27
  * Optionally collect some site information and send to our Toolset and WPML servers, such as PHP version, theme and plugins
28
  * Resolved PHP fatal error when Types release/3.0 was active with WPML 3.9.4
29
  * Skipped sending reports when site key is missing
vendor/otgs/installer/includes/class-wp-installer.php CHANGED
@@ -1,6 +1,9 @@
1
  <?php
2
 
3
  final class WP_Installer {
 
 
 
4
  protected static $_instance = null;
5
 
6
  public $settings = array();
@@ -347,6 +350,10 @@ final class WP_Installer {
347
  $this,
348
  'plugins_action_links_not_registered'
349
  ) );
 
 
 
 
350
  }
351
 
352
  }
@@ -363,6 +370,15 @@ final class WP_Installer {
363
 
364
  }
365
 
 
 
 
 
 
 
 
 
 
366
  public function plugins_action_links_registered( $links ) {
367
  $links[] = '<a href="' . $this->menu_url() . '">' . __( 'Registered', 'installer' ) . '</a>';
368
 
@@ -2170,7 +2186,7 @@ final class WP_Installer {
2170
  )
2171
  ) {
2172
 
2173
- if ( ! empty( $download['free-on-wporg'] ) && $download['channel'] == WP_Installer_Channels::CHANNEL_PRODUCTION ) {
2174
  return false; // use data from wordpress.org
2175
  }
2176
 
@@ -2246,6 +2262,10 @@ final class WP_Installer {
2246
 
2247
  $download = $this->settings['repositories'][ $repository_id ]['data']['downloads']['plugins'][ $plugin_slug ];
2248
 
 
 
 
 
2249
  $has_wporg_update = ! empty( $update_plugins->response[ $plugin_id ] );
2250
  if ( $this->should_fallback_under_wp_org_repo( $download, $site_key ) && $has_wporg_update ) {
2251
  continue;
1
  <?php
2
 
3
  final class WP_Installer {
4
+
5
+ const TOOLSET_TYPES = 'Toolset Types';
6
+
7
  protected static $_instance = null;
8
 
9
  public $settings = array();
350
  $this,
351
  'plugins_action_links_not_registered'
352
  ) );
353
+
354
+ if ( $this->should_display_types_upgrade_link( $r_plugin['name'], $plugin['Version'] ) ) {
355
+ add_filter( 'plugin_action_links_' . $plugin_id, array( $this, 'types_upgrade_link' ) );
356
+ }
357
  }
358
 
359
  }
370
 
371
  }
372
 
373
+ private function should_display_types_upgrade_link( $name, $version ) {
374
+ return $name === self::TOOLSET_TYPES && version_compare( $version, '3.0', '<' );
375
+ }
376
+
377
+ public function types_upgrade_link( $links ) {
378
+ $links[] = '<a style="color: #55AA55" target="_blank" href="'. esc_url( 'https://toolset.com/buy/?utm_source=typesplugin&utm_campaign=moving-types-to-toolset&utm_medium=plugins-page&utm_term=upgrade-link' ) .'">' . __( 'Upgrade', 'installer' ) . '</a>';
379
+ return $links;
380
+ }
381
+
382
  public function plugins_action_links_registered( $links ) {
383
  $links[] = '<a href="' . $this->menu_url() . '">' . __( 'Registered', 'installer' ) . '</a>';
384
 
2186
  )
2187
  ) {
2188
 
2189
+ if ( $this->should_fallback_under_wp_org_repo( $download, $site_key ) ) {
2190
  return false; // use data from wordpress.org
2191
  }
2192
 
2262
 
2263
  $download = $this->settings['repositories'][ $repository_id ]['data']['downloads']['plugins'][ $plugin_slug ];
2264
 
2265
+ if ( ! $this->plugin_is_registered( $repository_id, $download['slug'] ) ) {
2266
+ continue;
2267
+ }
2268
+
2269
  $has_wporg_update = ! empty( $update_plugins->response[ $plugin_id ] );
2270
  if ( $this->should_fallback_under_wp_org_repo( $download, $site_key ) && $has_wporg_update ) {
2271
  continue;
vendor/otgs/installer/loader.php CHANGED
@@ -22,7 +22,7 @@ $wp_installer_instance = dirname( __FILE__ ) . '/installer.php';
22
  global $wp_installer_instances;
23
  $wp_installer_instances[ $wp_installer_instance ] = array(
24
  'bootfile' => $wp_installer_instance,
25
- 'version' => '1.8.18'
26
  );
27
 
28
 
22
  global $wp_installer_instances;
23
  $wp_installer_instances[ $wp_installer_instance ] = array(
24
  'bootfile' => $wp_installer_instance,
25
+ 'version' => '1.8.20'
26
  );
27
 
28
 
wpcf.php CHANGED
@@ -5,7 +5,7 @@ Plugin URI: http://wordpress.org/extend/plugins/types/
5
  Description: Toolset Types defines custom content in WordPress. Easily create custom post types, fields and taxonomy and connect everything together.
6
  Author: OnTheGoSystems
7
  Author URI: http://www.onthegosystems.com
8
- Version: 2.3.1
9
  License: GPLv2 or later
10
 
11
  Types is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@ if ( ! function_exists( 'add_action' ) ) {
29
 
30
  // version
31
  if ( ! defined( 'TYPES_VERSION' ) ) {
32
- define( 'TYPES_VERSION', '2.3.1' );
33
  }
34
 
35
  // backward compatibility
5
  Description: Toolset Types defines custom content in WordPress. Easily create custom post types, fields and taxonomy and connect everything together.
6
  Author: OnTheGoSystems
7
  Author URI: http://www.onthegosystems.com
8
+ Version: 2.3.2
9
  License: GPLv2 or later
10
 
11
  Types is free software: you can redistribute it and/or modify
29
 
30
  // version
31
  if ( ! defined( 'TYPES_VERSION' ) ) {
32
+ define( 'TYPES_VERSION', '2.3.2' );
33
  }
34
 
35
  // backward compatibility