WordPress.org
Get WordPress

Plugin Directory

Changeset 1888136


Ignore:
Timestamp:
06/06/2018 11:53:43 AM (8 years ago)
Author:
zaantar
Message:

Version 2.3.1

Location:
types/trunk
Files:
213 added
1 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • types/trunk/application/bootstrap.php

    r1883904 r1888136  
    3434}
    3535
     36// installer
     37$installer = TYPES_ABSPATH . '/vendor/otgs/installer/loader.php';
     38if ( file_exists( $installer ) ) {
     39    /** @noinspection PhpIncludeInspection */
     40    include_once $installer;
     41    if ( function_exists( 'WP_Installer_Setup' ) ) {
     42        WP_Installer_Setup(
     43            $wp_installer_instance,
     44            array(
     45                'plugins_install_tab' => '1',
     46                'repositories_include' => array('toolset', 'wpml')
     47            )
     48        );
     49    }
     50}
     51
    3652
    3753// Get new functions.php

  • types/trunk/readme.txt

    r1883962 r1888136  
    1010Tested up to: 4.9
    1111Stable tag: 2.3
     12
    1213The complete and reliable plugin for managing custom post types, custom taxonomies and custom fields.
    1314
    … …  
    170171
    171172== 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.
    172176
    173177= 2.3 =

  • types/trunk/vendor/autoload.php

    r1883904 r1888136  
    55require_once __DIR__ . '/composer/autoload_real.php';
    66
    7 return ComposerAutoloaderInitddd6f71ce3d43f91bd17c1a0b9e5f071::getLoader();
     7return ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4::getLoader();

  • types/trunk/vendor/composer/autoload_classmap.php

    r1883904 r1888136  
    877877    'WPV_Handle_Users_Functions' => $vendorDir . '/toolset/toolset-common/toolset-forms/classes/class.conditional.php',
    878878    'WPV_wpcf_switch_post_from_attr_id' => $vendorDir . '/toolset/toolset-common/inc/toolset.object.relationship.class.php',
     879    'xrstf\\Composer52\\AutoloadGenerator' => $vendorDir . '/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php',
     880    'xrstf\\Composer52\\Generator' => $vendorDir . '/xrstf/composer-php52/lib/xrstf/Composer52/Generator.php',
    879881);

  • types/trunk/vendor/composer/autoload_namespaces.php

    r1883904 r1888136  
    77
    88return array(
     9    'xrstf\\Composer52' => array($vendorDir . '/xrstf/composer-php52/lib'),
    910    'Twig_' => array($vendorDir . '/twig/twig/lib'),
    1011);

  • types/trunk/vendor/composer/autoload_real.php

    r1883904 r1888136  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInitddd6f71ce3d43f91bd17c1a0b9e5f071
     5class ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4
    66{
    77    private static $loader;
    … …  
    2020        }
    2121
    22         spl_autoload_register(array('ComposerAutoloaderInitddd6f71ce3d43f91bd17c1a0b9e5f071', 'loadClassLoader'), true, true);
     22        spl_autoload_register(array('ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4', 'loadClassLoader'), true, true);
    2323        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
    24         spl_autoload_unregister(array('ComposerAutoloaderInitddd6f71ce3d43f91bd17c1a0b9e5f071', 'loadClassLoader'));
     24        spl_autoload_unregister(array('ComposerAutoloaderInit7c997738567ea77204ed10983f70c9f4', 'loadClassLoader'));
    2525
    2626        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
    … …  
    2828            require_once __DIR__ . '/autoload_static.php';
    2929
    30             call_user_func(\Composer\Autoload\ComposerStaticInitddd6f71ce3d43f91bd17c1a0b9e5f071::getInitializer($loader));
     30            call_user_func(\Composer\Autoload\ComposerStaticInit7c997738567ea77204ed10983f70c9f4::getInitializer($loader));
    3131        } else {
    3232            $map = require __DIR__ . '/autoload_namespaces.php';
    … …  
    4949
    5050        if ($useStaticLoader) {
    51             $includeFiles = Composer\Autoload\ComposerStaticInitddd6f71ce3d43f91bd17c1a0b9e5f071::$files;
     51            $includeFiles = Composer\Autoload\ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$files;
    5252        } else {
    5353            $includeFiles = require __DIR__ . '/autoload_files.php';
    5454        }
    5555        foreach ($includeFiles as $fileIdentifier => $file) {
    56             composerRequireddd6f71ce3d43f91bd17c1a0b9e5f071($fileIdentifier, $file);
     56            composerRequire7c997738567ea77204ed10983f70c9f4($fileIdentifier, $file);
    5757        }
    5858
    … …  
    6161}
    6262
    63 function composerRequireddd6f71ce3d43f91bd17c1a0b9e5f071($fileIdentifier, $file)
     63function composerRequire7c997738567ea77204ed10983f70c9f4($fileIdentifier, $file)
    6464{
    6565    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

  • types/trunk/vendor/composer/autoload_static.php

    r1883904 r1888136  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInitddd6f71ce3d43f91bd17c1a0b9e5f071
     7class ComposerStaticInit7c997738567ea77204ed10983f70c9f4
    88{
    99    public static $files = array (
    … …  
    2626
    2727    public static $prefixesPsr0 = array (
     28        'x' =>
     29        array (
     30            'xrstf\\Composer52' =>
     31            array (
     32                0 => __DIR__ . '/..' . '/xrstf/composer-php52/lib',
     33            ),
     34        ),
    2835        'T' =>
    2936        array (
    … …  
    906913        'WPV_Handle_Users_Functions' => __DIR__ . '/..' . '/toolset/toolset-common/toolset-forms/classes/class.conditional.php',
    907914        'WPV_wpcf_switch_post_from_attr_id' => __DIR__ . '/..' . '/toolset/toolset-common/inc/toolset.object.relationship.class.php',
     915        'xrstf\\Composer52\\AutoloadGenerator' => __DIR__ . '/..' . '/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php',
     916        'xrstf\\Composer52\\Generator' => __DIR__ . '/..' . '/xrstf/composer-php52/lib/xrstf/Composer52/Generator.php',
    908917    );
    909918
    … …  
    911920    {
    912921        return \Closure::bind(function () use ($loader) {
    913             $loader->prefixLengthsPsr4 = ComposerStaticInitddd6f71ce3d43f91bd17c1a0b9e5f071::$prefixLengthsPsr4;
    914             $loader->prefixDirsPsr4 = ComposerStaticInitddd6f71ce3d43f91bd17c1a0b9e5f071::$prefixDirsPsr4;
    915             $loader->prefixesPsr0 = ComposerStaticInitddd6f71ce3d43f91bd17c1a0b9e5f071::$prefixesPsr0;
    916             $loader->classMap = ComposerStaticInitddd6f71ce3d43f91bd17c1a0b9e5f071::$classMap;
     922            $loader->prefixLengthsPsr4 = ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$prefixLengthsPsr4;
     923            $loader->prefixDirsPsr4 = ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$prefixDirsPsr4;
     924            $loader->prefixesPsr0 = ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$prefixesPsr0;
     925            $loader->classMap = ComposerStaticInit7c997738567ea77204ed10983f70c9f4::$classMap;
    917926
    918927        }, null, ClassLoader::class);

  • types/trunk/vendor/composer/installed.json

    r1883904 r1888136  
    117117            "zend",
    118118            "zikula"
     119        ]
     120    },
     121    {
     122        "name": "otgs/icons",
     123        "version": "dev-master",
     124        "version_normalized": "9999999-dev",
     125        "source": {
     126            "type": "git",
     127            "url": "https://git.onthegosystems.com/otgs-public/otgs-icons.git",
     128            "reference": "622ab3c0549b70c87fa20de1c302ffcc07ea8f9c"
     129        },
     130        "time": "2018-04-06T08:47:19+00:00",
     131        "type": "library",
     132        "installation-source": "source",
     133        "notification-url": "https://packagist.org/downloads/",
     134        "license": [
     135            "GPL-2.0"
     136        ],
     137        "description": "Toolset and WPML icons"
     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",
     150            "otgs/icons": "dev-master",
     151            "php": ">=5.2.0",
     152            "roave/security-advisories": "dev-master",
     153            "twig/twig": "~1.32.0",
     154            "xrstf/composer-php52": "1.*"
     155        },
     156        "require-dev": {
     157            "otgs/build-tools": "~0.1",
     158            "otgs/build-tools-ci": "~0.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": {
     166                "dev-master": "1.8.x-dev",
     167                "dev-develop": "1.8.x-dev"
     168            }
     169        },
     170        "installation-source": "source",
     171        "scripts": {
     172            "test": [
     173                "phpunit"
     174            ],
     175            "post-install-cmd": [
     176                "xrstf\\Composer52\\Generator::onPostInstallCmd",
     177                "OTGS\\Composer\\Scripts\\Install::PHPCSStandards"
     178            ],
     179            "post-update-cmd": [
     180                "xrstf\\Composer52\\Generator::onPostInstallCmd",
     181                "OTGS\\Composer\\Scripts\\Install::PHPCSStandards"
     182            ],
     183            "post-autoload-dump": [
     184                "xrstf\\Composer52\\Generator::onPostInstallCmd"
     185            ]
     186        },
     187        "license": [
     188            "GPL-2.0-or-later"
     189        ],
     190        "authors": [
     191            {
     192                "name": "Mihai Grigori",
     193                "email": "mihai@wpml.org",
     194                "homepage": "http://www.wp-types.com"
     195            }
     196        ],
     197        "description": "Installs and updates WPML and Toolset dependencies automatically",
     198        "homepage": "https://git.onthegosystems.com/installer/installer",
     199        "keywords": [
     200            "install",
     201            "plugins",
     202            "update",
     203            "utils"
    119204        ]
    120205    },
    … …  
    309394    {
    310395        "name": "toolset/toolset-common",
    311         "version": "2.8",
    312         "version_normalized": "2.8.0.0",
     396        "version": "2.8.1",
     397        "version_normalized": "2.8.1.0",
    313398        "source": {
    314399            "type": "git",
    315400            "url": "ssh://git@git.onthegosystems.com:10022/toolset/toolset-common.git",
    316             "reference": "289283b3a015b6ed5d16ad478ee3dde8604e5933"
     401            "reference": "ff9291e1a518f4b3c4ba36bd1a211751d370b8b5"
    317402        },
    318403        "require": {
    … …  
    326411            "sebastian/phpcpd": "^3.0"
    327412        },
    328         "time": "2018-05-29T08:04:45+00:00",
     413        "time": "2018-06-06T11:29:44+00:00",
    329414        "type": "library",
    330415        "extra": {
    … …  
    445530            "templating"
    446531        ]
     532    },
     533    {
     534        "name": "xrstf/composer-php52",
     535        "version": "v1.0.20",
     536        "version_normalized": "1.0.20.0",
     537        "source": {
     538            "type": "git",
     539            "url": "https://github.com/composer-php52/composer-php52.git",
     540            "reference": "bd41459d5e27df8d33057842b32377c39e97a5a8"
     541        },
     542        "dist": {
     543            "type": "zip",
     544            "url": "https://api.github.com/repos/composer-php52/composer-php52/zipball/bd41459d5e27df8d33057842b32377c39e97a5a8",
     545            "reference": "bd41459d5e27df8d33057842b32377c39e97a5a8",
     546            "shasum": ""
     547        },
     548        "time": "2016-04-16T21:52:24+00:00",
     549        "type": "library",
     550        "extra": {
     551            "branch-alias": {
     552                "dev-default": "1.x-dev"
     553            }
     554        },
     555        "installation-source": "dist",
     556        "autoload": {
     557            "psr-0": {
     558                "xrstf\\Composer52": "lib/"
     559            }
     560        },
     561        "notification-url": "https://packagist.org/downloads/",
     562        "license": [
     563            "MIT"
     564        ]
    447565    }
    448566]

  • types/trunk/vendor/toolset/toolset-common/inc/toolset.assets.manager.class.php

    r1883904 r1888136  
    293293    }
    294294
     295    private static $instances = array();
    295296
    296297    /**
    … …  
    299300     */
    300301    final public static function getInstance() {
    301         static $instances = array();
    302302        $called_class = get_called_class();
    303303
    304         if ( isset( $instances[ $called_class ] ) ) {
    305             return $instances[ $called_class ];
     304        if ( isset( self::$instances[ $called_class ] ) ) {
     305            return self::$instances[ $called_class ];
    306306        } else {
    307307            if ( class_exists( $called_class ) ) {
    308                 $instances[ $called_class ] = new $called_class();
    309 
    310                 return $instances[ $called_class ];
     308                self::$instances[ $called_class ] = new $called_class();
     309
     310                return self::$instances[ $called_class ];
    311311            } else {
    312312                // This can unfortunately happen when the get_called_class() workaround for PHP 5.2 misbehaves.
    … …  
    324324    public static function get_instance() {
    325325        if( null === self::$instance ) {
    326             self::$instance = new self();
     326            $called_class = get_called_class();
     327            if( $called_class === 'Toolset_Assets_Manager' && isset( self::$instances[ $called_class ] ) ) {
     328                // Make sure that we don't re-instantiate the Toolset_Assets_Manager class even if it was instantiated
     329                // before through the legacy getInstance() method.
     330                //
     331                // @refactoring Stop subclassing Toolset_Assets_Manager
     332                self::$instance = self::$instances[ $called_class ];
     333            } else {
     334                self::$instance = new self();
     335            }
    327336        }
    328337

  • types/trunk/vendor/toolset/toolset-common/loader.php

    r1883904 r1888136  
    2828 * we define the version here
    2929 */
    30 $toolset_common_version = 280000;
     30
     31// Note: Since the 2.8 branch is meant just for the support of the legacy Types 2.3.* branch,
     32// we're relaxing the rule and incrementing the loader number just by one.
     33//
     34// This may keep going on for some time and we don't want to run out of numbers for point releases.
     35$toolset_common_version = 280001;
    3136
    3237

  • types/trunk/vendor/toolset/toolset-common/toolset-common-loader.php

    r1883904 r1888136  
    22
    33if( !defined('TOOLSET_VERSION') ){
    4     define('TOOLSET_VERSION', '2.8.0');
     4    define('TOOLSET_VERSION', '2.8.1');
    55}
    66
    77if ( ! defined('TOOLSET_COMMON_VERSION' ) ) {
    8     define( 'TOOLSET_COMMON_VERSION', '2.8.0' );
     8    define( 'TOOLSET_COMMON_VERSION', '2.8.1' );
    99}
    1010

  • types/trunk/vendor/toolset/types/admin.php

    r1883904 r1888136  
    355355    }
    356356   
     357
     358    if ( 'installer' == $current_page ) {
     359        // @todo Having a page with a slug "installer" is a direct path to a third-party plugin conflict. Just saying. Not to mention the callback funciton "installer_content", for god's sake
     360        $pages['installer'] = array(
     361            'slug'              => 'installer',
     362            'menu_title'        => __( 'Installer', 'wpcf' ),
     363            'page_title'        => __( 'Installer', 'wpcf' ),
     364            'callback'          => 'installer_content',
     365        );
     366    }
    357367
    358368    /**

  • types/trunk/vendor/toolset/types/wpcf.php

    r1883904 r1888136  
    110110}
    111111
     112//Render Installer packages
     113function installer_content()
     114{
     115    echo '<div class="wrap">';
     116    $config['repository'] = array(); // required
     117    WP_Installer_Show_Products($config);
     118    echo "</div>";
     119}
    112120
    113121/**

  • types/trunk/wpcf.php

    r1883904 r1888136  
    66Author: OnTheGoSystems
    77Author URI: http://www.onthegosystems.com
    8 Version: 2.3
     8Version: 2.3.1
    99License: GPLv2 or later
    1010
    … …  
    3030// version
    3131if ( ! defined( 'TYPES_VERSION' ) ) {
    32     define( 'TYPES_VERSION', '2.3' );
     32    define( 'TYPES_VERSION', '2.3.1' );
    3333}
    3434
Note: See TracChangeset for help on using the changeset viewer.