Commit Graph

37919 Commits

Author SHA1 Message Date
Sergey Biryukov
9438733d24 Privacy: automatically create a Privacy Policy page when installing WordPress.
Props fclaussen, azaozz.
Merges [42981], [42982], [43243] to the 4.9 branch.
Fixes #43491.
Built from https://develop.svn.wordpress.org/branches/4.9@43272


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 15:30:26 +00:00
Sergey Biryukov
10c9d391a8 Privacy: fix Export and Erase Personal Data list-tables on small screens.
Props ianbelanger, subrataemfluence, desrosj.
Merges [43251] to the 4.9 branch.
Fixes #44026.
Built from https://develop.svn.wordpress.org/branches/4.9@43271


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43100 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 15:10:25 +00:00
Andrew Ozz
9b3e2b76b4 Privacy: Escape comment URLs in personal export file to prevent XSS.
There doesn't appear to be any way for an attacker to introduce malicious input into the URL, unless a plugin is filtering the URL to add it, but it's better to be safe than sorry.

Props birgire.
Merges [43245] to the 4.9 branch.
Fixes #44054.
Built from https://develop.svn.wordpress.org/branches/4.9@43270


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43099 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 14:08:29 +00:00
Andrew Ozz
0ffa2fc49b Privacy: add wp_page_for_privacy_policy to populate_options().
Props ocean90.
Merges [43267] to the 4.9 branch.
Fixes #44076.
Built from https://develop.svn.wordpress.org/branches/4.9@43268


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 17:02:26 +00:00
Andrew Ozz
ca52f0f101 Privacy: fix markup for the table of contents on privacy policy guide screen.
Props ocean90, azaozz.
Merges [43265] to the 4.9 branch.
Fixes #44056.
Built from https://develop.svn.wordpress.org/branches/4.9@43266


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 16:48:27 +00:00
Andrew Ozz
77d526e000 Privacy: fix the "Privacy Policy Guide updated" message and add a link to the guide.
Props birgire, azaozz.
Merges [43263] to the 4.9 branch.
Fixes #44057.
Built from https://develop.svn.wordpress.org/branches/4.9@43264


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43093 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 16:25:28 +00:00
Dominik Schilling
70eb518623 Privacy: Remove is-dismissible class from notice when privacy info has changed.
The notice isn't dismissible as it only gets removed once you visit the privacy guide, see #44057 and #44063.

Merge of [43260] to the 4.9 branch.

See #44065.
Built from https://develop.svn.wordpress.org/branches/4.9@43262


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43091 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 16:08:26 +00:00
Dominik Schilling
7c30cc3c92 Privacy: Don't show privacy feature pointer to new users.
Merge of [43259] to the 4.9 branch.

See #44062.
Built from https://develop.svn.wordpress.org/branches/4.9@43260


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43089 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 15:53:26 +00:00
Andrew Ozz
b82ed28add Privacy: improve inline documentation.
Props desrosj.
Merges [43256] to the 4.9 branch.
Fixes #44075.
Built from https://develop.svn.wordpress.org/branches/4.9@43257


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43086 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 15:12:25 +00:00
Sergey Biryukov
6e76869056 Privacy: exclude the wrapper from the default policy content.
Props azaozz.
Merges [43242] to the 4.9 branch.
Fixes #44048.
Built from https://develop.svn.wordpress.org/branches/4.9@43255


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43084 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 14:07:24 +00:00
Sergey Biryukov
eb592352b5 Privacy: fix two typos in WP_Privacy_Policy_Content::get_default_content().
Props dlh.
Merges [43249] to the 4.9 branch.
Fixes #44050.
Built from https://develop.svn.wordpress.org/branches/4.9@43254


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 14:03:25 +00:00
Sergey Biryukov
b475d439b3 Privacy: Reposition pointer to ensure dismiss link is always visible.
r43158 introduced a new admin pointer for the privacy tools added in 4.9.6. With the previous positioning, though, sometimes the `Dismiss` link would be fixed off screen, making it impossible for the user to dismiss the pointer. This happened when there were enough extra menu items, or when the viewport height was short enough.

This commit repositions the pointer to work around that problem. One down side of this workaround is that the arrow will not always be positioned next to the `Tools` menu, where it should be. That's an acceptable compromise given the current time constraints, though. A long term solution would be to make `WP_Pointer` robust enough to handle this use case.

Props imath, audrasjb, desrosj.
Merges [43246] to the 4.9 branch.
Fixes #44045.
Built from https://develop.svn.wordpress.org/branches/4.9@43253


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 14:00:26 +00:00
Sergey Biryukov
4d5c5e90dd Privacy: define $title and $parent_file in privacy.php. Fixes showing the proper document title.
Props ocean90.
Merges [43250] to the 4.9 branch.
Fixes #44064.
Built from https://develop.svn.wordpress.org/branches/4.9@43252


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 13:54:24 +00:00
iandunn
39dcb61452 Post WordPress 4.9.6 RC 1 version bump.
Built from https://develop.svn.wordpress.org/branches/4.9@43241


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 22:34:26 +00:00
iandunn
b244bafda0 WordPress 4.9.6 RC 1.
Built from https://develop.svn.wordpress.org/branches/4.9@43240


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 22:18:25 +00:00
Sergey Biryukov
1600aef2ab Privacy: On Privacy Settings screen, check if any pages exist before displaying the page selector.
Props abdullahramzan, desrosj, melchoyce.
Merges [43238] to the 4.9 branch.
Fixes #43940.
Built from https://develop.svn.wordpress.org/branches/4.9@43239


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43068 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 21:41:26 +00:00
Sergey Biryukov
843c263881 Privacy: Expose erasure notification recipient to filter callbacks.
The previous `user_email` value was redundant, because it always matched `$request_data->email`. That value might be different from where the message is sent, though, if `the user_erasure_fulfillment_email_to` filter is used. If they are different, then callbacks for the `user_confirmed_action_email_content` filter may want to distinguish between the email address of the user making the request, and the email address that the confirmation notification is being sent to.

Props desrosj, iandunn.
Merges [43236] to the 4.9 branch.
See #43973.
Built from https://develop.svn.wordpress.org/branches/4.9@43237


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 21:22:26 +00:00
Sergey Biryukov
8c9bb731ed Privacy: Normalize file paths in wp_privacy_generate_personal_data_export_file() to make sure Windows paths don't have their backslashes stripped.
Props xkon, pmbaldha.
Merges [43234] to the 4.9 branch.
Fixes #43908.
Built from https://develop.svn.wordpress.org/branches/4.9@43235


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 21:13:27 +00:00
Sergey Biryukov
faf5abc16e Privacy: Update request confirmation notice text for clarity.
Props desrosj, melchoyce, garrett-eclipse.
Merges [43232] to the 4.9 branch.
Fixes #43970.
Built from https://develop.svn.wordpress.org/branches/4.9@43233


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43062 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 21:05:26 +00:00
Sergey Biryukov
ad8efe232e Privacy: Send an email notification to the user once their personal data erasure request is fulfilled.
Props desrosj, allendav, garrett-eclipse.
Merges [43230] to the 4.9 branch.
Fixes #43973.
Built from https://develop.svn.wordpress.org/branches/4.9@43231


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 20:44:25 +00:00
Sergey Biryukov
2c2db8337f Privacy: Avoid a PHP notice in wp_ajax_wp_privacy_erase_personal_data(), make sure $eraser_key is always defined.
Props allendav.
Merges [43228] to the 4.9 branch.
Fixes #44040.
Built from https://develop.svn.wordpress.org/branches/4.9@43229


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 20:25:25 +00:00
Sergey Biryukov
cc1c032638 General: Skip test_is_countable_ResourceBundle() on PHP 5.3 and below.
`ResourceBundle` is only countable in PHP 5.4+, which can be considered an acceptable edge case for WordPress core purposes.

Props jrf, ayeshrajans.
Merges [43226] to the 4.9 branch.
Fixes #43583.
Built from https://develop.svn.wordpress.org/branches/4.9@43227


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43056 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 20:17:26 +00:00
Andrew Ozz
f149d8fabc Privacy: Replace intrusive policy update notice with menu bubbles.
Previously, when a plugin updated its suggested privacy policy text, an admin notice was shown on all screens in the Administration Panels. That was done in order to make sure that administrators were aware of it, so that they could update their policy if needed. That was a very heavy-handed and intrusive approach, though, which leads to a poor user experience, and notice fatigue.

An alternative approach is to use bubble notifications in the menu, similar to when plugins have updates that need to be installed. That still makes it obvious that something needs the administrator's attention, but is not as distracting as a notice.

The notice will still appear on the Privacy page, though, since it is relevant to that screen, and provides an explanation of why the bubble is appearing.

Props azaozz, xkon, iandunn.
Merges [43223] to the 4.9 branch.
Fixes #43954. See #43953.
Built from https://develop.svn.wordpress.org/branches/4.9@43225


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 20:08:26 +00:00
Andrew Ozz
8e660e35d1 TinyMCE: switch off concatenation when a custom TinyMCE theme is used. Prevents conflict with the default theme as it loads first.
Props programmin, azaozz.
Merges [43222] to the 4.9 branch.
Fixes #43969.
Built from https://develop.svn.wordpress.org/branches/4.9@43224


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 19:54:25 +00:00
Sergey Biryukov
faca308a47 General: In the is_countable() polyfill, if the provided object implements SimpleXMLElement or ResourceBundle, consider it countable.
Props ayeshrajans, jrf, desrosj.
Merges [43220] to the 4.9 branch.
Fixes #43583.
Built from https://develop.svn.wordpress.org/branches/4.9@43221


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 17:59:25 +00:00
Sergey Biryukov
fbb106494f Privacy: Tweak Privacy Policy page intro text for clarity.
Props macbookandrew, allendav.
Merges [43218] to the 4.9 branch.
See #43933.
Built from https://develop.svn.wordpress.org/branches/4.9@43219


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43048 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 16:14:25 +00:00
Andrew Ozz
6bbbdf94c0 Privacy: fix styling on personal data tables.
Props melchoyce, allendav.
Merges [43216] to the 4.9 branch.
Fixes #43909.
Built from https://develop.svn.wordpress.org/branches/4.9@43217


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43046 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 16:04:25 +00:00
Sergey Biryukov
b9bda541d4 Privacy: Notify admin via email when a request is confirmed.
Previously the admin didn't have any way to know if a pending request was ready to be processed, aside from manually checking the Export/Erase pages. Sending them an email is a much more convenient option.

Props garrett-eclipse, desrosj, iandunn.
Merges [43211] to the 4.9 branch.
See #43967.
Built from https://develop.svn.wordpress.org/branches/4.9@43215


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43044 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 15:56:25 +00:00
Sergey Biryukov
3bd2b3ad62 Privacy: Reposition admin pointer to avoid covering collapsed menu.
Previously the pointer overlapped the menu in order to draw attention to the fact that it applies to both the `Tools` and `Settings` menus. That caused a conflict if the menu was collapsed, though, because the icons were covered by the pointer and therefore inaccessible.

Additionally, minor tweaks were made to the text order and formatting. The order of the two sections was swapped in the title and paragraph, in order to match the order of the corresponding menu items. The spacing around headings and paragraphs was tweaked to remove extraneous whitespace.

Props littler.chicken, desrosj, ianbelanger, melchoyce.
Merges [43210] to the 4.9 branch.
Fixes #43961.
Built from https://develop.svn.wordpress.org/branches/4.9@43214


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 15:54:25 +00:00
Andrew Ozz
bf039f8987 Privacy: cleanup of the "Export Personal Data" and "Erase Personal Data" screens.
Props desrosj, xkon.
Merges [43212] to the 4.9 branch.
See #43929.
Built from https://develop.svn.wordpress.org/branches/4.9@43213


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-10 10:03:27 +00:00
Sergey Biryukov
4cf2959f1e Privacy: Pass export request ID to wp_privacy_personal_data_export_file_created filter.
Props thomasplevy.
Merges [43208] to the 4.9 branch.
Fixes #44031.
Built from https://develop.svn.wordpress.org/branches/4.9@43209


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 23:19:25 +00:00
Sergey Biryukov
728530718b Privacy: Make the help hint for Privacy Policy page more translatable and accessible.
Props tobifjellner.
Merges [43206] to the 4.9 branch.
See #43980.
Built from https://develop.svn.wordpress.org/branches/4.9@43207


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 23:14:26 +00:00
Andrew Ozz
44dc191a6d Privacy: show the privacy policy guide and suggested content on a new page instead of a postbox. Then:
- Separate the guide text form the suggested policy text.
- Add table of content for easier navigation.
- Move the content to tools.php (prevents the settings menu of being open).
- Add a link to the guide from the Privacy settings screen.

Props melchoyce, azaozz.
Merges [43184] and [43203] to the 4.9 branch.
Fixes #43980.
Built from https://develop.svn.wordpress.org/branches/4.9@43204


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43033 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 21:00:28 +00:00
Andrew Ozz
7156e5171c Privacy: remove the help tab from Settings => Privacy until we have something helpful to say :)
Props allendav.
Merges [43201] to the 4.9 branch.
Fixes #44023.
Built from https://develop.svn.wordpress.org/branches/4.9@43202


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 18:14:26 +00:00
Andrew Ozz
451d53723b Privacy: remove leftover comment after [43197].
Merges [43199] to the 4.9 branch.
See #43968.
Built from https://develop.svn.wordpress.org/branches/4.9@43200


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 17:59:24 +00:00
Andrew Ozz
1d477066e4 Privacy: add request type and filter to the subject of request confirmation emails for GDPR.
Props desrosj, azaozz.
Merges [43197] to the 4.9 branch.
Fixes #43968.
Built from https://develop.svn.wordpress.org/branches/4.9@43198


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 17:54:24 +00:00
Andrew Ozz
0827e54cc0 Privacy: increase filter priority of the User group in Personal Data Exports.
Props allendav desrosj.
Merges [43195] to the 4.9 branch.
Fixes #43966.
Built from https://develop.svn.wordpress.org/branches/4.9@43196


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 17:13:26 +00:00
Andrew Ozz
45c4047586 Privacy: fix spacing on small screens for the Use This Page button in Privacy Tools.
Props PressTigers, desrosj.
Merges [43193] to the 4.9 branch.
Fixes #43852.


Built from https://develop.svn.wordpress.org/branches/4.9@43194


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43023 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 16:16:25 +00:00
Sergey Biryukov
547912fbfc Privacy: Add id attribute to WP_Privacy_Requests_Table and WP_Privacy_Data_Export_Requests_Table rows, for consistency with other post list tables.
Props desrosj.
Merges [43191] to the 4.9 branch.
Fixes #44015.
Built from https://develop.svn.wordpress.org/branches/4.9@43192


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 15:08:26 +00:00
Sergey Biryukov
9209c0738c Docs: Remove unused ###USERNAME### placeholder reference from user_request_action_email_content filter documentation.
Props desrosj.
Merges [43189] to the 4.9 branch.
Fixes #44016.
Built from https://develop.svn.wordpress.org/branches/4.9@43190


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 14:39:26 +00:00
Sergey Biryukov
094c20d004 Privacy: Mark erasure requests as completed after processing.
r42986 introduced the beginnings of an Ajax handler for processing requests to erase personal data. At the time, a method for marking requests as completed was planned, but had not yet been created. This commit introduces that mechanism, bringing the erasure process closer to completion.

Props coreymckrill, allendav.
Merges [43185] to the 4.9 branch.
Fixes #43922.
Built from https://develop.svn.wordpress.org/branches/4.9@43188


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43017 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 14:33:26 +00:00
Sergey Biryukov
2ce4a04aff Privacy: Mark processed requests as completed instead of confirmed.
r43008 refactored the request flow to make several improvements, but accidentally marked `completed` requests as `confirmed`. This commit restores the intended statuses, so that the data and corresponding UI reflect reality.

Props allendav, birgire.
Merges [43183] to the 4.9 branch.
Fixes #43913.
Built from https://develop.svn.wordpress.org/branches/4.9@43187


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 14:31:26 +00:00
Sergey Biryukov
809d5fa08e Privacy: Reuse existing archive filenames to maintain URLs.
Whenever an admin initiates a download or email of a personal data export, a fresh copy of the file is generated. Previously, a new filename was used each time, which could lead to situations where a URL that was emailed to a data subject is broken.

That can be avoided by reusing the same filename when building fresh archives.

Props desrosj, tz-media, allendav.
Merges [43180] to the 4.9 branch.
Fixes #43905.
Built from https://develop.svn.wordpress.org/branches/4.9@43186


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-09 14:30:26 +00:00
Andrew Ozz
cca8f1053b TinyMCE: fix setting of zIndex on the dialogs.
Props subrataemfluence, azaozz.
Merges [43181] to the 4.9 branch.
Fixes #43984.
Built from https://develop.svn.wordpress.org/branches/4.9@43182


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43011 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-08 20:57:28 +00:00
Sergey Biryukov
1d2fd8ef87 Privacy: Use the terms "erase"/"erasure" instead of "remove"/"removal" for personal data.
Props allendav.
Merges [43175] to the 4.9 branch.
Fixes #43920.
Built from https://develop.svn.wordpress.org/branches/4.9@43176


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43005 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-07 16:46:26 +00:00
Sergey Biryukov
318ebdf1eb Privacy: Change "Email Data" link text on "Export Personal Data" screen to "Send Export Link" for clarity.
Props birgire, ianbelanger.
Merges [43172] to the 4.9 branch.
Fixes #43964.
Built from https://develop.svn.wordpress.org/branches/4.9@43173


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43002 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-05 09:23:26 +00:00
Sergey Biryukov
deeee40510 Privacy: Remove stray closing tag in WP_Privacy_Policy_Content::get_default_content(), fix typo in @return tag.
Props dlh, tobifjellner.
Merges [43170] to the 4.9 branch.
Fixes #43951.
Built from https://develop.svn.wordpress.org/branches/4.9@43171


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-04 01:57:26 +00:00
Sergey Biryukov
a86c8727b6 Docs: Add missing duplicate hook comment for user_request_key_expiration filter.
Props birgire, desrosj.
Merges [43168] to the 4.9 branch.
Fixes #43934.
Built from https://develop.svn.wordpress.org/branches/4.9@43169


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-04 01:49:49 +00:00
Sergey Biryukov
45cee39420 Customize: Correct closing tag in WP_Customize_Theme_Control::content_template().
Props itowhid06.
Merges [43166] to the 4.9 branch.
Fixes #43945.
Built from https://develop.svn.wordpress.org/branches/4.9@43167


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-04 01:05:26 +00:00
iandunn
c85cf4f9bc Post WordPress 4.9.6 Beta 1 version bump.
Built from https://develop.svn.wordpress.org/branches/4.9@43165


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-03 21:59:25 +00:00