Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-18 16:45:31 +01:00
Code Issues Projects Releases Wiki Activity
31,899 Commits 50 Branches 748 Tags 792 MiB
1e2caf6712
Commit Graph

31899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Drew Jaynes
1e2caf6712 Docs: Update an inline comment in wp_get_attachment_image_sizes(), which came in as part of the Responsive Images merge in [34855]. 
Props joemcgill.
See #33641.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 17:47:24 +00:00
Boone Gorges
f233b37d07 Improve role-related arguments in WP_User_Query. 
* 'role' now accepts an array or comma-separated list of role names. When passing multiple values for 'role', `WP_User_Query` will only match users that have all of the specified roles.
* 'role__in' accepts an array of role names, and allow the filtering of matched users to those with at least one of the specified roles.
* 'role__not_in' accepts an array of role names, and allows the filtering of matched users to those who have none of the specified roles.

Props swissspidy, mordauk, barrykooij, sirbrillig.
Fixes #22212.
Built from https://develop.svn.wordpress.org/trunk@34875


git-svn-id: http://core.svn.wordpress.org/trunk@34840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 17:40:47 +00:00
Aaron Jorbin
0978abe76c Adjust detection of stream timeouts in maybe skip tests for https tests 
This is a follow up to [34848].

See #33968.


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


git-svn-id: http://core.svn.wordpress.org/trunk@34839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 17:40:24 +00:00
Dominik Schilling
0bc1d84fc7 MS Themes List Table: Fix inverted logic for displaying the "No items" message. 
Fixes #25464.
Built from https://develop.svn.wordpress.org/trunk@34873


git-svn-id: http://core.svn.wordpress.org/trunk@34838 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 17:35:23 +00:00
Sergey Biryukov
551b904985 Fix typo in [34848]. 
See #33968.
Built from https://develop.svn.wordpress.org/trunk@34872


git-svn-id: http://core.svn.wordpress.org/trunk@34837 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 17:28:24 +00:00
Drew Jaynes
5df204fab4 Template: Introduce a new class_form argument in comment_form(), allowing customization of the form class attribute. 
The static 'comment-form' class was originally added to `comment_form()` in [24525]. This new argument should provide needed flexibility in styling the comment form further.

Props flixos90.
Fixes #34170. See #23851.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 17:17:24 +00:00
Drew Jaynes
f7bf281978 Tests: Update Tests_Rewrite_AddRewriteRule->setUp() to use the new set_permalink_structure() helper. 
See #33968.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34835 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 16:02:25 +00:00
Dominik Schilling
273cae2573 Script Loader: Update version of json2.js after [34863]. 
See #26913.
Built from https://develop.svn.wordpress.org/trunk@34869


git-svn-id: http://core.svn.wordpress.org/trunk@34834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 15:52:26 +00:00
Helen Hou-Sandí
cd3367d942 Shortcodes: Pass the name as context for shortcode_atts_{$shortcode}. 
props mattheu.
fixes #34167.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 14:34:24 +00:00
Scott Taylor
2d1fff2c75 Setup/Config: some dirname( ABSPATH ) file lookups should have errors suppressed due to possibility of open_basedir restrictions on hosts. 
Props chriscct7, misterunknown.
Fixes #29680.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34832 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 14:20:25 +00:00
Scott Taylor
ddbd67a22e Media: in wp_read_video|audio_metadata(), set GETID3_TEMP_DIR to get_temp_dir() if it is not defined. This is a workaround for when safe_mode is enabled pre-PHP 5.3. 
Props chriscct7, tomsommer.
Fixes #26265.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 14:14:25 +00:00
Scott Taylor
1dcc6e1b51 Transients, add filters for $expiration: 
* `'expiration_pre_set_site_transient_' . $transient`
* `'expiration_pre_set_transient_' . $transient`
 
Props chriscct7, wpsmith, nacin.
Fixes #21330.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 14:10:25 +00:00
Scott Taylor
53060a8987 WP Mail: replace logic that was mimicking strtotime() with strtotime(). Without this, the date parsing wasn't accounting for half-hour and quarter-hour timezones. 
Props neoscrib, solarissmoke.
Fixes #16993.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 14:07:24 +00:00
Scott Taylor
c32357a900 External Libraries: update json2.js to the 2015-05-03 version. Crockford does not tag releases: https://github.com/douglascrockford/JSON-js/commits/master 
Props mgibbs189, chriscct7.
Fixes #26913.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34828 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 14:02:25 +00:00
Scott Taylor
a3e36194fd Scripts: in WP_Scripts::set_group(), the args prop of the _WP_Dependency instance defaults to null - check that it is set before comparing. 
Props tivnet, chriscct7.
Fixes #25462.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 13:54:25 +00:00
Scott Taylor
c5475fbfc2 Admin Menu: remove duplicated separators, and use strpos() (instead of strcmp()) when determining if the separator CSS class is present. 
Props rilwis, chriscct7.
Fixes #24104.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 13:46:25 +00:00
Scott Taylor
8c256a3357 XML-RPC: allow wp_xmlrpc_server::wp_getPosts() to receive s as a filter. 
Props chriscct7.
Fixes #25406.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 13:41:26 +00:00
Drew Jaynes
eeb76b6e56 Users: Don't typo assertTrue() in a the uppercase letters validate_username() test. 
See #24618.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34824 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 07:10:25 +00:00
Drew Jaynes
33150c45d9 Users: Add a separate test for checking the validity of a username containing uppercase characters in the scope of single vs multisite. 
'JohnDoe' in single site: valid
'JohnDoe' in multisite: invalid

See #24618.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34823 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 07:02:24 +00:00
Gary Pendergast
74aef3b75d Tests: Dequeue the styles and scripts enqueued by Test_WP_Customize_Nav_Menus::test_enqueue_scripts(). 
Fixes #34163.


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


git-svn-id: http://core.svn.wordpress.org/trunk@34822 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 05:48:24 +00:00
Drew Jaynes
7b82d75ec8 Users: Empty sanitized usernames should be considered invalid when passed through validate_username(). 
Adds tests.

Props gwinhlopez for the initial patch.
Props mordauk, chriscct7.
Fixes #24618.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34821 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 05:35:25 +00:00
Scott Taylor
99be7beda0 Merge the Responsive Images feature plugin into core, initial commit. See: https://github.com/ResponsiveImagesCG/wp-tevko-responsive-images/ 
New functions in `media.php`:
* `wp_get_attachment_image_srcset_array()` - Returns an array of image candidate string data used to build a `srcset` value for an attachment given an `$attachement_id` and `$size`.
* `wp_get_attachment_image_srcset()` - Returns the `srcset` value for an attachment given an `$attachement_id` and `$size`.
* `wp_get_attachment_image_sizes()` - Returns the `sizes` value for an attachment given an `$attachement_id` and `$size` and optional arguments used to alter its output.
* `wp_make_content_images_responsive()` - A display filter for adding `srcset` and `sizes` to images embedded in content.
* `wp_img_add_srcset_and_sizes()` - A utility function used by `wp_make_content_images_responsive()` to add `srcset` and `sizes` to a single `<img>` element.

Modifies existing core functions:
* Modify `wp_get_attachment_image()` so the HTML returned for an image includes `srcset` and `sizes`.
* Modify `get_media_embedded_in_content()` (sup, 3.6 leftover) by adding `<img>` to the list of accepted tags that can be matched in content. This is used in `wp_make_content_images_responsive()` to find all of the images embedded in content before passing them off to `wp_img_add_srcset_and_sizes()`.

Tests:
* Add a new factory method to `WP_UnitTest_Factory_For_Attachment` named `create_upload_object()`
* Adds unit tests
* Updates unit tests

Props joemcgill, tevko, jaspermdegroot, mdmcginn, barryceelen, peterwilsoncc, fsylum, wonderboymusic, chriscoyier, benjaminpick, jrfnl, #12kingkool68, janhenckens, ryanmarkel, side777, ryelle, wturrell, micahmills, mattbagwell, coliff, DrewAPicture.
See #33641.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34820 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 04:59:24 +00:00
Drew Jaynes
65133a89c1 Multisite: Introduce get_subdirectory_reserved_names(), which returns a filterable list of reserved subdirectory site names. 
The function encapsulates the existing `subdirectory_reserved_names` filter and reduces the maintenance burden of keeping the value of (currently) two instances of the same hook in sync.

See #33615.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 04:35:25 +00:00
Scott Taylor
2003bc15ba Multisite: in wpmu_validate_blog_signup(), pass embed to the array passed to subdirectory_reserved_names. 
See #32522.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34818 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 04:05:24 +00:00
Gary Pendergast
7938e3c1bf Tests: Make the Attachment Slashes tests clean up after itself. 
Fixes #34162.


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


git-svn-id: http://core.svn.wordpress.org/trunk@34817 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 04:01:24 +00:00
Scott Taylor
d96fb9def9 Embeds: move some functions from media.php to a new file, embed-functions.php, via svn cp 
See #32522.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34816 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 03:59:24 +00:00
Scott Taylor
3ef27f7929 oEmbed: add embed to $subdirectory_reserved_names. 
Props jeremyfelt.
See #32522.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34815 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 03:45:25 +00:00
Aaron Jorbin
fb624b32ac Fix whitespace issues introduced in [34848] 
Bad Jorbin.

See #33968

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


git-svn-id: http://core.svn.wordpress.org/trunk@34814 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 03:41:24 +00:00
Aaron Jorbin
55f4da677f HTTP timeouts should cause some tests to be skipped, not failed 
A number of the HTTP external tests can inconstantly fail. As the HTTP API is one that doesn't change often, this failure creates noise. With the goal of increasing the signal from the unit tests, these tests are now skipped if they timeout. A notice is added when running the external http tests so that the developer knows what skipped tests may mean here.

See #33968


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


git-svn-id: http://core.svn.wordpress.org/trunk@34813 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 03:37:25 +00:00
Scott Taylor
0726babf36 Rewrite: add tests for add_rewrite_rule(). 
Props DrewAPicture.
See #16840.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34812 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 03:36:25 +00:00
Scott Taylor
0c6ee34d00 REST API: add a utility function, mysql_to_rfc3339() to functions.php 
Background:
6d0ad766ca

Props rmmcue.
See #33982.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34811 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 03:19:25 +00:00
Scott Taylor
f8c3aca01c REST API: add JsonSerializable() compatibility interface for PHP <5.4 to compat.php 
Props rmmcue.
See #33982.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 02:56:24 +00:00
Scott Taylor
5a357a452f REST API: add json_last_error_msg() compatibility function for PHP <5.5 to compat.php 
Props rmmcue.
See #33982.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 02:45:26 +00:00
Drew Jaynes
22ab774617 Docs: Adjust the line wrap indentation on the $link parameter description for the wp_post_revision_title_expanded hook, introduced in [34842]. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 01:30:25 +00:00
Helen Hou-Sandí
780926c161 Revisions: Add a wp_post_revision_title_expanded filter. 
This allows for content to be added to revision lists, such as in the revisions metabox.

fixes #9681.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34807 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 00:59:27 +00:00
Dominik Schilling
93a5af5753 Image Editor: Merge two error strings. 
Props pavelevap.
See #22623.
Built from https://develop.svn.wordpress.org/trunk@34841


git-svn-id: http://core.svn.wordpress.org/trunk@34806 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 22:40:25 +00:00
Jeremy Felt
ab5ea42aa2 MS: Pass context to get_header() and get_footer() in activation/signup. 
Fixes #21712.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34805 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 22:36:24 +00:00
Dominik Schilling
fcc36d1adf Media List Table: Remove the date display in column_parent(). 
It should be the time at which the post was written, but it was never because of the missing `$parent` argument.

Fixes #33238.
Built from https://develop.svn.wordpress.org/trunk@34839


git-svn-id: http://core.svn.wordpress.org/trunk@34804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 22:25:26 +00:00
Weston Ruter
0b93819465 Customizer: Ensure WP_Customize_Setting::update() returns boolean value. 
Adds unit tests for `WP_Customize_Setting::save()` (and `WP_Customize_Setting::update()`), along with the actions `customize_update_{$type}`, and `customize_save_{$id_base}` which they trigger.

Fixes #34140.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34803 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 21:58:24 +00:00
John Blackbourn
1e90e58da3 Correct pagination when viewing the 'Mine' link on the post listing screen. 
Fixes #19609
Props ocean90

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


git-svn-id: http://core.svn.wordpress.org/trunk@34802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 21:36:25 +00:00
John Blackbourn
ab413e89bf Include post__in as a value available to the orderby parameter in the docs for WP_Query::parse_query(). 
See #32246

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


git-svn-id: http://core.svn.wordpress.org/trunk@34801 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 20:58:29 +00:00
Weston Ruter
31a394fcf7 Customizer: Reset horizontal scroll position when finished dragging a nav menu item. 
Props karinedo, austinginder, adamsilverstein, tyxla.
Fixes #33367.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34799 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 20:46:27 +00:00
Helen Hou-Sandí
60431ae239 Permalinks: Slightly lengthen the truncated slug for display. 
This brings it closer to the width of the input so there is less jumping around of buttons. We can afford the space now that other buttons in the space are typically no longer there.

fixes #18306.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 19:29:24 +00:00
Drew Jaynes
3f747a6395 Revisions: Also pass the $revision post object to the wp_prepare_revision_for_js filter, introduced in [34541]. 
Props helen.
Fixes #28627.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 18:33:28 +00:00
Drew Jaynes
a134491455 Docs: Document the $revision_data parameter passed to the wp_prepare_revision_for_js filter with a hash notation. 
The hook was introduced in [34541].

See #28627.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 18:03:26 +00:00
Weston Ruter
31d02887b6 Customizer: Fix moving focus to available nav menu items search. 
Fixes regression introduced in [34219].

Props tyxla.
See #33360.
Fixes #34125 for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 15:27:24 +00:00
Boone Gorges
0e7c1d3b14 Use wp_installing() instead of WP_INSTALLING constant. 
The `WP_INSTALLING` constant is a flag that WordPress sets in a number of
places, telling the system that options should be fetched directly from the
database instead of from the cache, that WP should not ping wordpress.org for
updates, that the normal "not installed" checks should be bypassed, and so on.

A constant is generally necessary for this purpose, because the flag is
typically set before the WP bootstrap, meaning that WP functions are not yet
available.  However, it is possible - notably, during `wpmu_create_blog()` -
for the "installing" flag to be set after WP has already loaded. In these
cases, `WP_INSTALLING` would be set for the remainder of the process, since
there's no way to change a constant once it's defined. This, in turn, polluted
later function calls that ought to have been outside the scope of site
creation, particularly the non-caching of option data. The problem was
particularly evident in the case of the automated tests, where `WP_INSTALLING`
was set the first time a site was created, and remained set for the rest of the
suite.

The new `wp_installing()` function allows developers to fetch the current
installation status (when called without any arguments) or to set the
installation status (when called with a boolean `true` or `false`). Use of
the `WP_INSTALLING` constant is still supported; `wp_installing()` will default
to `true` if the constant is defined during the bootstrap.

Props boonebgorges, jeremyfelt.
See #31130.
Built from https://develop.svn.wordpress.org/trunk@34828


git-svn-id: http://core.svn.wordpress.org/trunk@34793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 15:06:28 +00:00
Drew Jaynes
aa6fbdaa92 Docs: Add a missing DocBlock summary for wp_list_widget_controls_dynamic_sidebar(). 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 03:06:24 +00:00
Drew Jaynes
b1b2ec30e2 Docs: Add missing DocBlock summaries for five functions in wp-admin/includes/template-functions.php. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34791 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 03:03:25 +00:00
Drew Jaynes
0b332f6d7a Docs: Add missing DocBlock summaries to three functions in wp-admin/includes/plugin.php. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 02:55:24 +00:00