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

Version Description

  • Fixed an issue when using 3rd party shortcodes on the WYSIWYG field
Download this release

Release Info

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

Code changes from version 2.2.18 to 2.2.19

Files changed (7) hide show
  1. readme.txt +5 -2
  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 +12 -12
  6. vendor/toolset/types/embedded/includes/fields/wysiwyg.php +23 -9
  7. wpcf.php +2 -2
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.1
10
- Stable tag: 2.2.18
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.18 =
162
  * Fixed an issue when adding option to checkbox / radio / select field
163
  * Fixed an issue with Custom Post Types loading (since WordPress 4.8.2)
6
  Domain Path: /embedded/locale
7
  License: GPLv2
8
  Requires at least: 3.7
9
+ Tested up to: 4.9
10
+ Stable tag: 2.2.19
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.19 =
162
+ * Fixed an issue when using 3rd party shortcodes on the WYSIWYG field
163
+
164
  = 2.2.18 =
165
  * Fixed an issue when adding option to checkbox / radio / select field
166
  * Fixed an issue with Custom Post Types loading (since WordPress 4.8.2)
vendor/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
- return ComposerAutoloaderInit02ae3ccb850d178bd58e2f427ca06b9a::getLoader();
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInit9dc3a75d9bf0dcdec570d52c4943bef9::getLoader();
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit02ae3ccb850d178bd58e2f427ca06b9a
6
  {
7
  private static $loader;
8
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit02ae3ccb850d178bd58e2f427ca06b9a
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit02ae3ccb850d178bd58e2f427ca06b9a', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit02ae3ccb850d178bd58e2f427ca06b9a', '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\ComposerStaticInit02ae3ccb850d178bd58e2f427ca06b9a::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit02ae3ccb850d178bd58e2f427ca06b9a
48
  $loader->register(true);
49
 
50
  if ($useStaticLoader) {
51
- $includeFiles = Composer\Autoload\ComposerStaticInit02ae3ccb850d178bd58e2f427ca06b9a::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
- composerRequire02ae3ccb850d178bd58e2f427ca06b9a($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
- function composerRequire02ae3ccb850d178bd58e2f427ca06b9a($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 ComposerAutoloaderInit9dc3a75d9bf0dcdec570d52c4943bef9
6
  {
7
  private static $loader;
8
 
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInit9dc3a75d9bf0dcdec570d52c4943bef9', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInit9dc3a75d9bf0dcdec570d52c4943bef9', '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\ComposerStaticInit9dc3a75d9bf0dcdec570d52c4943bef9::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\ComposerStaticInit9dc3a75d9bf0dcdec570d52c4943bef9::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
+ composerRequire9dc3a75d9bf0dcdec570d52c4943bef9($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
+ function composerRequire9dc3a75d9bf0dcdec570d52c4943bef9($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 ComposerStaticInit02ae3ccb850d178bd58e2f427ca06b9a
8
  {
9
  public static $files = array (
10
  'a52c1eba913b4ecdd3571194b37baea9' => __DIR__ . '/../..' . '/application/functions.php',
@@ -727,10 +727,10 @@ class ComposerStaticInit02ae3ccb850d178bd58e2f427ca06b9a
727
  public static function getInitializer(ClassLoader $loader)
728
  {
729
  return \Closure::bind(function () use ($loader) {
730
- $loader->prefixLengthsPsr4 = ComposerStaticInit02ae3ccb850d178bd58e2f427ca06b9a::$prefixLengthsPsr4;
731
- $loader->prefixDirsPsr4 = ComposerStaticInit02ae3ccb850d178bd58e2f427ca06b9a::$prefixDirsPsr4;
732
- $loader->prefixesPsr0 = ComposerStaticInit02ae3ccb850d178bd58e2f427ca06b9a::$prefixesPsr0;
733
- $loader->classMap = ComposerStaticInit02ae3ccb850d178bd58e2f427ca06b9a::$classMap;
734
 
735
  }, null, ClassLoader::class);
736
  }
4
 
5
  namespace Composer\Autoload;
6
 
7
+ class ComposerStaticInit9dc3a75d9bf0dcdec570d52c4943bef9
8
  {
9
  public static $files = array (
10
  'a52c1eba913b4ecdd3571194b37baea9' => __DIR__ . '/../..' . '/application/functions.php',
727
  public static function getInitializer(ClassLoader $loader)
728
  {
729
  return \Closure::bind(function () use ($loader) {
730
+ $loader->prefixLengthsPsr4 = ComposerStaticInit9dc3a75d9bf0dcdec570d52c4943bef9::$prefixLengthsPsr4;
731
+ $loader->prefixDirsPsr4 = ComposerStaticInit9dc3a75d9bf0dcdec570d52c4943bef9::$prefixDirsPsr4;
732
+ $loader->prefixesPsr0 = ComposerStaticInit9dc3a75d9bf0dcdec570d52c4943bef9::$prefixesPsr0;
733
+ $loader->classMap = ComposerStaticInit9dc3a75d9bf0dcdec570d52c4943bef9::$classMap;
734
 
735
  }, null, ClassLoader::class);
736
  }
vendor/composer/installed.json CHANGED
@@ -353,12 +353,12 @@
353
  "source": {
354
  "type": "git",
355
  "url": "https://github.com/Roave/SecurityAdvisories.git",
356
- "reference": "9660ad3b85be3e3b90eacb9be3fcf7d12be60a90"
357
  },
358
  "dist": {
359
  "type": "zip",
360
- "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/9660ad3b85be3e3b90eacb9be3fcf7d12be60a90",
361
- "reference": "9660ad3b85be3e3b90eacb9be3fcf7d12be60a90",
362
  "shasum": ""
363
  },
364
  "conflict": {
@@ -366,7 +366,7 @@
366
  "amphp/artax": ">=2,<2.0.6|<1.0.6",
367
  "aws/aws-sdk-php": ">=3,<3.2.1",
368
  "bugsnag/bugsnag-laravel": ">=2,<2.0.2",
369
- "cakephp/cakephp": ">=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.0.15|>=1.3,<1.3.18|>=3.1,<3.1.4",
370
  "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4",
371
  "cartalyst/sentry": "<2.1",
372
  "codeigniter/framework": "<=3.0.6",
@@ -386,7 +386,7 @@
386
  "dompdf/dompdf": ">=0.6,<0.6.2",
387
  "drupal/core": ">=8,<8.3.7",
388
  "drupal/drupal": ">=8,<8.3.7",
389
- "ezsystems/ezpublish-legacy": ">=5.4,<5.4.10.1|>=5.3,<5.3.12.2|>=2017.8,<2017.8.1.1",
390
  "firebase/php-jwt": "<2",
391
  "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
392
  "friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
@@ -427,20 +427,20 @@
427
  "symfony/http-kernel": ">=2,<2.3.29|>=2.4,<2.5.12|>=2.6,<2.6.8",
428
  "symfony/routing": ">=2,<2.0.19",
429
  "symfony/security": ">=2.3,<2.3.37|>=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5|>=2,<2.0.25|>=2.1,<2.1.13|>=2.2,<2.2.9",
430
- "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5|>=2.8,<2.8.6|>=3,<3.0.6",
431
- "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.13|>=2.8,<2.8.6|>=3,<3.0.6",
432
  "symfony/serializer": ">=2,<2.0.11",
433
- "symfony/symfony": ">=2,<2.3.41|>=2.4,<2.7.13|>=2.8,<2.8.6|>=3,<3.0.6|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5",
434
  "symfony/translation": ">=2,<2.0.17",
435
  "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3",
436
  "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4",
437
  "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
438
  "thelia/backoffice-default-template": ">=2.1,<2.1.2",
439
- "thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3",
440
  "twig/twig": "<1.20",
441
  "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.22|>=8,<8.7.5",
442
- "typo3/flow": ">=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5|>=1,<1.0.4",
443
- "typo3/neos": ">=1.2,<1.2.13|>=2,<2.0.4|>=1.1,<1.1.3",
444
  "willdurand/js-translation-bundle": "<2.1.1",
445
  "yiisoft/yii": ">=1.1.14,<1.1.15",
446
  "yiisoft/yii2": "<2.0.5",
@@ -471,7 +471,7 @@
471
  "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3",
472
  "zfr/zfr-oauth2-server-module": "<0.1.2"
473
  },
474
- "time": "2017-10-29T18:43:15+00:00",
475
  "type": "metapackage",
476
  "notification-url": "https://packagist.org/downloads/",
477
  "license": [
353
  "source": {
354
  "type": "git",
355
  "url": "https://github.com/Roave/SecurityAdvisories.git",
356
+ "reference": "43f7f8243b81e3fd843b150a30a6d0a91167d4f5"
357
  },
358
  "dist": {
359
  "type": "zip",
360
+ "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/43f7f8243b81e3fd843b150a30a6d0a91167d4f5",
361
+ "reference": "43f7f8243b81e3fd843b150a30a6d0a91167d4f5",
362
  "shasum": ""
363
  },
364
  "conflict": {
366
  "amphp/artax": ">=2,<2.0.6|<1.0.6",
367
  "aws/aws-sdk-php": ">=3,<3.2.1",
368
  "bugsnag/bugsnag-laravel": ">=2,<2.0.2",
369
+ "cakephp/cakephp": ">=2,<2.4.99|>=1.3,<1.3.18|>=3,<3.0.15|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3.1,<3.1.4",
370
  "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4",
371
  "cartalyst/sentry": "<2.1",
372
  "codeigniter/framework": "<=3.0.6",
386
  "dompdf/dompdf": ">=0.6,<0.6.2",
387
  "drupal/core": ">=8,<8.3.7",
388
  "drupal/drupal": ">=8,<8.3.7",
389
+ "ezsystems/ezpublish-legacy": ">=2017.8,<2017.8.1.1|>=5.4,<5.4.10.1|>=5.3,<5.3.12.2",
390
  "firebase/php-jwt": "<2",
391
  "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
392
  "friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
427
  "symfony/http-kernel": ">=2,<2.3.29|>=2.4,<2.5.12|>=2.6,<2.6.8",
428
  "symfony/routing": ">=2,<2.0.19",
429
  "symfony/security": ">=2.3,<2.3.37|>=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5|>=2,<2.0.25|>=2.1,<2.1.13|>=2.2,<2.2.9",
430
+ "symfony/security-core": ">=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5|>=2.8,<2.8.6|>=3,<3.0.6|>=2.4,<2.6.13|>=2.7,<2.7.9",
431
+ "symfony/security-http": ">=2.4,<2.7.13|>=2.3,<2.3.41|>=2.8,<2.8.6|>=3,<3.0.6",
432
  "symfony/serializer": ">=2,<2.0.11",
433
+ "symfony/symfony": ">=2,<2.3.41|>=2.4,<2.7.13|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5|>=2.8,<2.8.6|>=3,<3.0.6",
434
  "symfony/translation": ">=2,<2.0.17",
435
  "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3",
436
  "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4",
437
  "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
438
  "thelia/backoffice-default-template": ">=2.1,<2.1.2",
439
+ "thelia/thelia": ">=2.1.0-beta1,<2.1.3|>=2.1,<2.1.2",
440
  "twig/twig": "<1.20",
441
  "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.22|>=8,<8.7.5",
442
+ "typo3/flow": ">=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5|>=1.1,<1.1.1|>=2,<2.0.1|>=1,<1.0.4",
443
+ "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4",
444
  "willdurand/js-translation-bundle": "<2.1.1",
445
  "yiisoft/yii": ">=1.1.14,<1.1.15",
446
  "yiisoft/yii2": "<2.0.5",
471
  "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3",
472
  "zfr/zfr-oauth2-server-module": "<0.1.2"
473
  },
474
+ "time": "2017-10-31T23:55:04+00:00",
475
  "type": "metapackage",
476
  "notification-url": "https://packagist.org/downloads/",
477
  "license": [
vendor/toolset/types/embedded/includes/fields/wysiwyg.php CHANGED
@@ -134,14 +134,20 @@ function wpcf_fields_wysiwyg_view( $params ) {
134
  $content = stripslashes( $params['field_value'] );
135
 
136
  $the_content_default_filters = array(
137
- 'wptexturize', 'convert_smilies', 'convert_chars', 'wpautop',
138
- 'shortcode_unautop', 'prepend_attachment', 'capital_P_dangit', 'do_shortcode'
 
 
 
 
 
 
139
  );
140
 
141
  if ( isset( $params['suppress_filters'] ) && $params['suppress_filters'] == 'true' ) {
142
  // suppress filter is used, we still apply the default filters
143
  // (otherwise WYSIWYG is no more than a multiline field)
144
- foreach ( $the_content_default_filters as $func ) {
145
  if ( function_exists( $func ) ) {
146
  $content = call_user_func( $func, $content );
147
  }
@@ -151,21 +157,29 @@ function wpcf_fields_wysiwyg_view( $params ) {
151
 
152
  } else {
153
  $filter_state = new WPCF_WP_filter_state( 'the_content' );
 
154
 
155
  // make sure all default
156
- foreach ( $the_content_default_filters as $filter ) {
157
  if ( has_filter( 'the_content', $filter ) ) {
158
  // filter is registered and will be applied by apply_filters() after this loop
159
  continue;
160
  }
161
 
162
- if ( function_exists( $filter ) ) {
163
- // apply filter function
164
- $content = call_user_func( $filter, $content );
165
- }
 
166
  }
167
 
168
- $output .= apply_filters( 'the_content', $content );
 
 
 
 
 
 
169
 
170
  if ((!(strpos( $output, "&amp;#91;") === false)) && (!( strpos( $output, "&amp;#93;") === false)) && (!(strpos( $output, "<pre") === false)) ) {
171
  global $SyntaxHighlighter;
134
  $content = stripslashes( $params['field_value'] );
135
 
136
  $the_content_default_filters = array(
137
+ 'wptexturize' => 10,
138
+ 'wpautop' => 10,
139
+ 'shortcode_unautop' => 10,
140
+ 'prepend_attachment' => 10,
141
+ 'convert_chars' => 10,
142
+ 'capital_P_dangit' => 11,
143
+ 'do_shortcode' => 11,
144
+ 'convert_smilies' => 20,
145
  );
146
 
147
  if ( isset( $params['suppress_filters'] ) && $params['suppress_filters'] == 'true' ) {
148
  // suppress filter is used, we still apply the default filters
149
  // (otherwise WYSIWYG is no more than a multiline field)
150
+ foreach ( $the_content_default_filters as $func => $priority ) {
151
  if ( function_exists( $func ) ) {
152
  $content = call_user_func( $func, $content );
153
  }
157
 
158
  } else {
159
  $filter_state = new WPCF_WP_filter_state( 'the_content' );
160
+ $applied_original_filters = array();
161
 
162
  // make sure all default
163
+ foreach ( $the_content_default_filters as $filter => $priority ) {
164
  if ( has_filter( 'the_content', $filter ) ) {
165
  // filter is registered and will be applied by apply_filters() after this loop
166
  continue;
167
  }
168
 
169
+ // add filter again
170
+ add_filter( 'the_content', $filter, $priority );
171
+
172
+ // store added filter
173
+ $applied_original_filters[$filter] = $priority;
174
  }
175
 
176
+
177
+ $output .= apply_filters( 'the_content', $content );
178
+
179
+ // remove all previously added filters
180
+ foreach( $applied_original_filters as $filter => $priority ) {
181
+ remove_filter( 'the_content', $filter, $priority );
182
+ }
183
 
184
  if ((!(strpos( $output, "&amp;#91;") === false)) && (!( strpos( $output, "&amp;#93;") === false)) && (!(strpos( $output, "<pre") === false)) ) {
185
  global $SyntaxHighlighter;
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.18
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.2.18' );
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.2.19
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.2.19' );
33
  }
34
 
35
  // backward compatibility