Changeset 3269528
- Timestamp:
- 04/09/2025 09:31:06 AM (11 months ago)
- Location:
- polylang/trunk
- Files:
-
- 7 edited
-
frontend/frontend-filters-links.php (modified) (1 diff)
-
include/Options/Business/Sync.php (modified) (2 diffs)
-
polylang.php (modified) (2 diffs)
-
readme.txt (modified) (1 diff)
-
vendor/autoload.php (modified) (1 diff)
-
vendor/composer/InstalledVersions.php (modified) (5 diffs)
-
vendor/composer/installed.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
polylang/trunk/frontend/frontend-filters-links.php
r3042028 r3269528 277 277 array( 'function' => 'get_custom_logo' ), 278 278 array( 'function' => 'render_block_core_site_title' ), 279 array( 'function' => 'render_block_core_home_link' ), 279 280 ); 280 281 -
polylang/trunk/include/Options/Business/Sync.php
r3243124 r3269528 6 6 namespace WP_Syntex\Polylang\Options\Business; 7 7 8 use NOOP_Translations; 9 use PLL_Settings_Sync; 8 10 use WP_Syntex\Polylang\Options\Primitive\Abstract_List; 9 11 … … 41 43 */ 42 44 protected function get_data_structure(): array { 43 add_filter( 'lang_dir_for_domain', '__return_false'); // Prevents loading the translations too early.44 $enum = array_keys( \PLL_Settings_Sync::list_metas_to_sync() );45 remove_filter( 'lang_dir_for_domain', '__return_false');46 unload_textdomain( 'polylang', true ); // Required to allow `_load_textdomain_just_in_time()` to load the translations. 45 $GLOBALS['l10n']['polylang'] = new NOOP_Translations(); // Prevents loading the translations too early. 46 $enum = array_keys( PLL_Settings_Sync::list_metas_to_sync() ); 47 unset( $GLOBALS['l10n']['polylang'] ); 48 47 49 return array( 48 50 'type' => 'array', -
polylang/trunk/polylang.php
r3263029 r3269528 11 11 * Plugin URI: https://polylang.pro 12 12 * Description: Adds multilingual capability to WordPress 13 * Version: 3.7- beta313 * Version: 3.7-rc1 14 14 * Requires at least: 6.2 15 15 * Requires PHP: 7.2 … … 53 53 } else { 54 54 // Go on loading the plugin 55 define( 'POLYLANG_VERSION', '3.7- beta3' );55 define( 'POLYLANG_VERSION', '3.7-rc1' ); 56 56 define( 'PLL_MIN_WP_VERSION', '6.2' ); 57 57 define( 'PLL_MIN_PHP_VERSION', '7.2' ); -
polylang/trunk/readme.txt
r3263029 r3269528 139 139 * Fix possible term duplication #1490 140 140 * Fix sanitization of translated options that may impact other strings #1571 141 * Fix home link block not translated #1647 141 142 * Fix a conflict with WooCommerce Price Based on Country #1638 142 143 -
polylang/trunk/vendor/autoload.php
r3221451 r3269528 15 15 } 16 16 } 17 trigger_error( 18 $err, 19 E_USER_ERROR 20 ); 17 throw new RuntimeException($err); 21 18 } 22 19 -
polylang/trunk/vendor/composer/InstalledVersions.php
r2974283 r3269528 28 28 { 29 29 /** 30 * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to 31 * @internal 32 */ 33 private static $selfDir = null; 34 35 /** 30 36 * @var mixed[]|null 31 37 * @psalm-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[]}>}|array{}|null 32 38 */ 33 39 private static $installed; 40 41 /** 42 * @var bool 43 */ 44 private static $installedIsLocalDir; 34 45 35 46 /** … … 310 321 self::$installed = $data; 311 322 self::$installedByVendor = array(); 323 324 // when using reload, we disable the duplicate protection to ensure that self::$installed data is 325 // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not, 326 // so we have to assume it does not, and that may result in duplicate data being returned when listing 327 // all installed packages for example 328 self::$installedIsLocalDir = false; 329 } 330 331 /** 332 * @return string 333 */ 334 private static function getSelfDir() 335 { 336 if (self::$selfDir === null) { 337 self::$selfDir = strtr(__DIR__, '\\', '/'); 338 } 339 340 return self::$selfDir; 312 341 } 313 342 … … 323 352 324 353 $installed = array(); 354 $copiedLocalDir = false; 325 355 326 356 if (self::$canGetVendors) { 357 $selfDir = self::getSelfDir(); 327 358 foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { 359 $vendorDir = strtr($vendorDir, '\\', '/'); 328 360 if (isset(self::$installedByVendor[$vendorDir])) { 329 361 $installed[] = self::$installedByVendor[$vendorDir]; … … 331 363 /** @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 */ 332 364 $required = require $vendorDir.'/composer/installed.php'; 333 $installed[] = self::$installedByVendor[$vendorDir] = $required; 334 if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { 335 self::$installed = $installed[count($installed) - 1]; 365 self::$installedByVendor[$vendorDir] = $required; 366 $installed[] = $required; 367 if (self::$installed === null && $vendorDir.'/composer' === $selfDir) { 368 self::$installed = $required; 369 self::$installedIsLocalDir = true; 336 370 } 371 } 372 if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) { 373 $copiedLocalDir = true; 337 374 } 338 375 } … … 351 388 } 352 389 353 if (self::$installed !== array() ) {390 if (self::$installed !== array() && !$copiedLocalDir) { 354 391 $installed[] = self::$installed; 355 392 } -
polylang/trunk/vendor/composer/installed.php
r3263029 r3269528 4 4 'pretty_version' => 'dev-master', 5 5 'version' => 'dev-master', 6 'reference' => ' bebeddac74b7410fc7b81893bdc73afdae97c56c',6 'reference' => '4feca17a604abccbec27eee121f8206855c39a7a', 7 7 'type' => 'wordpress-plugin', 8 8 'install_path' => __DIR__ . '/../../', … … 14 14 'pretty_version' => 'dev-master', 15 15 'version' => 'dev-master', 16 'reference' => ' bebeddac74b7410fc7b81893bdc73afdae97c56c',16 'reference' => '4feca17a604abccbec27eee121f8206855c39a7a', 17 17 'type' => 'wordpress-plugin', 18 18 'install_path' => __DIR__ . '/../../',
Note: See TracChangeset
for help on using the changeset viewer.