WordPress.org
Get WordPress

Plugin Directory

Changeset 3264385


Ignore:
Timestamp:
03/31/2025 11:21:29 AM (12 months ago)
Author:
fapi
Message:

{Message s update zprávou}

Location:
fapi-member
Files:
414 added
6 edited

Legend:

Unmodified
Added
Removed

  • fapi-member/trunk/fapi-member.php

    r3253616 r3264385  
    1515 * Plugin URI:        https://fapi.cz/
    1616 * Description:       Plugin FAPI pro jednoduchou správu členských sekcí na webu.
    17  * Version:           2.2.17
     17 * Version:           2.2.18
    1818 * Requires at least: 5.9
    1919 * Requires PHP:      8.1
    … …  
    3030require __DIR__ . '/src/Utils/functions.php';
    3131
    32 define('FAPI_MEMBER_PLUGIN_VERSION', '2.2.17');
     32define('FAPI_MEMBER_PLUGIN_VERSION', '2.2.18');
    3333
    3434$FapiPlugin = new FapiMemberPlugin();

  • fapi-member/trunk/readme.txt

    r3253616 r3264385  
    66Requires PHP: 8.1
    77License: GPLv2 or later
    8 Stable tag: 2.2.17
     8Stable tag: 2.2.18
    99
    1010Plugin FAPI pro jednoduchou správu členských sekcí na webu.
    … …  
    2626
    2727== Changelog ==
     28
     29= 2.2.18 =
     30* Fixed registration date error
    2831
    2932= 2.2.17 =

  • fapi-member/trunk/src/Service/MembershipService.php

    r3253616 r3264385  
    3131     * @return  array<Membership>
    3232     */
     33    public function getActiveWithAccessByUserId(int $userId): array
     34    {
     35        $memberships = $this->membershipRepository->getActiveByUserId($userId, true);
     36
     37        return $memberships;
     38    }
     39
     40    /**
     41     * @return  array<Membership>
     42     */
    3343    public function getActiveByUserIdAndUpdate(int $userId): array
    3444    {

  • fapi-member/trunk/src/Service/RedirectService.php

    r3253616 r3264385  
    9090        }
    9191
    92         $memberships = $this->membershipService->getActiveByUserIdAndUpdate(
     92        $memberships = $this->membershipService->getActiveWithAccessByUserId(
    9393            $this->userRepository->getCurrentUser()->getId()
    9494        );

  • fapi-member/trunk/vendor/composer/InstalledVersions.php

    r3253616 r3264385  
    3232     */
    3333    private static $installed;
    34 
    35     /**
    36      * @var bool
    37      */
    38     private static $installedIsLocalDir;
    3934
    4035    /**
    … …  
    315310        self::$installed = $data;
    316311        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;
    323312    }
    324313
    … …  
    334323
    335324        $installed = array();
    336         $copiedLocalDir = false;
    337325
    338326        if (self::$canGetVendors) {
    339             $selfDir = strtr(__DIR__, '\\', '/');
    340327            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
    341                 $vendorDir = strtr($vendorDir, '\\', '/');
    342328                if (isset(self::$installedByVendor[$vendorDir])) {
    343329                    $installed[] = self::$installedByVendor[$vendorDir];
    … …  
    345331                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
    346332                    $required = require $vendorDir.'/composer/installed.php';
    347                     self::$installedByVendor[$vendorDir] = $required;
    348                     $installed[] = $required;
    349                     if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
    350                         self::$installed = $required;
    351                         self::$installedIsLocalDir = true;
     333                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
     334                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
     335                        self::$installed = $installed[count($installed) - 1];
    352336                    }
    353                 }
    354                 if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
    355                     $copiedLocalDir = true;
    356337                }
    357338            }
    … …  
    370351        }
    371352
    372         if (self::$installed !== array() && !$copiedLocalDir) {
     353        if (self::$installed !== array()) {
    373354            $installed[] = self::$installed;
    374355        }

  • fapi-member/trunk/vendor/composer/installed.php

    r3253616 r3264385  
    44        'pretty_version' => 'dev-master',
    55        'version' => 'dev-master',
    6         'reference' => '94d80bdc7b12b8cbfcbe9561d36586994551b0ee',
     6        'reference' => '1a58110ae2d930787a89a092e8d82e80681a911b',
    77        'type' => 'library',
    88        'install_path' => __DIR__ . '/../../',
    … …  
    1414            'pretty_version' => 'dev-master',
    1515            'version' => 'dev-master',
    16             'reference' => '94d80bdc7b12b8cbfcbe9561d36586994551b0ee',
     16            'reference' => '1a58110ae2d930787a89a092e8d82e80681a911b',
    1717            'type' => 'library',
    1818            'install_path' => __DIR__ . '/../../',
Note: See TracChangeset for help on using the changeset viewer.