Commit Graph

18315 Commits

Author SHA1 Message Date
noisysocks
e7f9aca8dd Editor: Revert [48119].
This commit caused the majority of blocks in the block editor to no longer
register as they reference the old category names.

See #50278.

Built from https://develop.svn.wordpress.org/trunk@48130


git-svn-id: http://core.svn.wordpress.org/trunk@47899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-23 00:15:11 +00:00
whyisjake
9edf42f215 Administration: Remove unnecessary !important CSS rules from common.css
Fixes #47569.

Props foack, SergeyBiryukov, davidbaumwald, sabernhardt, isabel_brison, audrasjb. 


Built from https://develop.svn.wordpress.org/trunk@48129


git-svn-id: http://core.svn.wordpress.org/trunk@47898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-23 00:01:07 +00:00
whyisjake
f51cb0a7c5 Media: Ensure that uploaded images get a success notification by users with upload_files capability.
There was an early `wp_die` that was preventing the success notification from being sent in the upload process. 

Fixes #44581.

Props pbiron, mikeschroder, joemcgill, rebasaurus, whyisjake.


Built from https://develop.svn.wordpress.org/trunk@48128


git-svn-id: http://core.svn.wordpress.org/trunk@47897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 23:53:09 +00:00
whyisjake
84f39df101 Privacy: Use relative paths for exported personal data.
Ensures back-compat while moving to paths off of the /exports directory.

Fixes: #44038.

Props: allendav, mrTall, desrosj, garrett-eclipse, cameronamcintyre, nmenescardi, xkon, whyisjake, davidbaumwald.

Built from https://develop.svn.wordpress.org/trunk@48127


git-svn-id: http://core.svn.wordpress.org/trunk@47896 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 22:40:11 +00:00
Sergey Biryukov
f27cb65e1e Administration: Remove the xmlns attribute on the <html> tag.
The attribute is specific to XHTML and is not needed in HTML5.

Props audrasjb, diddledan, hommealone, joyously, mukesh27, valentinbora, peterwilsoncc, SergeyBiryukov.
Fixes #49126.
Built from https://develop.svn.wordpress.org/trunk@48126


git-svn-id: http://core.svn.wordpress.org/trunk@47895 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 21:26:16 +00:00
Sergey Biryukov
89e99f57a2 Site Health: Correct the check of whether the theme directory is writable when the current theme is symlinked into the theme directory.
This ensures that the check is done on a sub-directory within `WP_CONTENT_DIR`, rather than outside of `ABSPATH`.

Props pbiron, Clorith.
Fixes #48199.
Built from https://develop.svn.wordpress.org/trunk@48125


git-svn-id: http://core.svn.wordpress.org/trunk@47894 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 20:15:14 +00:00
desrosj
d0d8ce1adb Docs: Small inline documentation corrections following [48121].
Also, remove the `version` argument from the `wp.deprecated()` call in `password-strength-meter.js`. This argument is for specifying the version a feature will be removed, not when the feature was removed.

Props hareesh-pillai.
Fixes #50413.
Built from https://develop.svn.wordpress.org/trunk@48124


git-svn-id: http://core.svn.wordpress.org/trunk@47893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 19:09:11 +00:00
desrosj
35545bee43 Administration: Improve the plugin and theme auto-update emails.
This makes several improvements to the emails sent to site admins when plugin and theme auto-updates are attempted.

- Emails are now specifically tailored to the three results (success, failed, or mixed).
- Subject lines and body copy for mixed and failed results now correctly convey the importance of double checking the site in question.
- The site’s URL is now included in all emails.
- When failures occur, links to the Plugins and/or Themes pages in the admin are now included so that site owners can easily take action.

Props audrasjb, desrosj, azaozz, garrett-eclipse, paaljoachim, johnbillion, marybaum, pbiron.
Follow up to [47835].
See #50052.
Fixes #50268.
Built from https://develop.svn.wordpress.org/trunk@48123


git-svn-id: http://core.svn.wordpress.org/trunk@47892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 18:18:08 +00:00
desrosj
acc97eae32 General: Reference the correct database version for 5.5.0 upgrades.
Follow up to [48121].

See #50413.
Built from https://develop.svn.wordpress.org/trunk@48122


git-svn-id: http://core.svn.wordpress.org/trunk@47891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 17:33:08 +00:00
desrosj
4b60af1a6a General: Remove “whitelist” and “blacklist” in favor of more clear and inclusive language.
“The WordPress open source community cares about diversity. We strive to maintain a welcoming environment where everyone can feel included.”

With this commit, all occurrences of “whitelist” and “blacklist” (with the single exception of the `$new_whitelist_options` global variable) are removed. A new ticket has been opened to explore renaming the `$new_whitelist_options` variable (#50434).

Changing to more specific names or rewording sentences containing these terms not only makes the code more inclusive, but also helps provide clarity. These terms are often ambiguous. What is being blocked or allowed is not always immediately clear. This can make it more difficult for non-native English speakers to read through the codebase.

Words matter. If one contributor feels more welcome because these terms are removed, this was worth the effort.

Props strangerstudios, jorbin, desrosj, joemcgill, timothyblynjacobs, ocean90, ayeshrajans, davidbaumwald, earnjam.
See #48900, #50434.
Fixes #50413.
Built from https://develop.svn.wordpress.org/trunk@48121


git-svn-id: http://core.svn.wordpress.org/trunk@47890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 17:26:13 +00:00
Sergey Biryukov
7dbc898342 Plugins: Make the appearance of plugin action links on Add Plugins screen more consistent.
This ensures that the "More Details" link does not randomly wrap to a second line depending on the length of the button label above.

Props sabernhardt, kharisblank, Otto42, paresh07.
Fixes #48648.
Built from https://develop.svn.wordpress.org/trunk@48120


git-svn-id: http://core.svn.wordpress.org/trunk@47889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 15:30:18 +00:00
ellatrix
2349d1f999 Editor: Update default block categories
See https://github.com/WordPress/gutenberg/pull/19279.

Props aduth, gziolo.
Fixes #50278.

Built from https://develop.svn.wordpress.org/trunk@48119


git-svn-id: http://core.svn.wordpress.org/trunk@47888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 14:07:10 +00:00
gziolo
29ffb31cb3 Blocks: Add context fields to WP_Block_Type
New block context related fields were added as part of https://github.com/WordPress/gutenberg/pull/22686. This changest backports them to WP_Block_Type class.

Props aduth, spacedmonkey, mcsf, epiqueras.
Fixes #47656.  


Built from https://develop.svn.wordpress.org/trunk@48117


git-svn-id: http://core.svn.wordpress.org/trunk@47886 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 10:26:14 +00:00
Andrea Fercia
aa98d37cad Accessibility: Improve readability by removing unnecessary italic font style.
Continues the removal of italic text where unnecessary or where used on whole lines and big chunks of text.
Removes italic type from:
- all the `howto` text e.g. the "Tags" meta box, the "Featured image" meta box, the "Insert/edit link" modal dialog in the Classic Editor 
- the Taxonomies list pages
- the edit Taxonomies pages
- the Menus page
- the Settings pages

Props audrasjb.
See #47327.

Built from https://develop.svn.wordpress.org/trunk@48116


git-svn-id: http://core.svn.wordpress.org/trunk@47885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-21 18:03:10 +00:00
Andrea Fercia
ae447adaf4 I18N: Restore the "Error:" prefix for error messages.
Partially reverts [48059] as there's no full consensus on the removal of the text prefix. Further actions should be taken to improve consistency and accessibility of the admin notices. Keeps some improvements to the translatable strings from [48059].

Fixes #47656.

Built from https://develop.svn.wordpress.org/trunk@48115


git-svn-id: http://core.svn.wordpress.org/trunk@47884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-21 14:00:09 +00:00
Sergey Biryukov
19bca10d79 Coding Standards: Replace echo sprintf() with printf().
See #49542.
Built from https://develop.svn.wordpress.org/trunk@48111


git-svn-id: http://core.svn.wordpress.org/trunk@47880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 13:18:11 +00:00
Sergey Biryukov
be16bb9fba Docs: Remove extra spaces from @param tags.
Per the documentation standards, `@param` tags should be aligned with each other, but not with the `@return` tag.

See #49572.
Built from https://develop.svn.wordpress.org/trunk@48110


git-svn-id: http://core.svn.wordpress.org/trunk@47879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:58:10 +00:00
Sergey Biryukov
b16368c268 Docs: Remove @staticvar tags from core.
The tag was supported in phpDocumentor 1.x, but is no longer supported in 2.x and 3.x.

Usage of static variables is considered an internal implementation detail and has no information value for someone reading the docs.

Props alishanvr, jrf.
Fixes #50426.
Built from https://develop.svn.wordpress.org/trunk@48109


git-svn-id: http://core.svn.wordpress.org/trunk@47878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:40:12 +00:00
Sergey Biryukov
65724cf380 Docs: Correct DocBlock placement for allow_subdirectory_install filter.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48108


git-svn-id: http://core.svn.wordpress.org/trunk@47877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:24:08 +00:00
Sergey Biryukov
3fb623cf76 Docs: Use a hyphen with the "non" prefix in a more consistent way.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48106


git-svn-id: http://core.svn.wordpress.org/trunk@47875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:16:10 +00:00
Sergey Biryukov
26621b3b44 Docs: Miscellaneous DocBlock corrections for plugin and theme installation and updates.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48105


git-svn-id: http://core.svn.wordpress.org/trunk@47874 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:14:09 +00:00
Sergey Biryukov
e13c363b17 Docs: Capitalize "ID", when referring to a post ID, term ID, etc. in a more consistent way.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48104


git-svn-id: http://core.svn.wordpress.org/trunk@47873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:02:12 +00:00
Sergey Biryukov
a576a13246 Docs: Remove an empty line between @param and @return tags, per the documentation standards.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48102


git-svn-id: http://core.svn.wordpress.org/trunk@47871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 11:18:09 +00:00
John Blackbourn
1a77bb81d8 Docs: Remove unnecessary variables names from @return tags.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48100


git-svn-id: http://core.svn.wordpress.org/trunk@47869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 22:55:12 +00:00
John Blackbourn
acb8983ac1 Docs: Corrections and improvements to inline docs related to plugin and theme auto-updates.
See #50052, #49572
Built from https://develop.svn.wordpress.org/trunk@48097


git-svn-id: http://core.svn.wordpress.org/trunk@47866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 22:17:07 +00:00
Sergey Biryukov
82a5d41d9b Help/About: Move "Learn more: Auto-updates documentation" link about "Support", for consistency with other screens.
Follow-up to [48062].

See #50215.
Built from https://develop.svn.wordpress.org/trunk@48095


git-svn-id: http://core.svn.wordpress.org/trunk@47864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 21:14:08 +00:00
Andrew Ozz
aca919f007 Plugins and Themes Auto-Updates:
- Fix displaying of errors on the Themes screen.
- Correct the classes used for the error messages, and use `notice-alt` as notices are mostly shown on a white background.

Props afercia, azaozz.
Fixes #50405.
Built from https://develop.svn.wordpress.org/trunk@48092


git-svn-id: http://core.svn.wordpress.org/trunk@47859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 16:51:14 +00:00
Sergey Biryukov
0050998801 Filesystem API: Expicitly set directory permissions in WP_Filesystem_SSH2::mkdir().
This ensures the permissions are correct after a directory is created with `ssh2_sftp_mkdir()`, which appears to be affected by system `umask` settings.

Props bbrdaric.
Fixes #49218.
Built from https://develop.svn.wordpress.org/trunk@48090


git-svn-id: http://core.svn.wordpress.org/trunk@47857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 10:38:08 +00:00
Sergey Biryukov
527696af3b Coding Standards: Add some space around control structures in WP_Filesystem_* classes for consistency and better readability.
Additionally, synchronize `$tempfile` and `$temphandle` variable names in `WP_Filesystem_FTPext` and `WP_Filesystem_ftpsockets`.

See #49542.
Built from https://develop.svn.wordpress.org/trunk@48089


git-svn-id: http://core.svn.wordpress.org/trunk@47856 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 10:36:12 +00:00
whyisjake
1e3d4921fb Privacy: Revert use relative paths for exported personal data.
Tests need to be updated to pass.

See: #44038.

Unprops: whyisjake.


Built from https://develop.svn.wordpress.org/trunk@48088


git-svn-id: http://core.svn.wordpress.org/trunk@47855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 23:02:10 +00:00
whyisjake
2d514c83d5 Privacy: Use relative paths for exported personal data.
Ensures back-compat while moving to paths off of the `/exports` directory.

Fixes: #44038.

Props: allendav, mrTall, desrosj, garrett-eclipse, cameronamcintyre, nmenescardi, xkon, whyisjake. 


Built from https://develop.svn.wordpress.org/trunk@48087


git-svn-id: http://core.svn.wordpress.org/trunk@47854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 21:40:14 +00:00
Sergey Biryukov
05e28b4d7c Coding Standards: Use strict comparison for JS fragment in wp-admin/admin-header.php.
Props subrataemfluence.
Fixes #45810.
Built from https://develop.svn.wordpress.org/trunk@48083


git-svn-id: http://core.svn.wordpress.org/trunk@47850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 20:08:09 +00:00
Sergey Biryukov
8d3075952e Administration: Combine the styles for <p> and .wp-die-message, instead of duplicating.
This brings some consistency with `_default_wp_die_handler()`, where they are already combined.

Follow-up to [45909].

See #47580.
Built from https://develop.svn.wordpress.org/trunk@48082


git-svn-id: http://core.svn.wordpress.org/trunk@47849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 15:07:11 +00:00
Andrew Ozz
d61790f9dc Fix empty line phpcs error.
See #50280.
Built from https://develop.svn.wordpress.org/trunk@48078


git-svn-id: http://core.svn.wordpress.org/trunk@47845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 00:46:09 +00:00
Andrew Ozz
7757ad5e94 Plugins and Themes Auto-Updates: allow overriding of the HTML for the auto-update setting link. This will let plugins show better/specific information when they are overriding the auto-update settings, for example "Updates are managed by ... plugin".
Introduces: `theme_auto_update_setting_html`, `plugin_auto_update_setting_html`, and `theme_auto_update_setting_template` filters.

Props audrasjb, pbiron, azaozz.
Fixes #50280.
Built from https://develop.svn.wordpress.org/trunk@48077


git-svn-id: http://core.svn.wordpress.org/trunk@47844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 00:00:13 +00:00
Sergey Biryukov
cb72d22d67 Menus: Check the correct variable in Walker_Nav_Menu_Edit::start_el() when menu item is a taxonomy term.
Follow-up to [45891].

Props ashour.
Fixes #50415.
Built from https://develop.svn.wordpress.org/trunk@48076


git-svn-id: http://core.svn.wordpress.org/trunk@47843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-17 19:47:14 +00:00
desrosj
689fdc6319 Site Health: Verify PHP version requirements when auto-updating themes.
Follow up of [47819].
See #49653.
Fixes #50411.
Built from https://develop.svn.wordpress.org/trunk@48071


git-svn-id: http://core.svn.wordpress.org/trunk@47838 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-17 14:48:07 +00:00
Sergey Biryukov
de59ad23a4 Docs: Consistently include an empty line between @since tag and @see, @link, or @global, per the documentation standards.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48067


git-svn-id: http://core.svn.wordpress.org/trunk@47834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-16 21:07:14 +00:00
Sergey Biryukov
49edaea6f1 Coding Standards: Fix WPCS issues in wp-admin/nav-menus.php.
Includes minor code layout fixes for better readability.

See #49542.
Built from https://develop.svn.wordpress.org/trunk@48063


git-svn-id: http://core.svn.wordpress.org/trunk@47830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-16 18:38:08 +00:00
whyisjake
97e2b94f84 Help/About: Add help tabs to provide informations about plugin & themes auto-updates.
Adds language around how the feature works and includes links to the WordPress HelpHub pages.

Fixes: #50215.
Props: audrasjb, garrett-eclipse, paaljoachim, marybaum, pbiron, whyisjake.


Built from https://develop.svn.wordpress.org/trunk@48062


git-svn-id: http://core.svn.wordpress.org/trunk@47829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-16 17:29:07 +00:00
Andrea Fercia
f83c504b88 I18N: Remove the "Error:" prefix from error messages.
For a number of years, most of the WordPress error messages have been prefixed with "Error:". However, these messages appear in a context where it's already clear an error occurred. Whether it's an error, a warning, or any other classification, that's not so relevant for users. The content of the message is the relevant part. The "Error:" prefix doesn't add great value while it does add unnecessary complexity for the message readability.

Also, revises some of these messages to improve clarity and removes HTML from translatable strings.

Props garrett-eclipse, ramiy, SergeyBiryukov, afercia, sabernhardt, quadthemes, audrasjb. 
See #47003, #43037, #42945, #15887.
Fixes #47656.

Built from https://develop.svn.wordpress.org/trunk@48059


git-svn-id: http://core.svn.wordpress.org/trunk@47826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-16 15:35:13 +00:00
whyisjake
ccf534dc48 Code Standards: Cleanup some code spacing.
See: #37826 and #44286.

Built from https://develop.svn.wordpress.org/trunk@48052


git-svn-id: http://core.svn.wordpress.org/trunk@47819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-16 00:56:08 +00:00
whyisjake
d3c44a690d Menus: Provide menu settings when creating a new menu.
This simplifies the steps in the process of adding new menus.

Props: garrett-eclipse, audrasjb, ianjvr. 

Built from https://develop.svn.wordpress.org/trunk@48051


git-svn-id: http://core.svn.wordpress.org/trunk@47818 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-15 23:22:06 +00:00
whyisjake
28d29b35f7 Comments: Don't display edit links to trashed post comments.
If a post is in the trash, the comments bubble won't link to the comments list.

Fixes: #37826.
Props: swissspidy, helen, FolioVision, DrewAPicture, stevenlinx, donmhico, birgire, garrett-eclipse, andraganescu, johnbillion. 



Built from https://develop.svn.wordpress.org/trunk@48050


git-svn-id: http://core.svn.wordpress.org/trunk@47817 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-15 23:06:08 +00:00
Sergey Biryukov
6aa5788189 Text Changes: Replace "Webmaster" in output messages with more appropriate terms:
* "All at `###SITENAME###`" in `wp-admin/ms-delete-site.php`, for consistency with other Multisite emails.
* "Site admin" in `register_new_user()`, for clarity.

Props Presskopp, marybaum.
Fixes #50394.
Built from https://develop.svn.wordpress.org/trunk@48049


git-svn-id: http://core.svn.wordpress.org/trunk@47816 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-15 19:41:11 +00:00
Dominik Schilling
893c580831 Users: On the 'Add New User' screen, don't show the roles dropdown if the current user can't promote other users.
Fixes #50345.
Built from https://develop.svn.wordpress.org/trunk@48042


git-svn-id: http://core.svn.wordpress.org/trunk@47809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-14 17:03:10 +00:00
Dominik Schilling
9f7a7f8d57 Coding Standards: Fix code indentation in post_submit_meta_box() to improve readability.
See #49542.
Built from https://develop.svn.wordpress.org/trunk@48041


git-svn-id: http://core.svn.wordpress.org/trunk@47808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-14 16:31:08 +00:00
Sergey Biryukov
04200b39ce Themes: Ensure the theme slug is set before checking if the theme is installed or active.
This fixes an issue with every installed theme being marked as active on Themes screen.

The slug is set on Add Themes screen, but not on Themes.

Follow-up to [47924].

Props BackuPs, mukesh27, SergeyBiryukov.
Fixes #50381. See #50334.
Built from https://develop.svn.wordpress.org/trunk@48037


git-svn-id: http://core.svn.wordpress.org/trunk@47804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-13 14:26:07 +00:00
Sergey Biryukov
4cc11cdbdd Filesystem API: Avoid a PHP notice in WP_Filesystem_Direct::owner() and ::group() methods and their WP_Filesystem_SSH2 counterparts.
Although not officially documented in the PHP manual, `posix_getpwuid()` and `posix_getgrgid()` can return `false` in some circumstances.

Props logig.
Fixes #50373.
Built from https://develop.svn.wordpress.org/trunk@48031


git-svn-id: http://core.svn.wordpress.org/trunk@47798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-12 12:35:09 +00:00
whyisjake
dda0ccdd18 Administration: Add a new filter to extend set-screen-option.
Props: xknown, SergeyBiryukov.

Built from https://develop.svn.wordpress.org/trunk@47951


git-svn-id: http://core.svn.wordpress.org/trunk@47723 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-10 17:24:51 +00:00