Commit Graph

12506 Commits

Author SHA1 Message Date
Joe McGill
3068e8d4e2 Upload: Don't run some upload tests on multisite.
This moves several unit tests added in [44438] so they aren't run during multisite tests.

See #45615.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 21:42:50 +00:00
Joe McGill
4a80373bdf PHPCS: Fix formatting issues.
Fixes formatting issues introduced in [44438].

See #45615.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 21:09:49 +00:00
Joe McGill
7bd6e079f5 Upload: Add test files for phpunit.
This is a follow up to [44438], which missed adding the test files.

See #45615.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44270 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 20:53:51 +00:00
Joe McGill
ac1ff02815 Upload: Fix upload failures of common text file types.
This adds some special case handling in 'wp_check_filetype_and_ext()' that prevents some common file types from being blocked based on mismatched MIME checks, which were made more strict in WordPress 5.0.1.

Props Kloon, birgire, tellyworth, joemcgill.
See #45615.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 20:48:51 +00:00
desrosj
f082806afa Block Editor: Display notice to the user when JavaScript is disabled.
Currently, when viewing the block editor with JavaScript disabled, the user sees a blank admin page with the admin menu sidebar. This adds an admin notice informing the user that JavaScript is required for the new block editor.

Props mkaz, pento, azaozz, ocean90, desrosj.
Fixes #45453.
Built from https://develop.svn.wordpress.org/trunk@44437


git-svn-id: http://core.svn.wordpress.org/trunk@44268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 20:40:50 +00:00
Sergey Biryukov
8917b0e89f Default Themes: Bump the version numbers and release dates.
Update the theme versions and release dates for the default themes, in time for WordPress 5.0.3.

The POT file for Twenty Eleven has also been updated.

Props laurelfulford.
Fixes #45792.
Built from https://develop.svn.wordpress.org/trunk@44435


git-svn-id: http://core.svn.wordpress.org/trunk@44266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 18:58:50 +00:00
Sergey Biryukov
1a622a8b81 Twenty Twelve: Correct padding rule precedence for Quote block.
Props superpoincare.
Fixes #45794.
Built from https://develop.svn.wordpress.org/trunk@44432


git-svn-id: http://core.svn.wordpress.org/trunk@44263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 18:09:54 +00:00
Dominik Schilling
0a66ea8149 Formatting: Remove unused global import for $wp_filter in _restore_wpautop_hook().
See #45290.
Built from https://develop.svn.wordpress.org/trunk@44431


git-svn-id: http://core.svn.wordpress.org/trunk@44262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 16:59:52 +00:00
Sergey Biryukov
6b2494ba10 Plugins: Use newer "Updating PHP" page URL in the notice displayed when a plugin requires a higher PHP version.
Props afragen.
Fixes #43986. See #45686.
Built from https://develop.svn.wordpress.org/trunk@44420


git-svn-id: http://core.svn.wordpress.org/trunk@44250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 15:35:49 +00:00
Dominik Schilling
86e5a051db I18n: Expose JSON translation file paths in load_script_textdomain().
Removes `file_exist()` checks before calling `load_script_translations()` to let the determined paths be passed to `load_script_translations()` which provides its own file check and the possibility to filter the path.

Props swissspidy, johnbillion, ocean90.
See #45769.
Built from https://develop.svn.wordpress.org/trunk@44418


git-svn-id: http://core.svn.wordpress.org/trunk@44248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 13:59:51 +00:00
Sergey Biryukov
9ac8b5b4f5 Importers: Use correct l10n variable in wp.updates.installImporterError and filesystem credentials dialog.
Missed in [40034].

Props afercia, abhayvishwakarma.
Fixes #45765.
Built from https://develop.svn.wordpress.org/trunk@44417


git-svn-id: http://core.svn.wordpress.org/trunk@44247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 13:49:49 +00:00
Sergey Biryukov
efc9cbd553 Accessibility: Themes: use aria-current for the Walker_Page current link.
See [42808] for `Walker_Nav_Menu`.

The `aria-current` attribute is a simple, effective way to help assistive
technologies users orientate themselves within a list of items. Continues the 
introduction in core of `aria-current` after [42440], [41683], [41359], and [41371].

Props chetan200891, wpzinc.
Fixes #43522.
Built from https://develop.svn.wordpress.org/trunk@44416


git-svn-id: http://core.svn.wordpress.org/trunk@44246 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 13:36:50 +00:00
Sergey Biryukov
49452cd73d Pages, Post Types: Escape CSS classes in Walker_Page::start_el() after the page_css_class filter runs.
Don't add an empty `class` attribute if there are no classes, for consistency with `Walker_Nav_Menu::start_el()`.

Props abhijitrakas, mukesh27.
Fixes #44880.
Built from https://develop.svn.wordpress.org/trunk@44415


git-svn-id: http://core.svn.wordpress.org/trunk@44245 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 12:55:38 +00:00
Sergey Biryukov
d3e0f97705 Taxonomy: Escape CSS classes in Walker_Category::start_el() after the category_css_class filter runs.
Don't add an empty `class` attribute if there are no classes, for consistency with `Walker_Nav_Menu::start_el()`.

Props abhijitrakas, mukesh27.
See #44880.
Built from https://develop.svn.wordpress.org/trunk@44414


git-svn-id: http://core.svn.wordpress.org/trunk@44244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 12:54:48 +00:00
Sergey Biryukov
a94d70b811 Taxonomy: Escape feed_image argument in Walker_Category::start_el().
See [11838] for the instance in `wp_list_authors()`.

Props abhijitrakas.
See #44880.
Built from https://develop.svn.wordpress.org/trunk@44413


git-svn-id: http://core.svn.wordpress.org/trunk@44243 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 12:48:51 +00:00
Sergey Biryukov
9c08686353 Docs: Fix typo in the description of status parameter of WP_Comment_Query.
See #41338.
Built from https://develop.svn.wordpress.org/trunk@44412


git-svn-id: http://core.svn.wordpress.org/trunk@44242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 11:38:50 +00:00
Andrea Fercia
34fee908e3 Accessibility: Update since annotation for wp_link_pages().
Updates the since annotation for the `aria_current` argument introduced in #42440.

Fixes #41859.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 08:02:48 +00:00
Sergey Biryukov
f21b9db825 Docs: Correct @since tag for users_pre_query filter added in [44373].
Revert unintended change to the `@since` tag for the `WP_User_Query` instance added to `found_users_query` filter in [43660].

See #44169, #43679.
Built from https://develop.svn.wordpress.org/trunk@44410


git-svn-id: http://core.svn.wordpress.org/trunk@44240 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 07:56:50 +00:00
desrosj
5781515e7d Twenty Seventeen: Update since and see annotations for twentyseventeen_unique_id().
Previously introduced in [43659].

See #44883.
Built from https://develop.svn.wordpress.org/trunk@44408


git-svn-id: http://core.svn.wordpress.org/trunk@44238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-06 20:15:49 +00:00
desrosj
33a71f04e2 General: Update since annotation for wp_unique_id().
In [43658], `wp_unique_id()` was introduced. This updates the `since` annotation to be accurate.

See #44883.
Built from https://develop.svn.wordpress.org/trunk@44406


git-svn-id: http://core.svn.wordpress.org/trunk@44236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-06 19:52:51 +00:00
Dominik Schilling
49351e0578 I18N/Script Loader: Support text domains other than "messages".
The inline JavaScript added by `WP_Scripts::print_translations()` should check whether `locale_data.$text_domain` exists and fall back to `locale_data.messages` otherwise.

Props swissspidy.
See #45441.
Built from https://develop.svn.wordpress.org/trunk@44403


git-svn-id: http://core.svn.wordpress.org/trunk@44233 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-06 16:23:49 +00:00
laurelfulford
1c4a23faad Twenty Seventeen: Improve selectors for block editor custom colors.
Twenty Seventeen's original styles for the block editor custom colors had some issues: they weren't being applied to the button blocks due to lack of specificity, and when applied to paragraph blocks, there was no padding in the editor. This update makes sure the colors and related styles work as expected.

Fixes #45426.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-05 21:16:49 +00:00
desrosj
41aaf1d772 Editor: Fix name of the new editor for inline comment.
In [44398], an inline comment was introduced that did not refer to the new editor as the Block Editor. This corrects that comment.

See #45788.
Built from https://develop.svn.wordpress.org/trunk@44399


git-svn-id: http://core.svn.wordpress.org/trunk@44229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-05 03:48:50 +00:00
desrosj
80503c5c0e Editor: Allow the “Add Media” button tooltip to be translated in the Classic block.
In the Classic Editor, the “Add Media” button was outside of the TinyMCE editor. In the Block Editor, the “Add Media” button was moved into the TinyMCE toolbar in the Classic block, but the tooltip was not added to the list of translatable strings. This adds “Add Media” to that list.

The corresponding keyboard shortcut is also specified for the “Add Media” button.

Props afercia.

Fixes #45788.
Built from https://develop.svn.wordpress.org/trunk@44398


git-svn-id: http://core.svn.wordpress.org/trunk@44228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-05 03:40:50 +00:00
desrosj
4e3e9ca9cf Docs: Update since annotation for new $url parameter for several HTTP related filters.
Introduced in [42682].

Fixes #42186.
Built from https://develop.svn.wordpress.org/trunk@44397


git-svn-id: http://core.svn.wordpress.org/trunk@44227 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-04 21:58:51 +00:00
desrosj
f8f58da317 Docs: Update since annotation for new lost_password action parameter.
Introduced in [43542].

Fixes #44512.
Built from https://develop.svn.wordpress.org/trunk@44396


git-svn-id: http://core.svn.wordpress.org/trunk@44226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-04 21:52:50 +00:00
Dominik Schilling
f34e1dbad1 I18N: Make domain argument optional in wp_set_script_translations() / WP_Scripts::set_translations().
Props swissspidy.
Fixes #45489.
Built from https://develop.svn.wordpress.org/trunk@44395


git-svn-id: http://core.svn.wordpress.org/trunk@44225 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-04 21:12:50 +00:00
desrosj
8035cf38b7 REST API: Fix typo when unregistering test post type.
A typo when unregistering a test post type for the `WP_Test_REST_Posts_Controller` class was preventing it from being properly removed. `youseeme` now?

Props rahulsprajapati.
Fixes #45124.
Built from https://develop.svn.wordpress.org/trunk@44394


git-svn-id: http://core.svn.wordpress.org/trunk@44224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-04 20:58:51 +00:00
Dominik Schilling
d31335da85 Script Loader: Load unminified package vendor scripts when SCRIPT_DEBUG is set.
The unminified package vendor scripts are bundled with the release package thus the value of the `SCRIPT_DEBUG` constant should be honored.

Props earnjam.
See #45535.
Built from https://develop.svn.wordpress.org/trunk@44391


git-svn-id: http://core.svn.wordpress.org/trunk@44221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-04 20:27:49 +00:00
desrosj
0ee1a0e4e1 Block Editor: Upgrade @WordPress packages to the latest versions.
Updated packages:

- @wordpress/annotations@1.0.5
- @wordpress/api-fetch@2.2.7
- @wordpress/block-library@2.2.12
- @wordpress/block-serialization-default-parser@2.0.3
- @wordpress/blocks@6.0.5
- @wordpress/components@7.0.5
- @wordpress/core-data@2.0.16
- @wordpress/data@4.2.0
- @wordpress/deprecated@2.0.4
- @wordpress/dom@2.0.8
- @wordpress/edit-post@3.1.7
- @wordpress/editor@9.0.7
- @wordpress/format-library@1.2.10
- @wordpress/hooks@2.0.4
- @wordpress/list-reusable-blocks@1.1.18
- @wordpress/notices@1.1.2
- @wordpress/nux@3.0.6
- @wordpress/plugins@2.0.10
- @wordpress/rich-text@3.0.4
- @wordpress/url@2.3.3
- @wordpress/viewport@2.1.0

Props: youknowriad, gziolo, desrosj.

Fixes #45814.
Built from https://develop.svn.wordpress.org/trunk@44389


git-svn-id: http://core.svn.wordpress.org/trunk@44219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-04 19:38:57 +00:00
desrosj
8ac2091f5d Docs: Update since tag for comment reply link improvements.
Originally added in [42360].

Fixes #31590.
Built from https://develop.svn.wordpress.org/trunk@44388


git-svn-id: http://core.svn.wordpress.org/trunk@44218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-03 19:29:51 +00:00
desrosj
8f3ee6d243 Docs: Update since tag for X-Redirect-By header additions.
See [42408-42409], [42633], [42647].

Fixes #42313.
Built from https://develop.svn.wordpress.org/trunk@44386


git-svn-id: http://core.svn.wordpress.org/trunk@44216 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-03 18:11:52 +00:00
desrosj
f29dfe7b6d Docs: Update since tag for new intermediate_image_sizes_advanced filter parameter.
Originally added in [42407].

Fixes #42745.
Built from https://develop.svn.wordpress.org/trunk@44385


git-svn-id: http://core.svn.wordpress.org/trunk@44215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-03 17:47:49 +00:00
desrosj
035b9deffb Docs: Update since tag for HTTP status code 103 support.
Originally added in [42207].

Fixes #42490.
Built from https://develop.svn.wordpress.org/trunk@44383


git-svn-id: http://core.svn.wordpress.org/trunk@44213 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-03 15:21:52 +00:00
laurelfulford
dfeda2fb94 Bundled Themes: Bump script and style version numbers.
When existing scripts or styles are updated in default themes, the version numbers in the enqueues should also be bumped to make sure the old files don't cache. This update bumps version numbers for changes since version 5.0, for themes Twenty Eleven through Twenty Nineteen. 

Fixes #45679.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44212 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-02 18:04:50 +00:00
laurelfulford
30c7257aad Bundled Themes: Make sure button blocks respect settings.
When the original block editor styles were added to the existing default themes, the button blocks were styled to match how each theme styled the `button` tag. 

However, the styles should respect the block editor's default style, "Rounded", and allow switching to the other styles, like "Outlined" and "Square".

Fixes #45541.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-02 03:53:53 +00:00
laurelfulford
1d2efe8fa7 Twenty Fourteen: Correct video play button position.
A change to the MediaElement.js caused Twenty Fourteen's custom video play button to display in the top corner, rather than centered. This update returns it to its correct position. 

Props mmaumio, celloexpressions.
Fixes #44664.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-02 01:47:51 +00:00
Aaron Jorbin
16e6b4fab4 Happy New Year!
Fixes Tests_Basic::test_license

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


git-svn-id: http://core.svn.wordpress.org/trunk@44209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-01 20:37:49 +00:00
laurelfulford
7b44d484ea Twenty Fourteen: Remove text decoration from button block.
The button block in Twenty Fourteen was incorrectly inheriting a text underline from the theme's link styles.

Props bobbingwide.
Fixes #45732.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-01 17:40:54 +00:00
laurelfulford
b7d28b5406 Twenty Nineteen: Update theme description and tags.
The original theme description in Twenty Nineteen was intended as a placeholder; this update replaces it with a proper description, and removes the unnecessary `theme-options` tag. 

Props jobthomas, kjellr.
Fixes #45693.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-31 18:06:50 +00:00
laurelfulford
fcc423097c Twenty Nineteen: Improve menu semantics and keyboard navigation.
The menu's original markup included some non-semantic tags and an unnecessary `tabindex` attribute that made it difficult to navigate via keyboard. 

Props allancole, anevins, kjellr.
Fixes #45713.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44206 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-31 17:49:50 +00:00
Peter Wilson
b1c340ef5d Docs: Correct inline documentation versions for Cron API changes.
[43540] introduced changes to allow hijacking the cron implementation.

These changes were slated for 5.0, but have since been moved to the 5.1 release.

See #43540.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44205 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-30 05:06:48 +00:00
Peter Wilson
4ae9b553c5 Docs: Correct @see syntax for Cron API changes.
Fixes documentation errors introduced in  [43540], [43050] and [43608].

Props coffee2code.
Fixes #45445.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44204 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-30 04:51:51 +00:00
Adam Silverstein
9b0c0c7201 Users: Add a users_pre_query filter to short circuit WP_User_Query results.
Add a new filter `users_pre_query` - filters the users array before the query takes place. Return a non-null value to bypass WordPress's default user queries. Similar to the `posts_pre_query` filter for WP_Query added in #36687. This filter lets you short circuit the WP_User_Query MySQL query to return your own results.

Developers should note that filtering functions that require pagination information are encouraged to set the `total_users` property of the WP_User_Query object, passed to the filter by reference. If WP_User_Query does not perform a database query, it will not have enough information to generate these values itself.

Props tlovett1, birgire, boonebgorges, spacedmonkey.
Fixes #44169.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44203 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-29 16:06:50 +00:00
Boone Gorges
7a6764679f Update since annotation for wp_insert_term_duplicate_check filter.
Originally added in [43570].

Props audrasjb.
Fixes #43271.
Built from https://develop.svn.wordpress.org/trunk@44372


git-svn-id: http://core.svn.wordpress.org/trunk@44202 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 23:31:50 +00:00
laurelfulford
7a3648a1e8 Twenty Nineteen: Push right-aligned image block outside of text column.
Update right-aligned image block styles to push them outside of the text column on the front end, to match the original design and how the block looks in the editor.

Props kjellr, joen, allancole.
Fixes #45716.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 21:22:51 +00:00
laurelfulford
dd37acabea Twenty Nineteen: Fix hover appearance for outlined button block style.
The outlined button block style was displaying white text on a white background on hover. This update makes sure the text remains legible on hover when this button style is applied. 

Props rickalee, kjellr.
Fixes #45726.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 20:15:49 +00:00
laurelfulford
3a155f3683 Twenty Nineteen: Remove underline from "Continue Reading" arrow.
The "Continue Reading" link that's generated by the More block is styled to include an arrow next to the text; that arrow shouldn't inherit the text underline style. This update removes it. 

Props littlebigthing, kjellr.
Fixes #45715.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 19:20:51 +00:00
laurelfulford
bf308f6e92 Twenty Nineteen: Remove transparency from submenus.
On pages and posts with featured images, the top level menu items have a slight transparency on hover, which was being inherited by their submenus. This update removes that inheritance, improving readability and consistency in the menu's appearance. 

Props kjellr.
Fixes #45689.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 18:12:51 +00:00
Sergey Biryukov
b7ddbe94e7 Taxonomy: Fix typo in taxonomy_meta_box_sanitize_cb_checkboxes() argument name.
Props itowhid06.
Fixes #45756.
Built from https://develop.svn.wordpress.org/trunk@44367


git-svn-id: http://core.svn.wordpress.org/trunk@44197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 18:04:50 +00:00