WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,933 Commits 50 Branches 749 Tags 981 MiB
Commit Graph

36933 Commits

Author SHA1 Message Date
John Blackbourn b9b4776800 Options, Meta APIs: Send a notification to the old admin email address when the site admin email or network admin email address is changed. 
This reduces the chances of a site compromise going unnoticed, in the same way that the same notifications for user account email address changes reduces the chances of a user account compromise going unnoticed.

Props MatheusGimenez, johnbillion

Fixes #39117

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


git-svn-id: http://core.svn.wordpress.org/trunk@41004 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-27 02:24:42 +00:00
John Blackbourn 62fe4be994 Users: Require a confirmation link in an email to be clicked when a user attempts to change their email address. 
This adds this previously Multisite-only functionality to single site installations too. This change prevents accidental or erroneous email address changes from potentially locking users out of their account.

Props rodrigosprimo, tharsheblows, johnbillion

Fixes #16470

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


git-svn-id: http://core.svn.wordpress.org/trunk@41003 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-27 02:10:42 +00:00
Drew Jaynes 0860bb2771 Docs: Remove `@access` notations from method DocBlocks in wp-includes/* classes. 
Prior to about 2013, many class methods lacked even access modifiers which made the `@access` notations that much more useful. Now that we've gotten to a point where the codebase is more mature from a maintenance perspective and we can finally remove these notations. Notable exceptions to this change include standalone functions notated as private as well as some classes still considered to represent "private" APIs.

See #41452.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41002 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-27 00:41:44 +00:00
Drew Jaynes 1a28ec87e1 Docs: Remove `@access` notations from method DocBlocks in wp-admin/* classes. 
Prior to about 2013, many class methods lacked even access modifiers which made the `@access` notations that much more useful. Now that we've gotten to a point where the codebase is more mature from a maintenance perspective and we can finally remove these notations. Notable exceptions to this change include standalone functions notated as private as well as some classes still considered to represent "private" APIs.

See #41452.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41001 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-27 00:40:43 +00:00
John Blackbourn 32128ffd45 Administration: Remove `Edit` links from all plugin listing screens and the remaining theme listing screens. 
This simplifies these list tables, reducing user confusion, without removing functionality.

Fixes #38169

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


git-svn-id: http://core.svn.wordpress.org/trunk@41000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-26 23:28:46 +00:00
John Blackbourn be94fa5483 Toolbar: Add `View User` and `Edit User` links to the admin toolbar to ease navigation between a user's archives and the user editing screen. 
Props georgestephanis, lessbloat, johnbillion

Fixes #20307

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


git-svn-id: http://core.svn.wordpress.org/trunk@40999 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-26 16:45:44 +00:00
John Blackbourn 6b22dbe59a Login and Registration: Introduce a `username_exists` filter, which allows for control over registration of usernames. 
Props shamim51

Fixes #39320

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


git-svn-id: http://core.svn.wordpress.org/trunk@40998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-26 16:25:40 +00:00
Sergey Biryukov c7feb8387a Upgrade/Install: In `WP_Ajax_Upgrader_Skin`, call `::get_error_codes()` method on a `WP_Error` object `$this->errors` instead of a string variable `$errors`. 
Props yrpwayne.
Fixes #41449.
Built from https://develop.svn.wordpress.org/trunk@41157


git-svn-id: http://core.svn.wordpress.org/trunk@40997 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-26 13:39:44 +00:00
Sergey Biryukov 7d2b400876 Users: Use `esc_url()` instead of `esc_attr()` to escape the value of the `srcset` attribute in `get_avatar()`. 
Props joemcgill, henry.wright.
Fixes #41215.
Built from https://develop.svn.wordpress.org/trunk@41156


git-svn-id: http://core.svn.wordpress.org/trunk@40996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-26 13:22:44 +00:00
Gary Pendergast a89f1e469b REST API: Update the fixture data for `wp-api.js` tests. 
[41139] changed how the REST API URL is generated, but included an incorrect version of `wp-api-generated.js`.

This updates the generator to create the correct `wp-api-generated.js`, and updates ``wp-api-generated.js`.

See #40886.


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


git-svn-id: http://core.svn.wordpress.org/trunk@40994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-26 03:53:42 +00:00
John Blackbourn b6ca2d77a8 Users: Introduce filters for the contents of email notifications for new user registrations and password resets. 
Introduces:

* `wp_password_change_notification_subject`
* `wp_password_change_notification_message`
* `wp_password_change_notification_headers`
* `wp_new_user_notification_admin_subject`
* `wp_new_user_notification_admin_message`
* `wp_new_user_notification_admin_headers`
* `wp_new_user_notification_subject`
* `wp_new_user_notification_message`
* `wp_new_user_notification_headers`

Props pbearne, dipesh.kakadiya

Fixes #38068

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


git-svn-id: http://core.svn.wordpress.org/trunk@40993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-26 00:54:43 +00:00
Sergey Biryukov 760d2b3771 I18N: Use a consistent context for Visual and Text editor tab labels. 
Props pedromendonca.
Fixes #41438.
Built from https://develop.svn.wordpress.org/trunk@41152


git-svn-id: http://core.svn.wordpress.org/trunk@40992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 22:58:41 +00:00
Sergey Biryukov 4e4df0e6c9 Docs: Use 3-digit, x.x.x style semantic versioning for `@since 4.8.0` entries. 
See #41017.
Built from https://develop.svn.wordpress.org/trunk@41151


git-svn-id: http://core.svn.wordpress.org/trunk@40991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 22:48:42 +00:00
John Blackbourn 2dfea4210b Users: Show a `Super Admin` label next to Super Admins on all user listing screens when the current user can manage network users. 
Fixes #41165

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


git-svn-id: http://core.svn.wordpress.org/trunk@40990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 17:43:42 +00:00
Andrea Fercia de31d6f81c Widgets: make the Recent Posts widget output '(no title)' for posts without a title. 
Since WordPress 2.3, the Recent Posts widget used to output the post ID for posts
with an empty title. Using '(no title)' seems a best option and is consistent with
what's already used in other similar cases.

Props antonrinas, Ankit K Gupta.
Fixes #35709.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 16:13:45 +00:00
Andrea Fercia ac82a26fc5 Administration: WP_Screen: strip all tags from the columns display name. 
This ensures all the column titles, not just the Comments column one, are
"clean" when later reused for the Screen Options checkboxes. Also introduces
some consistency with what is already done in WP_List_Table.

Fixes #41261.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 16:05:44 +00:00
Sergey Biryukov c957321007 Docs: Correct `@global` entry for `$cat_id` in `WP_Links_List_Table::column_categories()`. 
Props tejas5989.
Fixes #41436.
Built from https://develop.svn.wordpress.org/trunk@41147


git-svn-id: http://core.svn.wordpress.org/trunk@40987 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 13:19:42 +00:00
Sergey Biryukov 37a04795b2 Docs: Add a `@global` entry for `$wpdb` in `_get_cron_lock`. 
Props tejas5989.
Fixes #41433.
Built from https://develop.svn.wordpress.org/trunk@41146


git-svn-id: http://core.svn.wordpress.org/trunk@40986 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 12:56:43 +00:00
Sergey Biryukov 0a24e8d1cd Docs: Add `@access` entry for `WP_Comment_Query::fill_descendants()`. 
Props umangvaghela123.
Fixes #41435.
Built from https://develop.svn.wordpress.org/trunk@41145


git-svn-id: http://core.svn.wordpress.org/trunk@40985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 12:54:45 +00:00
Weston Ruter 4042c0b416 TinyMCE: Fix styling of selected state for linked images containing captions. 
Props azaozz.
Fixes #41408.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40981 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 02:19:42 +00:00
Gary Pendergast 7819daefd2 REST API: Always add `index.php` to the REST URL when pretty permalinks are disabled. 
When pretty permalinks are disabled, the web server will internally forward requests to `index.php`. Unfortunately, nginx only forwards HTTP/1.0 methods: `PUT`, `PATCH`, and `DELETE` methods will return a 405 error.

To work around this nginx behaviour, including `index.php` in the REST URL skips the internal redirect.

Fixes #40886.


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


git-svn-id: http://core.svn.wordpress.org/trunk@40979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 00:50:43 +00:00
John Blackbourn b4c2f16d01 Users: Ensure that users with no role on a site are taken into consideration when listing users on Multisite. 
This ensures that users who are a member of a site but have no role are correctly listed on the Users screen and can be filtered from the 'None' role filter.

Props tobi823, flixos90, scottlee

Fixes #36196

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


git-svn-id: http://core.svn.wordpress.org/trunk@40978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 00:24:43 +00:00
Weston Ruter 8648fc0bff Customize: Update Text widget starter content to utilize visual mode. 
Amends [38991].
Props dlh, westonruter.
See #35243, #38114.
Fixes #41410.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40976 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-24 23:25:44 +00:00
Weston Ruter 4886abf23e Widgets: Improve notice in Text widget's legacy mode. 
Also fixes phpunit test which broke in [41132].

Props melchoyce, westonruter, gk.loveweb.
See #41394, #35243, #40951, #40907.
Fixes #41386.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-24 23:11:43 +00:00
Weston Ruter ddca4ceff1 Widgets: Rename Text widget's `legacy` mode to non-`visual` mode, restore boolean `filter` prop, and improve compatibility for `widget_text` filters applied in Custom HTML widget. 
Props westonruter, obenland, timmydcrawford for testing.
Amends [41050].
See #35243, #40951, #40907.
Fixes #41394.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40972 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-24 22:46:42 +00:00
John Blackbourn d8151e9dd1 Networks and Sites: Introduce an AYS when bulk deleting sites from the Sites screen in Network Admin. 
Props flixos90, MaximeCulea

Fixes #41177

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


git-svn-id: http://core.svn.wordpress.org/trunk@40971 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-24 22:41:42 +00:00
John Blackbourn 06e6edbd61 Comments: Ensure the correct comment ID is passed to the `get_comment_author_url` filter. 
Props dominik.schwind

Fixes #41334

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


git-svn-id: http://core.svn.wordpress.org/trunk@40967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-24 22:03:45 +00:00
Sergey Biryukov 8c55e79bef Docs: Correct `@access` entry for `::load()` in `WP_Image_Editor`, `WP_Image_Editor_GD`, and `WP_Image_Editor_Imagick`. 
Props upadalavipul.
Fixes #41423.
Built from https://develop.svn.wordpress.org/trunk@41125


git-svn-id: http://core.svn.wordpress.org/trunk@40965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-24 14:11:44 +00:00
Sergey Biryukov bed4804424 Tests: Fix typo in `Tests_Functions_AllowedProtocols::data_example_urls()`. 
Props redrambles.
Fixes #41415.
Built from https://develop.svn.wordpress.org/trunk@41124


git-svn-id: http://core.svn.wordpress.org/trunk@40964 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-24 10:03:44 +00:00
Sergey Biryukov 00b91b3003 Docs: Add a `@global` entry for `$wpdb` in `WP_Comment_Query::fill_descendants()`. 
Props jontyravi.
Fixes #41412.
Built from https://develop.svn.wordpress.org/trunk@41123


git-svn-id: http://core.svn.wordpress.org/trunk@40963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-23 10:40:45 +00:00
John Blackbourn 2d464d4286 Users: Don't show the 'Add Existing User' form on the 'Add New User' screen to users without the `promote_users` capability. 
Props bseddon, Mista-Flo

Fixes #37836

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


git-svn-id: http://core.svn.wordpress.org/trunk@40962 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-23 01:14:43 +00:00
John Blackbourn 1d71fa865c Login and Registration: Correctly encode the redirect location URL when it's passed as a query parameter to the lost password URL. 
Props adhun

Fixes #40728

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


git-svn-id: http://core.svn.wordpress.org/trunk@40961 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-23 01:06:42 +00:00
John Blackbourn 2efb81d453 Administration: Send an appropriate HTTP response status code when an invalid action is passed to `admin-ajax.php`. 
Props ryanrolds, ayeshrajans

Fixes #41269

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


git-svn-id: http://core.svn.wordpress.org/trunk@40960 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-23 00:21:42 +00:00
John Blackbourn a4a0f65a8a Docs: Correct some inline docs for the Ajax test case. 
See #41017

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


git-svn-id: http://core.svn.wordpress.org/trunk@40959 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-23 00:02:46 +00:00
Weston Ruter f3ec3c36a0 Widgets: Fix typo in phpunit test for Custom HTML widget in [41116]. 
Fixed was applied in 4.8 branch via [41117].
See #41392.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40958 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-21 21:22:42 +00:00
Weston Ruter f283e9d81f Widgets: Include `widget_text` class name on Custom HTML widget wrapper for theme styling compatibility, in addition to previously-added `textwidget` class on nested content container. 
Amends [40893], [41115].
See #40907.
Fixes #41392 for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-21 21:02:43 +00:00
Weston Ruter 048ac7df67 Widgets: Improve theme styling compatibility for Custom HTML widget by adding container with `textwidget` class. 
The same styling from the Text widget should apply to the Custom HTML widget since users are expected to copy HTML from the (legacy) Text widget into the latter.

Amends [40893].
See #40907.
Fixes #41392.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-21 18:13:45 +00:00
Sergey Biryukov e8e68a50f8 Docs: Correct `$term_id` parameter description in `wp_xmlrpc_server::get_term_custom_fields()` and `::set_term_custom_fields()`. 
Props upadalavipul.
Fixes #41397.
Built from https://develop.svn.wordpress.org/trunk@41114


git-svn-id: http://core.svn.wordpress.org/trunk@40954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-21 13:40:43 +00:00
Sergey Biryukov 118dba300e Docs: Add `@staticvar` entries for `$cache` and `$tested_paths` in `wp_upload_dir()`. 
Props ajayghaghretiya1.
Fixes #41395.
Built from https://develop.svn.wordpress.org/trunk@41113


git-svn-id: http://core.svn.wordpress.org/trunk@40953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-21 10:15:44 +00:00
K. Adam White 6aaba32b36 WP-API JS Client: Interpret Settings resource as a model. 
The REST API does not provide a mechanism to distinguish between endpoints representing models and those representing collections, so the Backbone client must make that distinction internally. Previously wp-api.js accounted for `/users/me`, but not for `/settings`. This patch updates the logic so that `/settings` is properly registered as a Backbone model.

When calling `wp.api.init`, additional endpoints can be specified to be models using the `modelEndpoints` argument.

Props @adamsilverstein.
Fixes #41056.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 20:26:45 +00:00
Sergey Biryukov 970afde4c0 Docs: Add a `@global` entry for `$wpdb` in `get_author_user_ids()`, `get_editable_authors()`, `get_editable_user_ids()`, `get_nonauthor_user_ids()`, and `get_others_unpublished_posts()`. 
Props parthsanghvi.
Fixes #41368.
Built from https://develop.svn.wordpress.org/trunk@41111


git-svn-id: http://core.svn.wordpress.org/trunk@40951 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 14:02:44 +00:00
Sergey Biryukov 4653f8bcfa Docs: Add a `@global` entry for `$wp_filesystem` in `wp_ajax_install_theme()`, `wp_ajax_update_theme()`, `wp_ajax_delete_theme()`, `wp_ajax_install_plugin()`, `wp_ajax_update_plugin()`, and `wp_ajax_delete_plugin()`. 
Props ronakganatra.
Fixes #41382.
Built from https://develop.svn.wordpress.org/trunk@41110


git-svn-id: http://core.svn.wordpress.org/trunk@40950 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 13:47:43 +00:00
Sergey Biryukov 3946198df8 Docs: Add `@staticvar` entries for `get_html_split_regex()` and `_get_wptexturize_split_regex()`. 
Props ajayghaghretiya1.
Fixes #41385.
Built from https://develop.svn.wordpress.org/trunk@41109


git-svn-id: http://core.svn.wordpress.org/trunk@40949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 13:38:44 +00:00
Sergey Biryukov 24f6903c4d Docs: Add `@access` entries for `WP_Upgrader_Skin::set_upgrader()`, `::request_filesystem_credentials()`, and `::decrement_update_count()`. 
See #41383.
Built from https://develop.svn.wordpress.org/trunk@41108


git-svn-id: http://core.svn.wordpress.org/trunk@40948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 13:35:43 +00:00
Sergey Biryukov 8728f8ae1e Docs: Add `@access` entry for `Automatic_Upgrader_Skin::request_filesystem_credentials()`. 
Props rushabh4486.
Fixes #41383.
Built from https://develop.svn.wordpress.org/trunk@41107


git-svn-id: http://core.svn.wordpress.org/trunk@40947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 13:33:43 +00:00
Sergey Biryukov f8155cedb2 Docs: Add `@access` entries for `Bulk_Upgrader_Skin::before()` and `::after()`. 
Props rushabh4486.
Fixes #41384.
Built from https://develop.svn.wordpress.org/trunk@41106


git-svn-id: http://core.svn.wordpress.org/trunk@40946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 13:25:42 +00:00
Sergey Biryukov 54b8dafd62 Docs: Change `@version` entry for `WP_Http::buildCookieHeader()` to `@since`. 
See #41381.
Built from https://develop.svn.wordpress.org/trunk@41105


git-svn-id: http://core.svn.wordpress.org/trunk@40945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 13:15:43 +00:00
Sergey Biryukov 2026da9512 Docs: Add `@access` entries for `WP_Http::block_request()`, `::handle_redirects()`, and `::is_ip_address()`. 
Props ronakganatra.
Fixes #41381.
Built from https://develop.svn.wordpress.org/trunk@41104


git-svn-id: http://core.svn.wordpress.org/trunk@40944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 13:14:44 +00:00
Sergey Biryukov 47bf429c0b Docs: Add `@access` entries for `before()` and `after()` methods in `Bulk_Plugin_Upgrader_Skin` and `Bulk_Theme_Upgrader_Skin`. 
See #41365.
Built from https://develop.svn.wordpress.org/trunk@41103


git-svn-id: http://core.svn.wordpress.org/trunk@40943 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 12:09:43 +00:00
Sergey Biryukov 90372258a0 Docs: Add `@access` entries for `__construct()` in `WP_Upgrader_Skin`, `Bulk_Upgrader_Skin`, `Language_Pack_Upgrader_Skin`, `Plugin_Upgrader_Skin`, and `Theme_Upgrader_Skin`. 
Props rushabh4486.
Fixes #41376.
Built from https://develop.svn.wordpress.org/trunk@41102


git-svn-id: http://core.svn.wordpress.org/trunk@40942 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-20 12:06:43 +00:00