Wpcom/shortcodes 17feb2017 #6440
Conversation
Fixes issue where embed scripts would not be included in `/sites/%s/embeds/render` endpoint since the endpoint logic assumes any dependent scripts are enqueued. Merges r136943-wpcom.
Merges r136446-wpcom.
georgestephanis
added
[Feature] Shortcodes / Embeds
[Status] Needs Review
|
If any further changes are added to this PR, please merge it unsquashed, for syncing the changes back to wpcom. |
modules/shortcodes/slideshare.php
Outdated
| return $player; | ||
| /** | ||
| * Filter the returned shortcode. | ||
| * |
There was a problem hiding this comment.
Could we add @module and @since parameters to this new filter?
There was a problem hiding this comment.
My plan was to add those in in a subsequent change -- I'd been thinking PR, but maybe it would be easier to just do this all in this PR and then resync to wpcom.
modules/shortcodes/slideshare.php
Outdated
| * | ||
| * @param string $player The iframe to return. | ||
| */ | ||
| return apply_filters( 'slideshare_shortcode', $player ); |
There was a problem hiding this comment.
It might also be useful to prefix the filter with jetpack_ to avoid conflicts with other Slideshare plugins. But I guess this is a bit outside of the scope of this PR, since the file uses non-prefixed functions already.
I could also see an additional $attr parameter, since it may be useful for 3rd parties trying to customize the player to know what options were provided by the author in the first place, without having to parse the final player string.
There was a problem hiding this comment.
There only seems to be one place wpcom-side where this filter is used, so it's probably changeable in a subsequent PR -- but for simplicity in sync sake, I'd prefer to merge it as is, and then do that one.
I'd be delighted to add $attr as well in a subsequent PR.
jeherve
added
[Status] In Progress
[Status] Needs Author Reply
When merging to WPCOM, be careful of responsive-videos.php which over there uses this filter. It is the only code to use it, though, that I could find.
|
@jeherve Can you re-review? ** DO NOT SQUASH THIS WHEN MERGING ** |
modules/shortcodes/slideshare.php
Outdated
| * | ||
| * @module shortcodes | ||
| * @since 4.8.0 |
There was a problem hiding this comment.
This will be 4.7.0 if we merge it before the 28th
There was a problem hiding this comment.
Drat! It was Core that's on the 4.7.x release, not us! Fixing!
modules/shortcodes/slideshare.php
Outdated
| * | ||
| * @param string $player The iframe to return. | ||
| */ |
There was a problem hiding this comment.
Let's add new param doc for $atts
dereksmart
added
[Status] Needs Review
|
Changes look good to me after minor docBlock updates |
jeherve
added
[Status] Ready to Merge
samhotchkiss
removed
the
[Status] Ready to Merge
* Changelog: update stable tag and move changelog to changelog.txt Also remove old releases from readme.txt to keep the changelog tab short. * Changelog: add #5883 Also update the filter's docblock to match new version. * Changelog: add #5938 * Changelog: add #6298 * Changelog: add #3405 * Changelog: add #5941 * Changelog: add #6239 * Changelog: add #6281 * Changelog: add #6303 * Changelog: add #6018 * Changelog: add #6300 * Changelog: add #6296 * Changelog: add #6130 * Changelog: add #6292 * Readme: remove extra "on". * Changelog: add #6307 * Changelog: add #3297 * Changelog: add #6275 * Changelog: add #6321 * Changelog: add #6297 * Readme: update the support forum link anchor. Anchor changed when WordPress.org forums were updated to bbPress 2 * Readme: update list of a12s, it wasn't up to date anymore! * Changelog: add #6338 * Changelog: add #6337 * Changelog: add #6335 * Changelog: add #6333 * Testing List: first version of the 4.7 testing list. * Changelog: add #6332 * Changelog: add #6325 * Changelog: add #6326 * Changelog: add #6339 * Changelog: add #6342 * Changelog: add #6343 * Changelog: add #6346 * Changelog: add #6347 * Changelog: add #6279 * Changelog: add #6306 * Changelog: add #6312 * Changelog: add #6316 * Changelog: add #6171 * Changelog: add #6317 * Changelog: add #6246 * Changelog: add #6263 * Changelog: add #4220 * Changelog: add #5888 * Changelog: add #3406 * Changelog: add #3637 * Changelog: add #6320 * Changelog: add #5992 * Changelog: add #6322 * Changelog: add #6324 * Changelog: add #6352 * Changelog: add #6355 * Changelog: add #6360 * Changelog: add #6362 * Changelog: add #6369, #6382 * Changelog: add #6370 * Changelog: add #6375 * Changelog: add #6383 * Changelog: add #6384 * Changelog: add #6386 * Changelog: add #6395 * Changelog: add #6403 * Changelog: add #6406 * Changelog: add #6418 * Changelog: add #6419 * Changelog: add #6434 * Changelog: add #6446 * Changelog: add #6006 * Changelog: add #6096 * Changelog: add #6399 * Changelog: fix typo. @see #6331 (comment) * Changelog: add #6440 * Changelog: add #6443 * Changelog: add #6445 * Changelog: add #6463 * Changelog: add #6468 * Changelog: add #6471 * Changelog: add #6474 * Changelog: add #6480 * Changelog: add #6497 * Changelog: add #6499 * Changelog: add #6514 * Changelog: add #6267 * Changelog: add #5940 * Changelog: add #6492 * Changelog: add #5281 * Changelog: add #6327 * Changelog: add #6451 * Changelog: add #6525 * Changelog: add #6530
Merges two changesets over from WPCOM to get two files back in sync.
First one tidies up how we're adding a script to the footer on the googleplus shortcode.
Second one just adds a filter.
Props @aduth @thomasguillot