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

30827 Commits

Author SHA1 Message Date
Scott Taylor 27b551ee50 Add a filter to `_navigation_markup`: 'navigation_markup_template' 
Props joedolson, mordauk.
Fixes #31315.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-23 16:34:26 +00:00
Scott Taylor b1c00f2653 Posts List Table: 
Don't show bulk actions if the user can't edit posts.

Props DrewAPicture.
Fixes #29789.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-23 16:28:28 +00:00
Drew Jaynes dffa53dca8 Docs: Fix a minor alignment issue in the DocBlock for `get_pagenum_link()`. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-23 07:19:27 +00:00
Boone Gorges dc0e7671b0 In `wp_delete_term()`, the `$deleted_term` object passed to filters should be generated before term relationships are deleted. 
This allows the `count` property to reflect the pre-delete state of affairs,
rather than always being 0.

Props nicholas_io.
Fixes #33485.
Built from https://develop.svn.wordpress.org/trunk@33711


git-svn-id: http://core.svn.wordpress.org/trunk@33678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-22 19:43:26 +00:00
Boone Gorges 6ab7493b27 Pass the `$public_only` value to 'get_usernumposts' filter. 
[32523] introduced the `$public_only` parameter to `count_user_posts()`. That
changeset was supposed to pass `$public_only` to the 'get_usernumposts' filter
at the end of the function, but only the documentation was modified, not the
filter itself.

This changeset also fixes an incorrect variable name in the docblock for
the same filter.

Props swisspidy, tmatsuur.
Fixes #33481 for trunk.
Built from https://develop.svn.wordpress.org/trunk@33710


git-svn-id: http://core.svn.wordpress.org/trunk@33677 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-22 18:59:26 +00:00
Scott Taylor 20cc53b929 Add some JS Docs for Customizer. 
Props ericlewis.
See #33503.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33676 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-22 17:24:25 +00:00
Scott Taylor c192d90fa1 In `wp_insert_user()`, add a filter: `insert_user_meta`, to filter a user's meta values and keys before the user is created or updated. 
Props tharsheblows, chriscct7, DrewAPicture.
Fixes #31549.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33675 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-22 17:12:25 +00:00
Scott Taylor 5510b519f5 In `wp_sanitize_redirect()`, don't eat `@` characters. According to RFC 3986, "@" is a perfectly valid character in a URL path or query string. 
Adds unit test.

Props markjaquith.
Fixes #18818.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-22 17:05:24 +00:00
Scott Taylor 523b51a359 Query: 
Add a query var, `title`, that allows you to query posts by `post_title`. To accomplish this now, you have to do something like:

{{{
$tacos = get_posts( [
  'post_type' => 'taco',
  's' => $name,
  'exact' => true,
  'sentence' => true,
  'post_status' => 'publish',
  'fields' => 'ids',
  'posts_per_page' => 1
] );
}}}

Adds unit tests.

Fixes #33074.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33673 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-22 16:59:26 +00:00
Scott Taylor 42b6ac80e7 Ensure that `attachment_url_to_postid()` matches cross-scheme when front-end and back-end schemes are different. 
Adds unit test.

Props welcher.
Fixes #33109.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33672 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-22 16:39:25 +00:00
Scott Taylor f2a9cd365b `update-core.php` help docs, update string to include translations: `themes, plugins, and translations` 
Props netweb, DrewAPicture.
Fixes #28201.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-22 16:25:28 +00:00
Dominik Schilling f0a89de3d4 Tests: Fix a typo in function names for `$autoload` tests. 
Autoload is "no" if the `$autoload` param for `update_option()` is `'no'` or `false`.

see #26394.
Built from https://develop.svn.wordpress.org/trunk@33703


git-svn-id: http://core.svn.wordpress.org/trunk@33670 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-22 09:45:27 +00:00
Dominik Schilling 888af781b2 Tests: Skip some tests for the Transients API when an external object cache is in use. 
`test_transient_data_with_timeout()`, `test_transient_add_timeout()`, `test_nonexistent_key_dont_delete_if_false()`, and `test_nonexistent_key_old_timeout` are testing option values which aren't available with an an external object cache like memcache.

see #31491.
Built from https://develop.svn.wordpress.org/trunk@33702


git-svn-id: http://core.svn.wordpress.org/trunk@33669 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 20:33:26 +00:00
Scott Taylor 029c274b86 In `wpdb::get_col_length()`, `break`s are not necessary when a `case` returns 
See #33491.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 18:41:25 +00:00
Scott Taylor 3982598305 Doc block for`_wp_specialchars`: `$quote_style` can also be `string` ('single' or 'double') 
See #33491.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33667 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 18:36:24 +00:00
Scott Taylor 2a44bc6a59 In `_WP_Editors::editor_settings()`, `$first_run` is unused. 
See #33491.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33666 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 18:30:24 +00:00
Aaron Jorbin ece59bf72a Add new constant MONTH_IN_SECONDS and expand time convenience documentation. 
The "month" isn't really a month.  It's a WordPress Month. As the docs make clear, it's not about accuracy as much as it about convenience.  This adds a missing step in the time convenience constants. 

Props egill
Fixes #33397



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


git-svn-id: http://core.svn.wordpress.org/trunk@33665 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 18:16:25 +00:00
Scott Taylor 0fa7f817c4 In `wp_ajax_add_meta()`, do not juggle the value of `$_POST` and alter it directly. This was done so that `edit_post()` could pull `$_POST` out of the air by-reference and alter it (equally as bad). `edit_post()` accepts a `$post_data` array. Do that instead. 
See #33491.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 18:13:24 +00:00
Weston Ruter cb2879b9d4 Widgets: Switch back to using `array_key_exists()` instead of `isset()` for widget instance existence check. 
Reverts unnecessary change in [32602] since `array_key_exists()` does actually work with `ArrayIterator` objects.

See #32474.
Fixes #33442.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33663 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 18:09:25 +00:00
Scott Taylor db32f96d8a Make 'Docs Committer' translatable. 
Props dimadin. 
Fixes #33424.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 17:47:25 +00:00
Scott Taylor 3d780c6a4b Clarify doc entry for `_wp_customize_include()` 
Props ericlewis. 
Fixes #33488.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 17:45:25 +00:00
Scott Taylor e9305edbce When createing "Sample Page" on install, comments should be `closed`. 
Props macmanx. 
Fixes #33490.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33660 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 17:42:25 +00:00
Scott Taylor fa2d0a2d55 Comment List Tables: 
* Toggle visibility of pending bubble when a comment is dynamically moderated
* Add a CSS class to the pending bubble to hide it / remove to show it

See #11200.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33659 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 17:26:26 +00:00
Drew Jaynes 54b2e39fdd Docs: Add a changelog entry for the `$post_type` parameter added to the `restrict_manage_posts` hook in [33644]. 
Props pavelevap
Fixes #17891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33658 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 16:12:25 +00:00
Drew Jaynes 0e4285c451 Docs: Fix a typo in the DocBlock description for `_get_additional_user_keys()`, introduced in [33687]. 
Props dimadin
See #29120.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33657 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 16:01:28 +00:00
Helen Hou-Sandí 514caf0120 List tables: Allow filtering of hidden and default hidden columns. 
Similar to `get_hidden_meta_boxes()`, there are now filters named `default_hidden_columns` and `hidden_columns`.

props Compute, MikeHansenMe, chriscct7.
fixes #32499.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33656 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 15:32:29 +00:00
Dion Hulse 09da29102b WP_Filesystem: SSH2 handler: Remove support for is_writable() via SSH, it turns out PHP doesn't verify the writability via SFTP and instead uses a comparison based on the current php system process user instead of the ssh user. 
This fixes the 'The update cannot be installed because we will be unable to copy some files.' error encountered during updates by skipping the write test completely.

Props jobst.
Fixes #33480 for trunk

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


git-svn-id: http://core.svn.wordpress.org/trunk@33655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 11:43:25 +00:00
Drew Jaynes 6d405d34da Docs: Clarify the DocBlock summary and add a description and return description for `_get_additional_user_keys()`. 
As noted in the description, returned keys being set is dependent on the existence of those keys in user meta at the point where `_get_additional_user_keys()` is called in `wp_update_user()`.

Fixes #29120.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 05:33:25 +00:00
Drew Jaynes 93009543bc Docs: Fix some minor inline documentation syntax issues in the hook docs for the `post_edit_category_parent_dropdown_args` filter, introduced in [33682]. 
See #32246. See #33026.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33653 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 04:54:26 +00:00
Drew Jaynes 416df545ba Docs: Fix a variety of inline documentation syntax issues and add some strategic spacing. 
Fixes #29086.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33652 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 04:13:24 +00:00
Drew Jaynes 3bb87e08e4 Docs: Add missing `@access` tags to properties and methods in wp-admin/includes/class-wp-upgrader. 
See #29086.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33651 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 04:05:25 +00:00
Drew Jaynes 73d6dec8eb Docs: Correct a typo in the summary for the `Theme_Upgrader->bulk` property. 
Also adds a couple of missing `@access` tags.

Props kraftbj
See #29086.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 03:15:25 +00:00
Boone Gorges 52614b491a Filter the arguments passed to `wp_dropdown_categories()` in the Categories post edit metabox. 
The new 'post_edit_category_parent_dropdown_args' provides parity with other
places in wp-admin where `wp_dropdown_categories()` args are filtered, such as
'taxonomy_parent_dropdown_args'.

Props theMikeD.
Fixes #33026.
Built from https://develop.svn.wordpress.org/trunk@33682


git-svn-id: http://core.svn.wordpress.org/trunk@33649 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 01:28:25 +00:00
Boone Gorges 8b15f8be3d In `Walker_CategoryDropdown::start_el()`, cast values to strings before deciding whether to append 'selected' attribute. 
As of [32484], `wp_dropdown_categories()` uses the `$value_field` value to
decide whether a given `<option>` should be 'selected'. However, `$value_field`
can refer to a value that is a string, such as a category's slug. This causes
problems when doing a loose comparison (`==`) with the value of the `'selected'`
parameter, which defaults to `0`, because when doing a loose comparison
between an integer and a string, PHP will cast the string to an integer. This
creates false matches, resulting in `<option>` elements getting a 'selected'
attribute incorrectly.

We address the issue by casting the comparison values to strings, and then
using the strict comparison operator `===`.

Fixes #33452 for trunk.
Built from https://develop.svn.wordpress.org/trunk@33681


git-svn-id: http://core.svn.wordpress.org/trunk@33648 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-21 01:11:26 +00:00
Drew Jaynes b407bb0936 Docs: Standardize `@deprecated` tag formatting in the DocBlock for the `logIO()` function. 
Props Alphawolf.
Fixes #28806.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33647 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 22:44:25 +00:00
Drew Jaynes 4770601d73 Docs: Standardize `@deprecated` tag formatting in the DocBlocks for several `wpdb` methods. 
Props Alphawolf.
See #28806.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33646 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 22:42:25 +00:00
Drew Jaynes bf371f1577 Docs: Standardize `@deprecated` tag formatting in the DocBlock for `WP_Object_Cache:reset()`. 
Props Alphawolf.
See #28806.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 22:39:24 +00:00
Drew Jaynes 02ec47fc92 Docs: Standardize `@deprecated` tag formatting in the DocBlock for `wp_xmlrpc_server::login_pass_ok()`. 
Props Alphawolf.
See #28806.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 22:38:25 +00:00
Drew Jaynes eaab0e72a6 Docs: Standardize `@deprecated` tag formatting and add missing summaries to deprecated functions in wp-includes/ms-deprecated.php. 
Props Alphawolf for the initial patch.
Props DrewAPicture

See #28806.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 22:36:25 +00:00
Drew Jaynes c8638a285a Docs: Standardize `@deprecated` tag formatting for deprecated functions in wp-admin/includes/ms-deprecated.php. 
Props Alphawolf for the initial patch
Props DrewAPicture

See #28806.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33642 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 22:26:24 +00:00
Drew Jaynes b2dcf3d1f4 Docs: Standardize `@deprecated` tag formatting for deprecated functions in wp-includes/pluggable-deprecated.php. 
Props Alphawolf for the initial patch.
Props DrewAPicture.

See #28806.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 22:15:25 +00:00
Drew Jaynes e9f1e69b23 Docs: Standardize `@deprecated` tag formatting and add missing DocBlock summaries to deprecated functions in wp-includes/deprecated.php. 
Props Alphawolf for the initial patch.
Props DrewAPicture.

See #28806.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33640 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 22:11:26 +00:00
Scott Taylor 6f9aa6df03 After [33666], fix broken `sprintf` cruff. 
See #17609.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 21:37:24 +00:00
Drew Jaynes bac6e69b3c Docs: Standardize `@deprecated` tag formatting and add missing DocBlocks to deprecated functions in wp-admin/includes/deprecated.php. 
Opted not to use the multi-function DocBlock syntax in the name of not taking shortcuts in documentation for the sake of brevity.

Props Alphawolf for the initial patch.
See #28806

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


git-svn-id: http://core.svn.wordpress.org/trunk@33638 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 21:23:25 +00:00
Drew Jaynes c36c4efea6 Docs: Add a missing summary to the DocBlock for `wp_media_upload_handler()`. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33637 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 21:01:25 +00:00
Scott Taylor 677d47ebc5 In `wp_get_attachment_link()`, accept an `id` or `WP_Post` as the first parameter. 
Props several27, DrewAPicture.
Fixes #33277.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 20:32:26 +00:00
Drew Jaynes 89c39e7eab Docs: Clarify the different return conditions in the DocBlock for `WP_List_Table->handle_row_actions()`. 
This clarification follows the introduction of primary columns in 4.3. See #33313.

Props morganestes.
Fixes #33436.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33635 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 20:22:25 +00:00
Scott Taylor 4254f22c2d In `WP_Posts_List_Table::inline_edit()`, check that `$post_formats[0]` is an array before traversing. 
Props DrewAPicture.
Fixes #33025.


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


git-svn-id: http://core.svn.wordpress.org/trunk@33634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 20:19:25 +00:00
Scott Taylor 4694c477d3 Custom Post Types: 
* Introduce `is_post_type_viewable( $post_type_object )`
* Separate the HTML bits from the translatable bits in the `post` messages array in `edit-form-advanced.php`
* Don't show certain UI pieces when a post is not viewable on the front end

When a custom post type item is not viewable on the front end, we don't want to show links to View it (on the front end) all over the admin. We also want to hide the Preview link, et al. We also want our admin messages to not contain said links.

Custom post types with `public_queryable` set to `false` are not viewable on the front end. 
`'page'` is viewable on the front end, but `'page'` is a `_builtin` type, and `public_queryable` is set to `false` when it is registered - see `WP::parse_request()` for when `public_queryable` gets used.

This is confusing, but also somewhat straightforward: to determine if a post type is viewable on the front end, we can check one way for `_builtin => true` and another way for `_builtin => false`:

`$post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public )`

If a post type is `publicly_queryable`, it's viewable. If that value is `false`, it is viewable if it's a `_builtin` type that is also `public`.

I am in search of edge cases, so this shall land.

Props wonderboymusic, DrewAPicture.
See #17609.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33633 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 19:40:25 +00:00
Drew Jaynes a7b38bf90a Docs: Correct the phpDoc type to a boolean for the `$single` parameter in the `get_{$meta_type}_metadata` hook docs. 
Props dlh.
Fixes #33451.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-20 19:36:25 +00:00