Changeset 49514
- Timestamp:
- 11/06/2020 04:28:46 PM (4 years ago)
- Location:
- branches/5.2
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/5.2
-
branches/5.2/composer.json
r44645 r49514 11 11 }, 12 12 "require-dev": { 13 "dealerdirect/phpcodesniffer-composer-installer": " ~0.5.0",13 "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7.0", 14 14 "wp-coding-standards/wpcs": "~2.0.0" 15 15 }, -
branches/5.2/composer.lock
r44645 r49514 5 5 "This file is @generated automatically" 6 6 ], 7 "content-hash": " c7426ffeca8db395605e43bccf174b02",7 "content-hash": "0d68b3d8b17e827e096ecb10a063f34c", 8 8 "packages": [], 9 9 "packages-dev": [ 10 10 { 11 11 "name": "dealerdirect/phpcodesniffer-composer-installer", 12 "version": "v0. 5.0",12 "version": "v0.7.0", 13 13 "source": { 14 14 "type": "git", 15 15 "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", 16 "reference": "e 749410375ff6fb7a040a68878c656c2e610b132"16 "reference": "e8d808670b8f882188368faaf1144448c169c0b7" 17 17 }, 18 18 "dist": { 19 19 "type": "zip", 20 "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e 749410375ff6fb7a040a68878c656c2e610b132",21 "reference": "e 749410375ff6fb7a040a68878c656c2e610b132",20 "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e8d808670b8f882188368faaf1144448c169c0b7", 21 "reference": "e8d808670b8f882188368faaf1144448c169c0b7", 22 22 "shasum": "" 23 23 }, 24 24 "require": { 25 "composer-plugin-api": "^1.0 ",26 "php": " ^5.3|^7",27 "squizlabs/php_codesniffer": "^2 |^3"25 "composer-plugin-api": "^1.0 || ^2.0", 26 "php": ">=5.3", 27 "squizlabs/php_codesniffer": "^2 || ^3 || 4.0.x-dev" 28 28 }, 29 29 "require-dev": { … … 72 72 "tests" 73 73 ], 74 "time": "20 18-10-26T13:21:45+00:00"74 "time": "2020-06-25T14:57:39+00:00" 75 75 }, 76 76 { 77 77 "name": "squizlabs/php_codesniffer", 78 "version": "3. 4.0",78 "version": "3.5.8", 79 79 "source": { 80 80 "type": "git", 81 81 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", 82 "reference": " 379deb987e26c7cd103a7b387aea178baec96e48"82 "reference": "9d583721a7157ee997f235f327de038e7ea6dac4" 83 83 }, 84 84 "dist": { 85 85 "type": "zip", 86 "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ 379deb987e26c7cd103a7b387aea178baec96e48",87 "reference": " 379deb987e26c7cd103a7b387aea178baec96e48",86 "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4", 87 "reference": "9d583721a7157ee997f235f327de038e7ea6dac4", 88 88 "shasum": "" 89 89 }, … … 118 118 ], 119 119 "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", 120 "homepage": "http ://www.squizlabs.com/php-codesniffer",120 "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", 121 121 "keywords": [ 122 122 "phpcs", 123 123 "standards" 124 124 ], 125 "time": "20 18-12-19T23:57:18+00:00"125 "time": "2020-10-23T02:01:07+00:00" 126 126 }, 127 127 { … … 130 130 "source": { 131 131 "type": "git", 132 "url": "https://github.com/WordPress -Coding-Standards/WordPress-Coding-Standards.git",132 "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", 133 133 "reference": "c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce" 134 134 }, 135 135 "dist": { 136 136 "type": "zip", 137 "url": "https://api.github.com/repos/WordPress -Coding-Standards/WordPress-Coding-Standards/zipball/c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce",137 "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce", 138 138 "reference": "c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce", 139 139 "shasum": "" … … 177 177 "prefer-lowest": false, 178 178 "platform": [], 179 "platform-dev": [] 179 "platform-dev": [], 180 "plugin-api-version": "1.1.0" 180 181 } -
branches/5.2/src/wp-admin/includes/class-wp-links-list-table.php
r43571 r49514 118 118 wp_dropdown_categories( $dropdown_options ); 119 119 submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); 120 ?>120 ?> 121 121 </div> 122 122 <?php -
branches/5.2/src/wp-admin/includes/media.php
r49394 r49514 3049 3049 'quicktags' => $quicktags_settings, 3050 3050 ); 3051 ?>3051 ?> 3052 3052 3053 3053 <label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong> -
branches/5.2/src/wp-admin/plugins.php
r45140 r49514 441 441 '<p>' . sprintf( 442 442 /* translators: %s: WordPress Plugin Directory URL */ 443 443 __( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ), 444 444 __( 'https://wordpress.org/plugins/' ) 445 445 ) . '</p>', … … 454 454 '<p>' . sprintf( 455 455 /* translators: WP_PLUGIN_DIR constant value */ 456 456 __( 'If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ), 457 457 '<code>' . WP_PLUGIN_DIR . '</code>' 458 458 ) . '</p>', -
branches/5.2/src/wp-admin/theme-install.php
r45140 r49514 94 94 '<p>' . sprintf( 95 95 /* translators: %s: Theme Directory URL */ 96 96 __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ), 97 97 __( 'https://wordpress.org/themes/' ) 98 98 ) . '</p>' . … … 101 101 '<p>' . sprintf( 102 102 /* translators: %s: /wp-content/themes */ 103 103 __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your %s directory.' ), 104 104 '<code>/wp-content/themes</code>' 105 105 ) . '</p>'; -
branches/5.2/src/wp-includes/script-loader.php
r46074 r49514 1470 1470 'themeInstallUnavailable' => sprintf( 1471 1471 /* translators: %s: URL to Add Themes admin screen */ 1472 1472 __( 'You won’t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ), 1473 1473 esc_url( admin_url( 'theme-install.php' ) ) 1474 1474 ), -
branches/5.2/tests/phpunit/tests/multisite/network.php
r42343 r49514 275 275 // activate the plugin sitewide 276 276 activate_plugin( $path, '', $network_wide = true ); 277 $active_plugins 277 $active_plugins = wp_get_active_network_plugins(); 278 278 $this->assertEquals( array( WP_PLUGIN_DIR . '/hello.php' ), $active_plugins ); 279 279 -
branches/5.2/tests/phpunit/tests/post/getPages.php
r44587 r49514 23 23 $this->assertEquals( 3, count( $pages ) ); 24 24 $this->assertNotEmpty( $time1 = wp_cache_get( 'last_changed', 'posts' ) ); 25 $num_queries 25 $num_queries = $wpdb->num_queries; 26 26 foreach ( $pages as $page ) { 27 27 $this->assertInstanceOf( 'WP_Post', $page ); -
branches/5.2/tests/phpunit/tests/term/getTerms.php
r43571 r49514 174 174 wp_delete_term( $terms[0]->term_id, 'post_tag' ); 175 175 176 $num_queries 176 $num_queries = $wpdb->num_queries; 177 177 $this->assertNotEquals( $time1, $time2 = wp_cache_get( 'last_changed', 'terms' ) ); 178 178
Note: See TracChangeset
for help on using the changeset viewer.