Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-07-02 17:55:07 +02:00
Code Issues Projects Releases Wiki Activity
32,653 Commits 49 Branches 744 Tags 931 MiB
6209004bf7
Commit Graph

32653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dion Hulse
09ada24c99 Upgrade: Force disable the rest-api plugin on upgrade to 4.4 unless it's beta5+. Previous versions of the plugin were not configured correctly to gradefully degrade during update which would cause fatal errors. 
Props wonderboymusic.
Fixes #34415

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


git-svn-id: http://core.svn.wordpress.org/trunk@35546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-09 01:22:28 +00:00
Weston Ruter
5411447dd3 Customize: Fix sub-nav menu items from appearing to bump to root level in preview upon saving. 
This issue would appear when the parent nav menu item was also newly-inserted. The issue was only apparent in the prevew, as the actual data saved was correct. The `menu_item_parent` properties of the saved sub-nav menu items needed to get updated to refer to the newly-inserted parent `nav_menu_item` post IDs, as opposed to retaining the placeholder IDs.

Fixes #34628.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-09 01:19:26 +00:00
Weston Ruter
c470b872bd Customize: Improve alignment of WP_Customize_Nav_Menu_Item_Setting::sanitize() behavior with wp_update_nav_menu_item(). 
* Apply `title_save_pre`, `excerpt_save_pre`, and `content_save_pre` filters on a nav menu item's `title`, `attr_title`, and `description` properties respectively. This ensures that arbitrary markup can be supplied if the user has `unfiltered_html` cap, and for these fields to have markup stripped if not.
* Ensure a nav menu item's `post_status` is sanitized as `publish` or `draft` using the same conditions as `wp_update_nav_menu_item()`.
* Align `WP_Customize_Nav_Menu_Item_Setting::sanitize()` behavior for sanitizing `position` to be the same as `wp_update_nav_menu_item()`.
* Also apply `nav_menu_attr_title` and `nav_menu_description` filters in `WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item()` to ensure that previewing markup entered into menu item description will preview the same way as when the nav menu item is saved.
* Add unit tests.

Fixes #32812.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-09 00:48:26 +00:00
Dion Hulse
f47801d504 Media: Allow media_sideload_image() to work when the upload directory is a PHP Stream. Using copy() instead of rename() allows the function to work across different stream sources. 
Props mattheu.
Fixes #29257

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


git-svn-id: http://core.svn.wordpress.org/trunk@35543 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-09 00:44:27 +00:00
Gary Pendergast
af06409b97 Embeds: Add a filter for the site title HTML. 
Props swissspidy.

Fixes #34534.



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


git-svn-id: http://core.svn.wordpress.org/trunk@35542 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-09 00:11:26 +00:00
Gary Pendergast
a2349a2377 Embeds: Fix support for embedding in non-WordPress sites. 
This moves the last of the iframe message code from PHP to JavaScript, so it can be included in any site, without needing to rely on any of WordPress' internal behaviour.

Props swissspidy.

Fixes #34451.


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


git-svn-id: http://core.svn.wordpress.org/trunk@35541 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-09 00:08:27 +00:00
Dominik Schilling
5e0dac0f8f Widgets: Fix typo in WP_Widget_Tag_Cloud::form(). 
Props skithund.
Fixes #34623.
Built from https://develop.svn.wordpress.org/trunk@35576


git-svn-id: http://core.svn.wordpress.org/trunk@35540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-08 20:35:27 +00:00
Jeremy Felt
23c1050fb9 MS: Allow "Network Admin Email" to be a non-user during network setup. 
The network admin email setting for a network is often used as a catch-all or notification email separate from the actual user ID set as the owner of the new network. If a non-user email address is set during network installation, we can defer to the current user as the actual network admin and apply the entered email as the address to which general notifications are sent and emails are sent from.

In the future, we'll want to update the messaging around "Network Admin Email" to reflect its reality. See #34293.

Props jjeaton.
Fixes #34065.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35539 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-08 03:16:26 +00:00
Andrew Ozz
9fb7dcc30d TinyMCE: update to 4.2.7. Changelog: http://www.tinymce.com/develop/changelog/?ctrl=version&act=view&pr_id=1&vr_id=888 
Fixes #34620.
Built from https://develop.svn.wordpress.org/trunk@35574


git-svn-id: http://core.svn.wordpress.org/trunk@35538 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-08 02:32:26 +00:00
Jeremy Felt
c0a3348487 Multisite: Clarify documentation for WP_Network::get_by_path(). 
See #31985.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-08 02:25:25 +00:00
Jeremy Felt
f3c2c7350c Site Icon: Wrap site icon retrieval with switch_to_blog() as needed. 
When the site icon for another site is requested, retrieving its ID via `get_blog_option()` is not enough. `switch_to_blog()` is used to set proper context when required.

Adds multsite tests for `has_site_icon()`.

Props imath.
Fixes #34312.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-08 02:04:27 +00:00
Jeremy Felt
d1c09d96bf Site Icon: Use new wp_get_attachment_image_url() to retrieve URL. 
`wp_get_attachment_image_url()` is a nice replacement for `wp_get_attachment_image_src()` here after its introduction in 4.4.

Props imath.
See #34312.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-08 01:59:26 +00:00
Sergey Biryukov
a4dc43106c Remove <code> tags from translatable string in wp-admin/network/settings.php. 
Add translator comment.

Props ramiy.
Fixes #34618.
Built from https://develop.svn.wordpress.org/trunk@35570


git-svn-id: http://core.svn.wordpress.org/trunk@35534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-08 01:34:26 +00:00
Andrew Ozz
1b44ae6663 Responsive images: make the new functions and filters signatures more consistent. 
Props joemcgill.
Fixes #34612.
Built from https://develop.svn.wordpress.org/trunk@35569


git-svn-id: http://core.svn.wordpress.org/trunk@35533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 21:36:27 +00:00
Scott Taylor
175064637f Administration: when hiding the login modal and unbind the auth check, also unbind the heartbeat auth check. 
Props nofearinc.
Fixes #28962.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 16:22:25 +00:00
Scott Taylor
e649fabb6a Accessibility: add missing alt attributes to a gaggle of <img>s. 
Props afercia.
Fixes #34583.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 16:12:27 +00:00
Scott Taylor
b17272831c List Tables: fix row links CSS for RTL. 
Props afercia.
Fixes #34150.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35530 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 16:05:25 +00:00
Scott Taylor
7a24b60c2a List Tables: to ensure that get_primary_column_name() can match columns that were added via the "manage_{$screen->id}_columns" filer, call get_column_headers() instead of $this->get_columns(). 
List Table classes and `WP_Screen` are already tangled together. The parent list table constructor adds a filter that is called by a function that references the instance globally, even though we have access to it via composition directly in the class that is adding the filter. So the fact that functions here have to be called that reference a screen instance we already have access to is what one might call... less than elegant.

#OOP

Props SergeyBiryukov.
Fixes #34508.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 15:27:25 +00:00
Dominik Schilling
a3d58b3fbe Build Tools: Update the preserveComments option for uglify:jqueryui. 
Uglify2 doesn't support the value "some" anymore. Replace it with the `/^!/` regex which produces the same output as before.

See https://build.trac.wordpress.org/changeset/35502 and https://build.trac.wordpress.org/changeset/35528.
Fixes #34177.
Built from https://develop.svn.wordpress.org/trunk@35564


git-svn-id: http://core.svn.wordpress.org/trunk@35528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 12:37:26 +00:00
Dominik Schilling
adc233f617 Build Tools: Update autoprefixer to 0.6.1. 
Release Post: https://github.com/postcss/autoprefixer/releases/tag/6.1.0

Includes changes to CSS files after `grunt precommit` because of the new transition support and a new parser for gradients (see [34637]).

See #34177.
Built from https://develop.svn.wordpress.org/trunk@35563


git-svn-id: http://core.svn.wordpress.org/trunk@35527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 11:57:31 +00:00
Dominik Schilling
4c5347fe1a Build Tools: Update grunt-postcss to 0.7.1. 
Change: https://github.com/nDmitry/grunt-postcss/commit/6e18c7d5

See #34177.
Built from https://develop.svn.wordpress.org/trunk@35562


git-svn-id: http://core.svn.wordpress.org/trunk@35526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 11:43:34 +00:00
Andrew Ozz
72a1124c45 Responsive images: omit full size images from srcset attributes when the original file is an intermediate sized GIF so we don't accidentally add animation to an otherwise flat image. Update the tests to cover this case. 
Props joemcgill, H-Shredder, SergeyBiryukov.
Fixes #34528.
Built from https://develop.svn.wordpress.org/trunk@35561


git-svn-id: http://core.svn.wordpress.org/trunk@35525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 02:10:25 +00:00
Andrew Ozz
be44f0a3f7 Responsive images: add test for invalid size name. Remove invalid size from other tests. 
Props jaspermdegroot.
See #33641.
Built from https://develop.svn.wordpress.org/trunk@35560


git-svn-id: http://core.svn.wordpress.org/trunk@35524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-07 01:33:27 +00:00
Sergey Biryukov
788ea5ba5a Reset Password: Improve wording for a string used in password reset email. 
Props obrienlabs.
Fixes #34605.
Built from https://develop.svn.wordpress.org/trunk@35559


git-svn-id: http://core.svn.wordpress.org/trunk@35523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 22:36:25 +00:00
Drew Jaynes
efdc838019 Docs: Add a missing version to the file header for wp-admin/users.php. 
See #33701.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 21:54:33 +00:00
Sergey Biryukov
9dd3f6fb16 Remove <code> tags from translatable strings in wp-admin/setup-config.php. 
Add translator comments.

Props ramiy.
Fixes #34579.
Built from https://develop.svn.wordpress.org/trunk@35557


git-svn-id: http://core.svn.wordpress.org/trunk@35521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 17:22:26 +00:00
Sergey Biryukov
2583c1e4ec Replace 7 * DAY_IN_SECONDS with WEEK_IN_SECONDS in get_weekstartend(). 
Props MikeHansenMe.
Fixes #34603.
Built from https://develop.svn.wordpress.org/trunk@35556


git-svn-id: http://core.svn.wordpress.org/trunk@35520 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 16:37:27 +00:00
Sergey Biryukov
5f16d19be7 Use the MONTH_IN_SECONDS constant added in [33698] for the month representation in human_time_diff() logic. 
Props tyxla.
Fixes #34602.
Built from https://develop.svn.wordpress.org/trunk@35555


git-svn-id: http://core.svn.wordpress.org/trunk@35519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 16:34:26 +00:00
Sergey Biryukov
7ad65267b6 Media: Avoid a PHP warning in wp_generate_attachment_metadata() if $metadata is not an array. 
This was previously fixed in [25968], but accidentally reverted in [32545].

Props skithund.
Fixes #34599.
Built from https://develop.svn.wordpress.org/trunk@35554


git-svn-id: http://core.svn.wordpress.org/trunk@35518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 09:25:26 +00:00
Weston Ruter
b9d9c6d3c9 Customize: Fix typo in WP_Customize_Manager::_cmp_priority() which caused unstable sorting for same-priority constructs in PHP. 
The issue, however, does not manifest in the UI because the UI is now built via JS and the `wp.customize.utils.prioritySort()` algorithm did not have the same typo.

Props bordoni, westonruter.
Fixes #34594.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35517 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 06:58:25 +00:00
Sergey Biryukov
cbe0cad509 Remove <code> tags from translatable strings in wp-admin/includes/network.php. 
Add translator comments.

Props ramiy.
Fixes #34598.
Built from https://develop.svn.wordpress.org/trunk@35552


git-svn-id: http://core.svn.wordpress.org/trunk@35516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 00:59:25 +00:00
Sergey Biryukov
d6e25c0aae Remove <code> tags from translatable strings in wp-admin/includes/class-wp-upgrader.php. 
Add translator comments.

Props ramiy.
Fixes #34580.
Built from https://develop.svn.wordpress.org/trunk@35551


git-svn-id: http://core.svn.wordpress.org/trunk@35515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 00:41:25 +00:00
Sergey Biryukov
8c2ed5330a Remove <code> tag from translatable string in wp-admin/options-media.php. 
Add translator comment.

Props ramiy.
Fixes #34581.
Built from https://develop.svn.wordpress.org/trunk@35550


git-svn-id: http://core.svn.wordpress.org/trunk@35514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 00:28:25 +00:00
Sergey Biryukov
387d3bca32 Add translator comments for strings in wp-admin/edit-comments.php. 
Props ramiy for initial patch.
Fixes #34586.
Built from https://develop.svn.wordpress.org/trunk@35549


git-svn-id: http://core.svn.wordpress.org/trunk@35513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 00:23:25 +00:00
Sergey Biryukov
77b0fad640 Remove <code> tags from translatable strings in wp-includes/class-wp-user.php. 
Add translator comments.

Props ramiy.
Fixes #34576.
Built from https://develop.svn.wordpress.org/trunk@35548


git-svn-id: http://core.svn.wordpress.org/trunk@35512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-06 00:06:25 +00:00
Sergey Biryukov
a0fa0d3328 Remove <code> tags from translatable strings in wp-load.php. 
Add translator comments.

Props ramiy.
Fixes #34574.
Built from https://develop.svn.wordpress.org/trunk@35547


git-svn-id: http://core.svn.wordpress.org/trunk@35511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 23:59:26 +00:00
Sergey Biryukov
b5b3b0b913 Remove <code> tag from translatable string in trackback_url(). 
Add translator commment.

Props ramiy.
Fixes #34573.
Built from https://develop.svn.wordpress.org/trunk@35546


git-svn-id: http://core.svn.wordpress.org/trunk@35510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 23:39:25 +00:00
Sergey Biryukov
09b9fae4db Remove <code> tag from translatable string in the_author(). 
Add translator commment.

Props ramiy.
See #34573.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 23:38:27 +00:00
Sergey Biryukov
123765d9c8 I18N: Add a translator comment for the string introduced in [24758] and made translatable in [29840]. 
Props swissspidy.
See #34249.
Built from https://develop.svn.wordpress.org/trunk@35544


git-svn-id: http://core.svn.wordpress.org/trunk@35508 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 21:18:25 +00:00
Sergey Biryukov
a7e305b06f Use correct placeholders in translator comments added in [35542]. 
See #34249.
Built from https://develop.svn.wordpress.org/trunk@35543


git-svn-id: http://core.svn.wordpress.org/trunk@35507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 21:05:25 +00:00
Drew Jaynes
48f4b7cfc3 I18N: Add translator comments to three _doing_it_wrong() messages added for 4.3 and 4.4. 
Also adds a full-stop to an invalid taxonomy message introduced in [34745] and later modified in [35428] for `wp_insert_post()`.

Props pavelevap.
Fixes #34249.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 20:56:32 +00:00
Aaron Jorbin
627844ca34 Bump grunt-contrib-cssmin to 0.14.0 
This updates the underlying version of cssmin

Fixes #34177


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


git-svn-id: http://core.svn.wordpress.org/trunk@35505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 17:58:28 +00:00
Aaron Jorbin
63026a897c Bump grunt-contrib-copy to 0.8.2 
updates an underlying dependency and fixes an issue with multiple copies

see #34177


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


git-svn-id: http://core.svn.wordpress.org/trunk@35504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 17:56:30 +00:00
Aaron Jorbin
25d8f212b7 Bump grunt-sass to 1.1.0 
This bumps the underlying version of node-sass to 3.4.0 and libsass to 3.3.0. It causes no difference in the current sass output.

Props netweb.
See #34177.


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


git-svn-id: http://core.svn.wordpress.org/trunk@35503 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 17:53:43 +00:00
Aaron Jorbin
d60ca2f758 Bump grunt-contrib-uglify to 0.10.0 
This includes an update to the underlying version of uglify which causes all of the JS to be modified.

See #34177


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


git-svn-id: http://core.svn.wordpress.org/trunk@35502 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 17:47:30 +00:00
Boone Gorges
91a5e4c502 Make get_term() behave more consistently in the context of shared terms. 
When `WP_Term` was introduced in [34997], the `$taxonomy` parameter for
`get_term()` was made optional. This meant that, when the optional param was
omitted, `get_term()` had no way of determining which term was intended when
the term_id was shared between multiple taxonomies. As a (somewhat sneaky) way
of fixing things, `get_term()` split any shared terms it found. But this could
cause problems with developer expectations: it's not clear why requesting a
term should result in a database update, much less a potential change in the
ID of a term.

In place of this technique, this changeset introduces a number of changes that
make the handling of shared terms a bit less insane:

* When a taxonomy is provided to `get_term()`, and a cached term is found matching the term_id, make sure the taxonomy also matches before returning it.
* When a taxonomy is not provided, ensure that the term is not shared before adding it to the cache.
* When a term is shared between taxonomies and no taxonomy is provided, return a `WP_Error` rather than splitting the term.
* When a term is shared between taxonomies, only one of which is valid, return the term from that taxonomy.

Props boonebgorges, dlh.
Fixes #34533.
Built from https://develop.svn.wordpress.org/trunk@35537


git-svn-id: http://core.svn.wordpress.org/trunk@35501 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 16:45:25 +00:00
Sergey Biryukov
3caaa702bf Comments: Use _n() in get_comments_number_text() when setting the default string for multiple comments. 
Fixes #34593.
Built from https://develop.svn.wordpress.org/trunk@35536


git-svn-id: http://core.svn.wordpress.org/trunk@35500 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 15:36:28 +00:00
Weston Ruter
1a55cbe59d Customize: Hide "Change" button in themes section if there are fewer than two available themes. 
Props danielbachhuber, westonruter.
Fixes #34549.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 01:26:25 +00:00
Weston Ruter
e0ac4e4d05 Customize: Correct phpdoc @return type for WP_Customize_Manager::add_dynamic_settings(). 
Fixes regression in [32032], where `WP_Customize_Setting[]` should have been changed to `array` instead of `WP_Customize_Setting`.

See #31888.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-05 00:43:24 +00:00
Gary Pendergast
84c8243514 Themes: Remove an errant comma from theme.js. 
Added in [35527].

See #34206.


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


git-svn-id: http://core.svn.wordpress.org/trunk@35497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-11-04 23:49:26 +00:00