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

Version Description

  • Fixed a bug that caused WCML to request registration in order to receive updates.
Download this release

Release Info

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

Code changes from version 2.2.15 to 2.2.15.1

Files changed (9) hide show
  1. library/otgs/installer/changelog.txt +3 -0
  2. library/otgs/installer/includes/class-wp-installer-channels.php +14 -34
  3. library/otgs/installer/includes/class-wp-installer.php +3 -4
  4. library/otgs/installer/installer.php +1 -1
  5. library/otgs/installer/loader.php +1 -1
  6. library/otgs/installer/res/css/admin.css +5 -1
  7. library/otgs/installer/templates/repository-listing.php +1 -1
  8. readme.txt +5 -2
  9. wpcf.php +2 -2
library/otgs/installer/changelog.txt CHANGED
@@ -1,3 +1,6 @@
 
 
 
1
  = 1.8.1 =
2
  * Fixed a bug potentially making the downloads list under the Commercial not display correctly
3
 
1
+ = 1.8.2 =
2
+ * Bug fix: registration warning was shown for free plugins
3
+
4
  = 1.8.1 =
5
  * Fixed a bug potentially making the downloads list under the Commercial not display correctly
6
 
library/otgs/installer/includes/class-wp-installer-channels.php CHANGED
@@ -6,9 +6,9 @@
6
  */
7
  class WP_Installer_Channels{
8
 
9
- const CHANNEL_PRODUCTION = 1;
10
- const CHANNEL_BETA = 2;
11
- const CHANNEL_DEVELOPMENT = 3;
12
 
13
  protected static $_instance = null;
14
 
@@ -28,25 +28,6 @@ class WP_Installer_Channels{
28
  return self::$_instance;
29
  }
30
 
31
- /**
32
- * Get the channel literal id based on the numeric id
33
- *
34
- * @param int $int
35
- *
36
- * @return string
37
- */
38
- public static function channel_id( $int ) {
39
- if ( self::CHANNEL_DEVELOPMENT === $int ) {
40
- $channel = 'development';
41
- } elseif ( self::CHANNEL_BETA === $int ) {
42
- $channel = 'beta';
43
- } else {
44
- $channel = 'production';
45
- }
46
-
47
- return $channel;
48
- }
49
-
50
  /**
51
  * Get the channel literal id based on the numeric id
52
  *
@@ -55,9 +36,9 @@ class WP_Installer_Channels{
55
  * @return string
56
  */
57
  public static function channel_name_by_id( $id ) {
58
- if ( self::CHANNEL_DEVELOPMENT === $id || self::channel_id( self::CHANNEL_DEVELOPMENT ) === $id ) {
59
  $channel = __( 'Development', 'installer' );
60
- } elseif ( self::CHANNEL_BETA === $id || self::channel_id( self::CHANNEL_BETA ) === $id ) {
61
  $channel = __( 'Beta', 'installer' );
62
  } else {
63
  $channel = __( 'Production', 'installer' );
@@ -87,7 +68,7 @@ class WP_Installer_Channels{
87
  */
88
  public function set_channel(){
89
  $repository_id = sanitize_text_field( $_POST['repository_id'] );
90
- $channel = intval( $_POST['channel'] );
91
 
92
  $response = array();
93
 
@@ -114,7 +95,7 @@ class WP_Installer_Channels{
114
  * @return int
115
  */
116
  public function get_channel( $repository_id ){
117
- $channel = 0;
118
  if( isset( WP_Installer()->settings['repositories'][$repository_id]['channel'] ) ){
119
  $channel = WP_Installer()->settings['repositories'][$repository_id]['channel'];
120
  }
@@ -138,7 +119,6 @@ class WP_Installer_Channels{
138
  'no_prompt' => !empty( WP_Installer()->settings['repositories'][ $repository_id ]['no-prompt'] ),
139
  'nonce' => wp_create_nonce( 'installer_set_channel:' . $repository_id )
140
  );
141
-
142
  extract( $args );
143
  include WP_Installer()->plugin_path() . '/templates/channel-selector.php';
144
  }
@@ -181,10 +161,10 @@ class WP_Installer_Channels{
181
  foreach ( $downloads as $type => $download_types ) {
182
  foreach ( $download_types as $download ) {
183
  $extra_channels = isset( $download['extra_channels'] ) ? array_keys( $download['extra_channels'] ) : array();
184
- if ( ! $beta && in_array( self::channel_id( self::CHANNEL_BETA ), $extra_channels ) ) {
185
  $beta = true;
186
  }
187
- if ( ! $dev && in_array( self::channel_id( self::CHANNEL_DEVELOPMENT ), $extra_channels ) ) {
188
  $dev = true;
189
  }
190
  if ( $beta && $dev ) {
@@ -220,18 +200,18 @@ class WP_Installer_Channels{
220
  foreach ( $downloads as $type => $type_downloads ) {
221
  foreach ( $type_downloads as $slug => $download ) {
222
 
223
- $override_download = false;
224
  if ( $current_channel === self::CHANNEL_DEVELOPMENT ) {
225
  if( ! empty( $download['channels']['development'] ) ){
226
  $override_download = $download['channels']['development'];
227
- $override_download['channel'] = self::channel_id( self::CHANNEL_DEVELOPMENT );
228
  }elseif( ! empty( $download['channels']['beta'] ) ){
229
  $override_download = $download['channels']['beta'];
230
- $override_download['channel'] = self::channel_id( self::CHANNEL_BETA );
231
  }
232
  }elseif ( $current_channel === self::CHANNEL_BETA && ! empty( $download['channels']['beta'] ) ) {
233
  $override_download = $download['channels']['beta'];
234
- $override_download['channel'] = self::channel_id( self::CHANNEL_BETA );
235
  }
236
 
237
  if ( $override_download ) {
@@ -239,7 +219,7 @@ class WP_Installer_Channels{
239
  $downloads[ $type ][ $slug ][ $key ] = $value;
240
  }
241
  } else {
242
- $downloads[ $type ][ $slug ]['channel'] = self::channel_id( self::CHANNEL_PRODUCTION );
243
  }
244
  unset ( $downloads[ $type ][ $slug ]['channels'] );
245
 
6
  */
7
  class WP_Installer_Channels{
8
 
9
+ const CHANNEL_PRODUCTION = 'production';
10
+ const CHANNEL_BETA = 'beta';
11
+ const CHANNEL_DEVELOPMENT = 'development';
12
 
13
  protected static $_instance = null;
14
 
28
  return self::$_instance;
29
  }
30
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
31
  /**
32
  * Get the channel literal id based on the numeric id
33
  *
36
  * @return string
37
  */
38
  public static function channel_name_by_id( $id ) {
39
+ if ( self::CHANNEL_DEVELOPMENT === $id ) {
40
  $channel = __( 'Development', 'installer' );
41
+ } elseif ( self::CHANNEL_BETA === $id ) {
42
  $channel = __( 'Beta', 'installer' );
43
  } else {
44
  $channel = __( 'Production', 'installer' );
68
  */
69
  public function set_channel(){
70
  $repository_id = sanitize_text_field( $_POST['repository_id'] );
71
+ $channel = sanitize_text_field( $_POST['channel'] );
72
 
73
  $response = array();
74
 
95
  * @return int
96
  */
97
  public function get_channel( $repository_id ){
98
+ $channel = self::CHANNEL_PRODUCTION;
99
  if( isset( WP_Installer()->settings['repositories'][$repository_id]['channel'] ) ){
100
  $channel = WP_Installer()->settings['repositories'][$repository_id]['channel'];
101
  }
119
  'no_prompt' => !empty( WP_Installer()->settings['repositories'][ $repository_id ]['no-prompt'] ),
120
  'nonce' => wp_create_nonce( 'installer_set_channel:' . $repository_id )
121
  );
 
122
  extract( $args );
123
  include WP_Installer()->plugin_path() . '/templates/channel-selector.php';
124
  }
161
  foreach ( $downloads as $type => $download_types ) {
162
  foreach ( $download_types as $download ) {
163
  $extra_channels = isset( $download['extra_channels'] ) ? array_keys( $download['extra_channels'] ) : array();
164
+ if ( ! $beta && in_array( self::CHANNEL_BETA, $extra_channels ) ) {
165
  $beta = true;
166
  }
167
+ if ( ! $dev && in_array( self::CHANNEL_DEVELOPMENT, $extra_channels ) ) {
168
  $dev = true;
169
  }
170
  if ( $beta && $dev ) {
200
  foreach ( $downloads as $type => $type_downloads ) {
201
  foreach ( $type_downloads as $slug => $download ) {
202
 
203
+ $override_download = array();
204
  if ( $current_channel === self::CHANNEL_DEVELOPMENT ) {
205
  if( ! empty( $download['channels']['development'] ) ){
206
  $override_download = $download['channels']['development'];
207
+ $override_download['channel'] = self::CHANNEL_DEVELOPMENT;
208
  }elseif( ! empty( $download['channels']['beta'] ) ){
209
  $override_download = $download['channels']['beta'];
210
+ $override_download['channel'] = self::CHANNEL_BETA;
211
  }
212
  }elseif ( $current_channel === self::CHANNEL_BETA && ! empty( $download['channels']['beta'] ) ) {
213
  $override_download = $download['channels']['beta'];
214
+ $override_download['channel'] = self::CHANNEL_BETA;
215
  }
216
 
217
  if ( $override_download ) {
219
  $downloads[ $type ][ $slug ][ $key ] = $value;
220
  }
221
  } else {
222
+ $downloads[ $type ][ $slug ]['channel'] = self::CHANNEL_PRODUCTION;
223
  }
224
  unset ( $downloads[ $type ][ $slug ]['channels'] );
225
 
library/otgs/installer/includes/class-wp-installer.php CHANGED
@@ -2107,7 +2107,7 @@ final class WP_Installer {
2107
  )
2108
  ) {
2109
 
2110
- if ( $download['slug'] == 'types' || ( ! empty( $download['free-on-wporg'] ) && $download['channel'] == WP_Installer_Channels::CHANNEL_PRODUCTION ) ) {
2111
  return false; // use data from wordpress.org
2112
  }
2113
 
@@ -2183,7 +2183,7 @@ final class WP_Installer {
2183
 
2184
  $download = $this->settings['repositories'][ $repository_id ]['data']['downloads']['plugins'][ $plugin_slug ];
2185
 
2186
- if ( $download['slug'] == 'types' || ( ! empty( $download['free-on-wporg'] ) && $download['channel'] == WP_Installer_Channels::CHANNEL_PRODUCTION ) ) {
2187
  continue;
2188
  }
2189
 
@@ -2255,8 +2255,7 @@ final class WP_Installer {
2255
  foreach ( $product['plugins'] as $plugin_slug ) {
2256
 
2257
  $download = $this->settings['repositories'][ $repository_id ]['data']['downloads']['plugins'][ $plugin_slug ];
2258
-
2259
- if ( $download['slug'] == 'types' || ( ! empty( $download['free-on-wporg'] ) && $download['channel'] == WP_Installer_Channels::CHANNEL_PRODUCTION ) ) {
2260
  continue;
2261
  }
2262
 
2107
  )
2108
  ) {
2109
 
2110
+ if ( ! empty( $download['free-on-wporg'] ) && $download['channel'] == WP_Installer_Channels::CHANNEL_PRODUCTION ) {
2111
  return false; // use data from wordpress.org
2112
  }
2113
 
2183
 
2184
  $download = $this->settings['repositories'][ $repository_id ]['data']['downloads']['plugins'][ $plugin_slug ];
2185
 
2186
+ if ( ! empty( $download['free-on-wporg'] ) && $download['channel'] == WP_Installer_Channels::CHANNEL_PRODUCTION ) {
2187
  continue;
2188
  }
2189
 
2255
  foreach ( $product['plugins'] as $plugin_slug ) {
2256
 
2257
  $download = $this->settings['repositories'][ $repository_id ]['data']['downloads']['plugins'][ $plugin_slug ];
2258
+ if ( ! empty( $download['free-on-wporg'] ) && $download['channel'] == WP_Installer_Channels::CHANNEL_PRODUCTION ) {
 
2259
  continue;
2260
  }
2261
 
library/otgs/installer/installer.php CHANGED
@@ -1,5 +1,5 @@
1
  <?php
2
- define( 'WP_INSTALLER_VERSION', '1.8.1' );
3
 
4
  include_once dirname( __FILE__ ) . '/includes/functions-core.php';
5
  include_once dirname( __FILE__ ) . '/includes/class-wp-installer.php';
1
  <?php
2
+ define( 'WP_INSTALLER_VERSION', '1.8.2' );
3
 
4
  include_once dirname( __FILE__ ) . '/includes/functions-core.php';
5
  include_once dirname( __FILE__ ) . '/includes/class-wp-installer.php';
library/otgs/installer/loader.php CHANGED
@@ -19,7 +19,7 @@ $wp_installer_instance = dirname(__FILE__) . '/installer.php';
19
  global $wp_installer_instances;
20
  $wp_installer_instances[$wp_installer_instance] = array(
21
  'bootfile' => $wp_installer_instance,
22
- 'version' => '1.8.1'
23
  );
24
 
25
 
19
  global $wp_installer_instances;
20
  $wp_installer_instances[$wp_installer_instance] = array(
21
  'bootfile' => $wp_installer_instance,
22
+ 'version' => '1.8.2'
23
  );
24
 
25
 
library/otgs/installer/res/css/admin.css CHANGED
@@ -286,4 +286,8 @@
286
  padding-left: 10px;
287
  display: none;
288
  color: #962722;
289
- }
 
 
 
 
286
  padding-left: 10px;
287
  display: none;
288
  color: #962722;
289
+ }
290
+
291
+ .otgs_wp_installer_table .installer-repository-image {
292
+ padding: 8px 20px;
293
+ }
library/otgs/installer/templates/repository-listing.php CHANGED
@@ -122,7 +122,7 @@
122
 
123
  <?php foreach($packages as $package): ?>
124
  <tr id="repository-<?php echo $repository_id ?>_<?php echo $package['id'] ?>">
125
- <td><img width="140" height="140" src="<?php echo $package['image_url'] ?>" /></td>
126
  <td>
127
  <p><strong><?php echo $package['name'] ?></strong></p>
128
  <p><?php echo $package['description'] ?></p>
122
 
123
  <?php foreach($packages as $package): ?>
124
  <tr id="repository-<?php echo $repository_id ?>_<?php echo $package['id'] ?>">
125
+ <td class="installer-repository-image"><img width="140" src="<?php echo $package['image_url'] ?>" /></td>
126
  <td>
127
  <p><strong><?php echo $package['name'] ?></strong></p>
128
  <p><?php echo $package['description'] ?></p>
readme.txt CHANGED
@@ -6,8 +6,8 @@ Text Domain: wpcf
6
  Domain Path: /embedded/locale
7
  License: GPLv2
8
  Requires at least: 3.7
9
- Tested up to: 4.8
10
- Stable tag: 2.2.15
11
 
12
  The complete and reliable plugin for managing custom post types, custom taxonomies and custom fields.
13
 
@@ -158,6 +158,9 @@ Additionally, Types is the only plugin that lets you define parent/child relatio
158
 
159
  == Changelog ==
160
 
 
 
 
161
  = 2.2.15 =
162
  * Fixed a bug that caused Types to request registration in order to receive updates.
163
 
6
  Domain Path: /embedded/locale
7
  License: GPLv2
8
  Requires at least: 3.7
9
+ Tested up to: 4.8.1
10
+ Stable tag: 2.2.15.1
11
 
12
  The complete and reliable plugin for managing custom post types, custom taxonomies and custom fields.
13
 
158
 
159
  == Changelog ==
160
 
161
+ = 2.2.15.1 =
162
+ * Fixed a bug that caused WCML to request registration in order to receive updates.
163
+
164
  = 2.2.15 =
165
  * Fixed a bug that caused Types to request registration in order to receive updates.
166
 
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.2.15
9
  License: GPLv2 or later
10
 
11
  Types is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@ if( !function_exists( 'add_action' ) )
28
 
29
  // version
30
  if( ! defined( 'TYPES_VERSION' ) )
31
- define( 'TYPES_VERSION', '2.2.15' );
32
 
33
  // backward compatibility
34
  if ( ! defined( 'WPCF_VERSION' ) )
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.2.15.1
9
  License: GPLv2 or later
10
 
11
  Types is free software: you can redistribute it and/or modify
28
 
29
  // version
30
  if( ! defined( 'TYPES_VERSION' ) )
31
+ define( 'TYPES_VERSION', '2.2.15.1' );
32
 
33
  // backward compatibility
34
  if ( ! defined( 'WPCF_VERSION' ) )