<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[11586] sites/trunk/api.wordpress.org/public_html/dotorg/trac/oembed/index.php: Trac: oEmbed: Adjust the oEmbed for the new header.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/11586">11586</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/11586","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-02-21 06:34:52 +0000 (Mon, 21 Feb 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Trac: oEmbed: Adjust the oEmbed for the new header.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgtracoembedindexphp">sites/trunk/api.wordpress.org/public_html/dotorg/trac/oembed/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgtracoembedindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/dotorg/trac/oembed/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/dotorg/trac/oembed/index.php 2022-02-21 04:44:13 UTC (rev 11585)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/trac/oembed/index.php 2022-02-21 06:34:52 UTC (rev 11586)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,6 +45,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Unique ID for this instance of the iframe
</span><span class="cx" style="display: block; padding: 0 10px"> $id = sha1( $url . microtime() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $embed = [
+ 'version' => '1.0',
+ 'provider_name' => 'WordPress.org Trac',
+ 'provider_url' => $m['baseurl'],
+ 'title' => 'WordPress.org Trac',
+ 'type' => 'rich',
+ 'width' => 600,
+ 'height' => 300,
+ 'html' => '',
+ ];
+
+ // Default milestone embeds to 120px height.
+ if ( 'milestone' === $type ) {
+ $embed['height'] = 120;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $embed_url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => urlencode( $url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,9 +76,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $embed_url .= '#el=' . $id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<iframe sandbox="allow-scripts allow-top-navigation-by-user-activation" security="restricted" src="%s" id="%s" width="600" height="300" title="WordPress.org Trac" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" class="wp-embedded-content wporg-trac"></iframe>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<iframe sandbox="allow-scripts allow-top-navigation-by-user-activation" security="restricted" src="%s" id="%s" width="%d" height="%d" title="WordPress.org Trac" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" class="wp-embedded-content wporg-trac"></iframe>',
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( $embed_url ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( 'el-' . $id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( 'el-' . $id ),
+ esc_attr( $embed['width'] ),
+ esc_attr( $embed['height'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,22 +101,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $id ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $embed = [
- 'version' => '1.0',
- 'provider_name' => 'WordPress.org Trac',
- 'provider_url' => $m['baseurl'],
- 'title' => 'WordPress.org Trac',
- 'type' => 'rich',
- 'width' => 600,
- 'height' => 300,
- 'html' => $html,
- ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $embed['html'] = $html;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Default milestone embeds to 120px.
- if ( 'milestone' === $type ) {
- $embed['height'] = 120;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> echo wp_json_encode( $embed );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,15 +134,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // IDs of elements to remove
</span><span class="cx" style="display: block; padding: 0 10px"> $remove_elements = [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wporg-header', 'wporg-footer',
</del><span class="cx" style="display: block; padding: 0 10px"> 'headline', 'banner', 'mainnav',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ctxtnav', 'help', 'altlinks',
</span><span class="cx" style="display: block; padding: 0 10px"> 'prefs',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wporg-global-header-script-js',
+ 'wporg-global-header-script-js-extra',
+ 'wporg-global-header-footer-css',
</ins><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Tags to just strip out.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Tags, with optional class specification to just strip out.
</ins><span class="cx" style="display: block; padding: 0 10px"> $remove_tags = [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'form'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'form',
+ 'header.global-header',
+ 'footer.global-footer',
</ins><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Additional elements per type of page.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +178,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove any tags
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $remove_tags as $tag ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( $tag, $class ) = explode( '.', $tag, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $doc->getElementsByTagName( $tag ) as $el ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $class && ! str_contains( $el->getAttribute( 'class' ), $class ) ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $el->parentNode->removeChild( $el );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,6 +255,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> JS;
</span><span class="cx" style="display: block; padding: 0 10px"> $doc->getElementsByTagName( 'head' )[0]->appendChild( $doc->createElement( 'script', $js ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$css = <<<CSS
+html {
+ --wp-global-header-height: 0;
+ --wp-admin--admin-bar--height: 0;
+}
+CSS;
+$doc->getElementsByTagName( 'head' )[0]->appendChild( $doc->createElement( 'style', $css ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = $doc->saveHTML();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $cache_key, $data, 'trac-oembed', HOUR_IN_SECONDS );
</span></span></pre>
</div>
</div>
</body>
</html>