WordPress.org
Get WordPress

Plugin Directory

Changeset 3226669


Ignore:
Timestamp:
01/22/2025 08:53:46 AM (15 months ago)
Author:
sendsmaily
Message:

Release 3.1.5, see readme.txt for the changelog.

Location:
smaily-for-wp
Files:
10 edited
1 copied

Legend:

Unmodified
Added
Removed

  • smaily-for-wp/tags/3.1.5/admin/class-smaily-for-wp-admin.php

    r3220184 r3226669  
    6767    public function enqueue_scripts() {
    6868        $user = wp_get_current_user();
    69         if ( $user->has_cap( 'edit_plugins' ) ) {
     69        $allowed_roles = array( 'administrator' );
     70        if ( array_intersect( $allowed_roles, $user->roles ) ) {
    7071            wp_register_script( $this->plugin_name, SMLY4WP_PLUGIN_URL . '/admin/js/smaily-for-wp-admin.js', array( 'jquery' ), $this->version, false );
    7172            wp_enqueue_script( $this->plugin_name );
    … …  
    144145    public function smaily_admin_save() {
    145146        $user = wp_get_current_user();
    146         if ( ! $user->has_cap( 'edit_plugins' ) ) {
     147        $allowed_roles = array( 'administrator' );
     148        if ( !array_intersect( $allowed_roles, $user->roles ) ) {
    147149            return;
    148150        }

  • smaily-for-wp/tags/3.1.5/readme.txt

    r3220184 r3226669  
    44Requires PHP: 5.6
    55Requires at least: 4.0
    6 Stable tag: 3.1.4
     6Stable tag: 3.1.5
    77Tags: widget, plugin, sidebar, api, mail, email, marketing, smaily
    88Tested up to: 6.4
    … …  
    7676
    7777== Changelog ==
     78
     79= 3.1.5 =
     80- Fix an issue where administrator scripts are not loaded when DISALLOW_FILE_EDIT configuration option is enabled.
    7881
    7982= 3.1.4 =

  • smaily-for-wp/tags/3.1.5/smaily-for-wp.php

    r3220184 r3226669  
    1010 * Text Domain:       smaily-for-wp
    1111 * Description:       Smaily newsletter subscription form.
    12  * Version:           3.1.4
     12 * Version:           3.1.5
    1313 * Author:            Sendsmaily LLC
    1414 * Author URI:        https://smaily.com
    … …  
    2525 * Current plugin version.
    2626 */
    27 define( 'SMLY4WP_PLUGIN_VERSION', '3.1.4' );
     27define( 'SMLY4WP_PLUGIN_VERSION', '3.1.5' );
    2828
    2929/**

  • smaily-for-wp/tags/3.1.5/vendor/composer/InstalledVersions.php

    r3220184 r3226669  
    3232     */
    3333    private static $installed;
     34
     35    /**
     36     * @var bool
     37     */
     38    private static $installedIsLocalDir;
    3439
    3540    /**
    … …  
    310315        self::$installed = $data;
    311316        self::$installedByVendor = array();
     317
     318        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
     319        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
     320        // so we have to assume it does not, and that may result in duplicate data being returned when listing
     321        // all installed packages for example
     322        self::$installedIsLocalDir = false;
    312323    }
    313324
    … …  
    326337
    327338        if (self::$canGetVendors) {
     339            $selfDir = strtr(__DIR__, '\\', '/');
    328340            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
     341                $vendorDir = strtr($vendorDir, '\\', '/');
    329342                if (isset(self::$installedByVendor[$vendorDir])) {
    330343                    $installed[] = self::$installedByVendor[$vendorDir];
    … …  
    334347                    self::$installedByVendor[$vendorDir] = $required;
    335348                    $installed[] = $required;
    336                     if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
     349                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
    337350                        self::$installed = $required;
    338                         $copiedLocalDir = true;
     351                        self::$installedIsLocalDir = true;
    339352                    }
     353                }
     354                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
     355                    $copiedLocalDir = true;
    340356                }
    341357            }

  • smaily-for-wp/tags/3.1.5/vendor/composer/installed.php

    r3220184 r3226669  
    22    'root' => array(
    33        'name' => 'smaily/smaily_for_wp',
    4         'pretty_version' => '3.1.4',
    5         'version' => '3.1.4.0',
    6         'reference' => '91fe560a72c6c62266dce45e18810a73309900dd',
     4        'pretty_version' => '3.1.5',
     5        'version' => '3.1.5.0',
     6        'reference' => '0e4797091dc28f1820c3fe8f5184e6c3f7c0985d',
    77        'type' => 'plugin',
    88        'install_path' => __DIR__ . '/../../',
    … …  
    1212    'versions' => array(
    1313        'smaily/smaily_for_wp' => array(
    14             'pretty_version' => '3.1.4',
    15             'version' => '3.1.4.0',
    16             'reference' => '91fe560a72c6c62266dce45e18810a73309900dd',
     14            'pretty_version' => '3.1.5',
     15            'version' => '3.1.5.0',
     16            'reference' => '0e4797091dc28f1820c3fe8f5184e6c3f7c0985d',
    1717            'type' => 'plugin',
    1818            'install_path' => __DIR__ . '/../../',

  • smaily-for-wp/trunk/admin/class-smaily-for-wp-admin.php

    r3220184 r3226669  
    6767    public function enqueue_scripts() {
    6868        $user = wp_get_current_user();
    69         if ( $user->has_cap( 'edit_plugins' ) ) {
     69        $allowed_roles = array( 'administrator' );
     70        if ( array_intersect( $allowed_roles, $user->roles ) ) {
    7071            wp_register_script( $this->plugin_name, SMLY4WP_PLUGIN_URL . '/admin/js/smaily-for-wp-admin.js', array( 'jquery' ), $this->version, false );
    7172            wp_enqueue_script( $this->plugin_name );
    … …  
    144145    public function smaily_admin_save() {
    145146        $user = wp_get_current_user();
    146         if ( ! $user->has_cap( 'edit_plugins' ) ) {
     147        $allowed_roles = array( 'administrator' );
     148        if ( !array_intersect( $allowed_roles, $user->roles ) ) {
    147149            return;
    148150        }

  • smaily-for-wp/trunk/readme.txt

    r3220184 r3226669  
    44Requires PHP: 5.6
    55Requires at least: 4.0
    6 Stable tag: 3.1.4
     6Stable tag: 3.1.5
    77Tags: widget, plugin, sidebar, api, mail, email, marketing, smaily
    88Tested up to: 6.4
    … …  
    7676
    7777== Changelog ==
     78
     79= 3.1.5 =
     80- Fix an issue where administrator scripts are not loaded when DISALLOW_FILE_EDIT configuration option is enabled.
    7881
    7982= 3.1.4 =

  • smaily-for-wp/trunk/smaily-for-wp.php

    r3220184 r3226669  
    1010 * Text Domain:       smaily-for-wp
    1111 * Description:       Smaily newsletter subscription form.
    12  * Version:           3.1.4
     12 * Version:           3.1.5
    1313 * Author:            Sendsmaily LLC
    1414 * Author URI:        https://smaily.com
    … …  
    2525 * Current plugin version.
    2626 */
    27 define( 'SMLY4WP_PLUGIN_VERSION', '3.1.4' );
     27define( 'SMLY4WP_PLUGIN_VERSION', '3.1.5' );
    2828
    2929/**

  • smaily-for-wp/trunk/vendor/composer/InstalledVersions.php

    r3220184 r3226669  
    3232     */
    3333    private static $installed;
     34
     35    /**
     36     * @var bool
     37     */
     38    private static $installedIsLocalDir;
    3439
    3540    /**
    … …  
    310315        self::$installed = $data;
    311316        self::$installedByVendor = array();
     317
     318        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
     319        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
     320        // so we have to assume it does not, and that may result in duplicate data being returned when listing
     321        // all installed packages for example
     322        self::$installedIsLocalDir = false;
    312323    }
    313324
    … …  
    326337
    327338        if (self::$canGetVendors) {
     339            $selfDir = strtr(__DIR__, '\\', '/');
    328340            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
     341                $vendorDir = strtr($vendorDir, '\\', '/');
    329342                if (isset(self::$installedByVendor[$vendorDir])) {
    330343                    $installed[] = self::$installedByVendor[$vendorDir];
    … …  
    334347                    self::$installedByVendor[$vendorDir] = $required;
    335348                    $installed[] = $required;
    336                     if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
     349                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
    337350                        self::$installed = $required;
    338                         $copiedLocalDir = true;
     351                        self::$installedIsLocalDir = true;
    339352                    }
     353                }
     354                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
     355                    $copiedLocalDir = true;
    340356                }
    341357            }

  • smaily-for-wp/trunk/vendor/composer/installed.php

    r3220184 r3226669  
    22    'root' => array(
    33        'name' => 'smaily/smaily_for_wp',
    4         'pretty_version' => '3.1.4',
    5         'version' => '3.1.4.0',
    6         'reference' => '91fe560a72c6c62266dce45e18810a73309900dd',
     4        'pretty_version' => '3.1.5',
     5        'version' => '3.1.5.0',
     6        'reference' => '0e4797091dc28f1820c3fe8f5184e6c3f7c0985d',
    77        'type' => 'plugin',
    88        'install_path' => __DIR__ . '/../../',
    … …  
    1212    'versions' => array(
    1313        'smaily/smaily_for_wp' => array(
    14             'pretty_version' => '3.1.4',
    15             'version' => '3.1.4.0',
    16             'reference' => '91fe560a72c6c62266dce45e18810a73309900dd',
     14            'pretty_version' => '3.1.5',
     15            'version' => '3.1.5.0',
     16            'reference' => '0e4797091dc28f1820c3fe8f5184e6c3f7c0985d',
    1717            'type' => 'plugin',
    1818            'install_path' => __DIR__ . '/../../',
Note: See TracChangeset for help on using the changeset viewer.