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

7937 Commits

Author SHA1 Message Date
Jeremy Felt 19f988840f Multisite: Wrap the main bootstrap process in a function 
Introduce `ms_load_current_site_and_network`. This is used by core during the multisite bootstrap process to populate the `$current_site` and `$current_blog` globals based on a requested domain and path.

Return values from this function inform `ms-settings.php` as to whether a page view should continue, `ms_not_installed()` should fire, or a redirect to a new location should occur.

This was previously a procedural block in `ms-settings.php`. Wrapping this code and providing specific return values allows us to write tests that do not rely on the manual and repeated inclusion of `ms-settings.php`.

This should not be used by plugins or themes. Please.

See #34941.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-20 20:57:28 +00:00
Boone Gorges 720e2af290 During password reset, user-submitted login/email should be stripslashed. 
This prevents errors when an email address contains an apostrophe. See [29966]
for similar treatment of a related problem.

Props dcavins.
Fixes #36322.
Built from https://develop.svn.wordpress.org/trunk@37474


git-svn-id: http://core.svn.wordpress.org/trunk@37442 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-20 19:21:30 +00:00
Peter Wilson a593be4403 Docs: Correct @since tag for Emoji SVG filters 
See [37471]

Fixes #36525

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


git-svn-id: http://core.svn.wordpress.org/trunk@37441 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-20 06:15:27 +00:00
Aaron Jorbin 2db9ac7a24 Update jQuery Migrate to 1.4.1 
http://blog.jquery.com/2016/05/19/jquery-migrate-1-4-1-released-and-the-path-to-jquery-3-0/

Unquoted selectors for attribute selectors should function once again (and output a warning so that plugins and themes using them can update).

Fixes #36892


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


git-svn-id: http://core.svn.wordpress.org/trunk@37440 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-20 06:11:28 +00:00
Peter Wilson 94290a843b Emoji: Use SVG in supported browsers 
Use SVG images in supporting browsers, otherwise fall back to PNG images. Add the filters `emoji_svg_url` and `emoji_svg_ext`.

Introduces unit tests to check the Emoji CDN filters.

Fixes #36525

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


git-svn-id: http://core.svn.wordpress.org/trunk@37439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-20 06:03:27 +00:00
Gary Pendergast b777ce5b89 Tests: Fix an incorrect `@ticket` header included in [37469]. 
See #36122.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-20 05:30:27 +00:00
Gary Pendergast 7349a7a60e Emoji: Allow emoji in `blogname` and `blogdescription` on `utf8` installs. 
When the options table is set to `utf8` instead of `utf8mb4`, emoji will be stripped from the blog name and description when they're saved. Instead of stripping them, they can be encode as HTML entities.

Fixes #36122.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-20 04:54:27 +00:00
Jeremy Felt 9fa38fdc31 Multisite: Introduce `get_site()` 
Given a site ID or site object, `get_site()` retrieves site data in the same vein as `get_post()` or `get_comment()`. This will allow for clean retrieval of sites from a primed cache when `WP_Site_Query` is implemented.

Adds a `WP_Site::to_array()` method to support multiple return types within `get_site()`.

Props spacedmonkey.
See #35791.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37436 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-20 04:41:27 +00:00
Andrea Fercia ce94f2dfbd Refine the FTP credentials form interaction. 
Properly toggle SSH2 Authentication Keys fieldset visibility.
JavaScript and CSS clean-up.

Props Mte90.
Fixes #34376.
Built from https://develop.svn.wordpress.org/trunk@37467


git-svn-id: http://core.svn.wordpress.org/trunk@37435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-19 22:59:28 +00:00
Jeremy Felt 4a12078b31 Multisite: Filter the links displayed on "Edit Site" views 
Introduce the `network_edit_site_nav` function, which DRYs up the code used to display a common set of links at the top of "Edit Site" views.

Introduce the `network_edit_site_nav_links` filter, which allows plugins to modify the list of links displayed at the top of Edit Site views as a "tabbed" interface.

Props johnjamesjacoby, c3mdigital, Bueltge.
Fixes #15800.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37434 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-19 21:48:30 +00:00
Boone Gorges 03fa635ba7 Introduce `required` argument for `wp_dropdown_categories()`. 
This allows the HTML5 `required` attribute to be added to the `select` element.

Props wzislam, pcarvalho.
Fixes #31909.
Built from https://develop.svn.wordpress.org/trunk@37465


git-svn-id: http://core.svn.wordpress.org/trunk@37433 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-19 02:39:27 +00:00
Boone Gorges 3b24e53ba7 Move `wp_dropdown_categories()` tests into their own file. 
See #31909.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-19 02:23:27 +00:00
Boone Gorges 805a1ebadb Beautify, simplify, lovelify, alignify the default argument array in `wp_dropdown_categories()`. 
See #31909.
Built from https://develop.svn.wordpress.org/trunk@37463


git-svn-id: http://core.svn.wordpress.org/trunk@37431 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-19 02:17:27 +00:00
Sergey Biryukov 117cef2d46 Docs: Correct variable type for `WP_Upgrader::$strings`. 
Props mt8.biz.
Fixes #36883.
Built from https://develop.svn.wordpress.org/trunk@37462


git-svn-id: http://core.svn.wordpress.org/trunk@37430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-19 00:36:27 +00:00
Sergey Biryukov 9b56e3b7e4 External Libraries: After [37402], replace two more instances of `split()` with `explode()` in `wp-includes/atomlib.php`. 
Props josephscott.
Fixes #20673.
Built from https://develop.svn.wordpress.org/trunk@37461


git-svn-id: http://core.svn.wordpress.org/trunk@37429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-19 00:06:28 +00:00
Drew Jaynes 0016e4bb12 Docs: Fix an incorrect Codex link in the file header for wp-includes/cache.php. 
Introduced in [7990].

Props michaelbeil.
See #36880.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37428 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-18 22:07:28 +00:00
Aaron Jorbin ced4ef2144 Correct usage of @Covers for Tests_Post_Types 
When @covers is used with a plain alphanumeric string, PHPUnit assumes that it is covering a class. If there is no class, it fails and exits rather than continuing to generate coverage. To cover a global function, the name must start with ::. See https://phpunit.de/manual/5.3/en/appendixes.annotations.html#appendixes.annotations.covers

Introduced in [36768].

Fixes #36867. See #35985


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


git-svn-id: http://core.svn.wordpress.org/trunk@37427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-18 17:14:29 +00:00
Dominik Schilling 9f7856f103 Remove duplicate CSS selectors in `forms.css`. 
Props bassgang.
Fixes #36580.
Built from https://develop.svn.wordpress.org/trunk@37458


git-svn-id: http://core.svn.wordpress.org/trunk@37426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-18 12:20:29 +00:00
Pascal Birchler 0afb5d0041 Customize: Change attachment condition in the site icon control to prevent errors. 
Props neverything.
Fixes #36749 for trunk.
Built from https://develop.svn.wordpress.org/trunk@37456


git-svn-id: http://core.svn.wordpress.org/trunk@37424 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-17 20:39:30 +00:00
Pascal Birchler d60b748652 Embeds: Change attachment metadata condition to prevent a warning in the embeds template. 
See #35237.
Fixes #36838 for trunk.
Built from https://develop.svn.wordpress.org/trunk@37452


git-svn-id: http://core.svn.wordpress.org/trunk@37420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-17 20:33:29 +00:00
Aaron Jorbin 6af8a5d48c Set a whitelist for PHPUnit code coverage. 
PHPUnit requires a whitelist as of version 5 in order to generate code coverage. See https://github.com/sebastianbergmann/phpunit-documentation/issues/335 .

Fixes #36867.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37417 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-17 20:23:28 +00:00
Pascal Birchler eeadf35fa9 Bootstrap/Load: Silence `ini_set()` in `wp_debug_mode()`. 
Props SergeyBiryukov.
Fixes #36708 for trunk.
Built from https://develop.svn.wordpress.org/trunk@37448


git-svn-id: http://core.svn.wordpress.org/trunk@37416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-17 20:22:28 +00:00
Aaron Jorbin c4752b1bf9 Correct usage of Covers for Tests_Update_Comment_Count_Now 
When @covers is used with a plain alphanumeric string, PHPUnit assumes that it is covering a class. If there is no class, it fails and exits rather than continuing to generate coverage. To cover a global function, the name must start with ::. See https://phpunit.de/manual/5.3/en/appendixes.annotations.html#appendixes.annotations.covers

[37445] for trunk

See #35060, #36867


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


git-svn-id: http://core.svn.wordpress.org/trunk@37415 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-17 20:20:27 +00:00
Ella Iseulde Van Dorpe 6e72bc4ec5 TinyMCE: use new non-editable implementation 
Use TinyMCE's implementation of `contenteditable="false"` for views.

First pass.

See #36434.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-17 18:49:30 +00:00
Ryan McCue 691d445d68 REST API: Use prepared JSON data correctly. 
This was modifying a variable that was never used. Oops.

Fixes #36358.
Props jrf.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-17 03:55:29 +00:00
Boone Gorges 1cfeaada73 Tests: Use factory method to generate fixtures for `wp_unique_post_slug()` tests. 
Props mintindeed.
See #20419.
Built from https://develop.svn.wordpress.org/trunk@37443


git-svn-id: http://core.svn.wordpress.org/trunk@37411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-17 01:49:28 +00:00
Helen Hou-Sandí 848501711a System font: The stack does not work with the `font` shorthand property. 
see #36753.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37410 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-17 01:45:27 +00:00
Dominik Schilling 693dfe3453 Editor: Merge two strings. 
Props pavelevap.
See #27756.
Built from https://develop.svn.wordpress.org/trunk@37441


git-svn-id: http://core.svn.wordpress.org/trunk@37407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-16 18:57:29 +00:00
Dominik Schilling a673a71f94 I18N: In `get_translations_for_domain()` check if the global `$l10n` was set by `_load_textdomain_just_in_time()` before accessing it. 
Props danielhuesken.
Fixes #34114.
Built from https://develop.svn.wordpress.org/trunk@37440


git-svn-id: http://core.svn.wordpress.org/trunk@37406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-16 15:10:29 +00:00
Andrea Fercia 1ae8891261 Accessibility: make the tab order match the visual order in the Edit terms screens. 
Fixes #35664.
Built from https://develop.svn.wordpress.org/trunk@37439


git-svn-id: http://core.svn.wordpress.org/trunk@37405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-16 13:02:29 +00:00
Dominik Schilling 8c0c57b9f9 Version bump. 
Fixes #36845.
Built from https://develop.svn.wordpress.org/trunk@37438


git-svn-id: http://core.svn.wordpress.org/trunk@37404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-16 10:24:30 +00:00
Weston Ruter dcf6cf3615 Customize: Include shortcut button in Custom Menu widget to edit the selected menu in the Customizer. 
Clicking on the Edit Menu button focuses on the corresponding nav menu section. Upon collapsing the nav menu section, the focus is returned to the Custom Menu widget instead of taking the user to the menus root panel. In this way, the back button behavior is modified once to serve as breadcrumb/history navigation. The Edit Menu button with the breadcrumb back button behavior greatly reduce the number of UI interactions needed to edit a menu referenced in a Custom Menu widget.

Props celloexpressions, westonruter.
Fixes #32683.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-16 07:22:30 +00:00
Ryan McCue 6da21bc4f4 HTTP API: Pass array-like object to http_api_debug. 
This was mistakingly passing the Requests_Response object, which caused fatal errors with debugging tools.

See #33055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-16 06:12:29 +00:00
Joe McGill bdfd58c8cf Media: Remove medium_large size from `$whitelist_options['media']` in `options.php`. 
The `medium_large_size_w` and `medium_large_size_h` options were added to the
$whitelist_options['media'] in options.php in [35479], which causes both options
to be set to `0` when the media settings are changed. When this occurs, the
medium_large image size will no longer be created when an image is uploaded.

Since these options aren't meant to be updated via the settings UI, they can be
safely removed from the whitelist.

Fixes #36531.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-15 22:38:29 +00:00
Dominik Schilling 944a69df87 Credits: Add a missing closing tag. 
Props ramiy for initial patch.
Fixes #35911.
Built from https://develop.svn.wordpress.org/trunk@37434


git-svn-id: http://core.svn.wordpress.org/trunk@37400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-14 18:58:31 +00:00
Dominik Schilling 52d30beb3c External Libraries: Update jQuery to 1.12.4-pre. 
This version includes a fix for the media library which didn't open under certain conditions. The issue was tracked upstream as "Specific table CSS style breaks `.is(':visible')`", see https://github.com/jquery/jquery/issues/3065.
Also fixed: "Element which is not in page is still :visible in IE8", see https://github.com/jquery/jquery/issues/3043.

Changelog: https://github.com/jquery/jquery/compare/1.12.3...376caf4d

See #36533.
Built from https://develop.svn.wordpress.org/trunk@37433


git-svn-id: http://core.svn.wordpress.org/trunk@37399 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-13 21:15:27 +00:00
Dominik Schilling f81b65688a Upgrader: Add changelog entries for when the classes were moved to its own file. 
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37432


git-svn-id: http://core.svn.wordpress.org/trunk@37398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-13 20:59:27 +00:00
Drew Jaynes b1804afeaf Docs: Standardize on 'backward compatibility/compatible' nomenclature in core inline docs. 
Also use 'back-compat' in some inline comments where backward compatibility is the subject and shorthand feels more natural.

Note: 'backwards compatibility/compatibile' can also be considered correct, though it's primary seen in regular use in British English.

Props ocean90.
Fixes #36835.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-13 18:41:31 +00:00
Ryan McCue 1e40ba291e HTTP API: Fix compatibility with cURL <7.22 
Ensure connections are closed after usage to fix an issue with WP.com URLs used in the tests.

Resynched from GitHub at 95518ce.

See #33055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37396 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-13 11:15:29 +00:00
Ryan McCue dee1d583a7 HTTP API: Add browser compatibility hook for 3xx redirects. 
WordPress erroneously follows browser-style behaviour with 3xx redirects, where a POST to 302 becomes a GET. Requests instead follows the specification and keeps the same method. Requests also exposes a hook to allow changing the behaviour.

[37428] used the wrong method of adding this hook, now corrected.

See #33055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37395 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-13 05:11:27 +00:00
Ryan McCue 37f6e6813a HTTP API: Replace internals with Requests library. 
Requests is a library very similar to WP_HTTP, with a high level of unit test coverage, and has a common lineage and development team. It also supports parallel requests.

See #33055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37394 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-13 04:42:28 +00:00
Dominik Schilling 65f5fe6fb2 Widgets: Create `WP_Widget_Mock` as a mock of `WP_Widget` which can be used for widget tests. 
You cannot instantiate an abstract class. Not even in WordPress world.

See #35981.
Built from https://develop.svn.wordpress.org/trunk@37427


git-svn-id: http://core.svn.wordpress.org/trunk@37393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-12 21:25:27 +00:00
Weston Ruter b036bf1012 Customize: Clean up media control CSS. 
Removes unnecessary wrapper elements and refactors class names to eliminate duplication of rule selectors.

Props celloexpressions.
Fixes #30618.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-12 20:23:54 +00:00
Dominik Schilling 97fc82a879 Widgets: Make `WP_Widget` a real abstract class. 
This removes the `die()` call from `WP_Widget::widget()` and converts it to an abstract method.
`WP_Widgets` (later renamed to `WP_Widget`) was introduced in [10764] where the minimum PHP requirement was 4.3, thus no `abstract` was available.

Props johnbillion.
Fixes #35981.
Built from https://develop.svn.wordpress.org/trunk@37425


git-svn-id: http://core.svn.wordpress.org/trunk@37391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-12 20:23:28 +00:00
Dominik Schilling 7f1abd441f Posts: Fire a `post_action_{$action}` action for a custom post action request. 
Props jfarthing84, Mte90, brianvan, sudar, DrewAPicture.
Fixes #27056.
Built from https://develop.svn.wordpress.org/trunk@37424


git-svn-id: http://core.svn.wordpress.org/trunk@37390 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-12 15:44:28 +00:00
Rachel Baker 00adb457d2 Comments: Add `$data` parameter to include the comment data in the `edit_comment` action. 
Props dshanske.

Fixes #36427.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37389 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-12 15:37:27 +00:00
Dominik Schilling 251274abf6 List Tables: Pass the `$which` parameter to `restrict_manage_posts` and `restrict_manage_users`. 
`$which` contains the location of the extra table nav markup: 'top' or 'bottom'.

Props martin.krcho.
Fixes #35307.
Built from https://develop.svn.wordpress.org/trunk@37422


git-svn-id: http://core.svn.wordpress.org/trunk@37388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-12 15:13:27 +00:00
Dominik Schilling 546b031453 Filesystem API: Don't add `'.'` to the list of directories which need to be checked/created when extracting a file. 
Prevents a PHP warning by `WP_Filesystem_Direct::mkdir()` when installing a language pack which doesn't have subdirectories.

Props tfrommen.
Fixes #36570.
Built from https://develop.svn.wordpress.org/trunk@37421


git-svn-id: http://core.svn.wordpress.org/trunk@37387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-12 12:40:28 +00:00
Helen Hou-Sandí a726a9f51f Admin font: Remove a redundant `sans-serif` declaration. 
props samantha-miller.
see #36753.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-12 02:14:28 +00:00
Jeremy Felt 283c367df7 Tests: Set `public` to `1` in the default blog factory 
When no `$meta` arguments are passed to `wpmu_create_blog()`, `public` is set to `0` in the database for new sites. This is fine, but also does not match the default implied when most sites are created via `site-new.php`.

The only current use of the `$meta` argument in the tests is to (re)mark `public` as `0`. All existing tests pass with this change. Tests for `WP_Site_Query` can now rely on better default expectations.

See #36566.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-11 19:22:27 +00:00