<!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>[31595] trunk/src: PressThis:</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 { 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="https://core.trac.wordpress.org/changeset/31595">31595</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31595","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-01 22:43:36 +0000 (Sun, 01 Mar 2015)</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'>PressThis:
- Simplify `getSuggestedContent()` and helpers. No need to override the global `data`.
- Replace the `press_this_source_string` and `press_this_source_link` filters with `press_this_suggested_html` that allows filtering of the link and the wrapper HTML tags.
See <a href="https://core.trac.wordpress.org/ticket/31373">#31373</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswppressthisphp">trunk/src/wp-admin/includes/class-wp-press-this.php</a></li>
<li><a href="#trunksrcwpadminjspressthisjs">trunk/src/wp-admin/js/press-this.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswppressthisphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-press-this.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-press-this.php       2015-03-01 19:10:58 UTC (rev 31594)
+++ trunk/src/wp-admin/includes/class-wp-press-this.php 2015-03-01 22:43:36 UTC (rev 31595)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array Site settings.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function site_settings() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $html = '<p class="press-this-suggested-source">' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
+                       ' <cite><a href="%1$s">%2$s</a></cite></p>';
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 return array(
</span><span class="cx" style="display: block; padding: 0 10px">                        // Used to trigger the bookmarklet update notice.
</span><span class="cx" style="display: block; padding: 0 10px">                        // Needs to be set here and in get_shortcut_link() in wp-includes/link-template.php.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,9 +44,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * @param bool $redir_in_parent Whether to redirect in parent window or not. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * @param bool false Whether to redirect in parent window or not. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'redir_in_parent' => apply_filters( 'press_this_redirect_in_parent', false ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'redirInParent' => apply_filters( 'press_this_redirect_in_parent', false ),
+
+                       /**
+                        * Filter the HTML for the Press This source attribution.
+                        *
+                        * @since 4.2.0
+                        *
+                        * @param string $html Default HTML, %1$s is link href, %2$s is link text.
+                        */
+                       'suggestedHTML' => apply_filters( 'press_this_suggested_html', $html ),
</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"> 
</span></span></pre></div>
<a id="trunksrcwpadminjspressthisjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/press-this.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/press-this.js       2015-03-01 19:10:58 UTC (rev 31594)
+++ trunk/src/wp-admin/js/press-this.js 2015-03-01 22:43:36 UTC (rev 31595)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,14 +100,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Gets the source page's canonical link, based on passed location and meta data.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param data object Usually WpPressThis_App.data
</del><span class="cx" style="display: block; padding: 0 10px">                  * @returns string Discovered canonical URL, or empty
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                function getCanonicalLink( data ) {
-                       if ( ! data || data.length ) {
-                               return '';
-                       }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         function getCanonicalLink() {
</ins><span class="cx" style="display: block; padding: 0 10px">                         var link = '';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( data._links ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,22 +123,17 @@
</span><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"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return decodeURI( link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return checkUrl( decodeURI( link ) );
</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">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Gets the source page's site name, based on passed meta data.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param data object Usually WpPressThis_App.data
</del><span class="cx" style="display: block; padding: 0 10px">                  * @returns string Discovered site name, or empty
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                function getSourceSiteName( data ) {
-                       if ( ! data || data.length ) {
-                               return '';
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         function getSourceSiteName() {
+                       var name = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        var name='';
-
</del><span class="cx" style="display: block; padding: 0 10px">                         if ( data._meta ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( data._meta['og:site_name'] && data._meta['og:site_name'].length ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        name = data._meta['og:site_name'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,27 +142,22 @@
</span><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"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return name.replace( /\\/g, '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return sanitizeText( name );
</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">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Gets the source page's title, based on passed title and meta data.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param data object Usually WpPressThis_App.data
</del><span class="cx" style="display: block; padding: 0 10px">                  * @returns string Discovered page title, or empty
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                function getSuggestedTitle( data ) {
-                       if ( ! data || data.length ) {
-                               return __( 'newPost' );
-                       }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         function getSuggestedTitle() {
</ins><span class="cx" style="display: block; padding: 0 10px">                         var title = '';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( data.t ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                title = data.t;
</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">-                        if ( ! title.length && data._meta ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! title && data._meta ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 if ( data._meta['twitter:title'] && data._meta['twitter:title'].length ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        title = data._meta['twitter:title'];
</span><span class="cx" style="display: block; padding: 0 10px">                                } else if ( data._meta['og:title'] && data._meta['og:title'].length ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,60 +167,51 @@
</span><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"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! title.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! title ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 title = __( 'newPost' );
</span><span class="cx" style="display: block; padding: 0 10px">                                hasEmptyTitleStr = true;
</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">-                        return title.replace( /\\/g, '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return sanitizeText( title );
</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">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Gets the source page's suggested content, based on passed data (description, selection, etc).
</span><span class="cx" style="display: block; padding: 0 10px">                 * Features a blockquoted excerpt, as well as content attribution, if any.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param data object Usually WpPressThis_App.data
</del><span class="cx" style="display: block; padding: 0 10px">                  * @returns string Discovered content, or empty
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                function getSuggestedContent( data ) {
-                       if ( ! data || data.length ) {
-                               return '';
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         function getSuggestedContent() {
+                       var content  = '',
+                               text     = '',
+                               title    = getSuggestedTitle(),
+                               url      = getCanonicalLink(),
+                               siteName = getSourceSiteName();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        var content   = '',
-                               title     = getSuggestedTitle( data ),
-                               url       = getCanonicalLink( data ),
-                               siteName  = getSourceSiteName( data );
-
</del><span class="cx" style="display: block; padding: 0 10px">                         if ( data.s && data.s.length ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                content = data.s;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         text = data.s;
</ins><span class="cx" style="display: block; padding: 0 10px">                         } else if ( data._meta ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( data._meta['twitter:description'] && data._meta['twitter:description'].length ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        content = data._meta['twitter:description'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 text = data._meta['twitter:description'];
</ins><span class="cx" style="display: block; padding: 0 10px">                                 } else if ( data._meta['og:description'] && data._meta['og:description'].length ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        content = data._meta['og:description'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 text = data._meta['og:description'];
</ins><span class="cx" style="display: block; padding: 0 10px">                                 } else if ( data._meta.description && data._meta.description.length ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        content = data._meta.description;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 text = data._meta.description;
</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"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Wrap suggested content in blockquote tag, if we have any.
-                       content = ( content.length ? '<blockquote class="press-this-suggested-content">' + sanitizeText( content ) + '</blockquote>' : '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( text ) {
+                               text = sanitizeText( text );
+                               // Wrap suggested content in blockquote tag.
+                               content = '<blockquote class="press-this-suggested-content">' + text + '</blockquote>';
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Add a source attribution if there is one available.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ( ( title.length && __( 'newPost' ) !== title ) || siteName.length ) && url.length ) {
-                               content += '<p class="press-this-suggested-source">';
-                               content += __( 'source' );
-                               content += ' <cite>';
-                               content += __( 'sourceLink').replace( '%1$s', encodeURI( url ) ).replace( '%2$s', sanitizeText( title || siteName ) );
-                               content += '</cite></p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( url && siteConfig.suggestedHTML && ( ( title && __( 'newPost' ) !== title ) || siteName ) ) {
+                               content += siteConfig.suggestedHTML.replace( '%1$s', encodeURI( url ) ).replace( '%2$s', ( title || siteName ) );
</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">-                        if ( ! content ) {
-                               content = '';
-                       }
-
-                       return content.replace( /\\/g, '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 return content || '';
</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">                /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,7 +448,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                renderError( response.data.errorMessage );
</span><span class="cx" style="display: block; padding: 0 10px">                                                hideSpinner();
</span><span class="cx" style="display: block; padding: 0 10px">                                        } else if ( response.data.redirect ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                if ( window.opener && siteConfig.redir_in_parent ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( window.opener && siteConfig.redirInParent ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         try {
</span><span class="cx" style="display: block; padding: 0 10px">                                                                window.opener.location.href = response.data.redirect;
</span><span class="cx" style="display: block; padding: 0 10px">                                                        } catch( er ) {}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,13 +490,10 @@
</span><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">                        if ( ! hasSetFocus ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Append to top of content on 1st media insert
-                               editor.setContent( newContent + editor.getContent() );
-                       } else {
-                               // Or add where the cursor was last positioned in TinyMCE
-                               editor.execCommand( 'mceInsertContent', false, newContent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         editor.focus();
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        editor.execCommand( 'mceInsertContent', false, newContent );
</ins><span class="cx" style="display: block; padding: 0 10px">                         hasSetFocus = true;
</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">@@ -673,7 +646,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        hasSetFocus = true;
</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">-
</del><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">                /**
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php   2015-03-01 19:10:58 UTC (rev 31594)
+++ trunk/src/wp-includes/script-loader.php     2015-03-01 22:43:36 UTC (rev 31595)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,23 +474,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $scripts->add( 'press-this', "/wp-admin/js/press-this$suffix.js", array( 'jquery', 'tags-box' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">                did_action( 'init' ) && $scripts->localize( 'press-this', 'pressThisL10n', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        /**
-                        * Filter the string displayed before the source attribution string in Press This.
-                        *
-                        * @since 4.2.0
-                        *
-                        * @param string $string Internationalized source string.
-                        */
-                       'source' => apply_filters( 'press_this_source_string', __( 'Source:' ) ),
-
-                       /**
-                        * Filter the HTML link format for the Press This source attribution, can control target, class, etc.
-                        *
-                        * @since 4.2.0
-                        *
-                        * @param string $link_format Link format, %1$s is link href, %2$s is link text.
-                        */
-                       'sourceLink' => apply_filters( 'press_this_source_link', '<a href="%1$s">%2$s</a>' ),
</del><span class="cx" style="display: block; padding: 0 10px">                         'newPost' => __( 'Title' ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'unexpectedError' => __( 'Sorry, but an unexpected error occurred.' ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
</span></span></pre>
</div>
</div>

</body>
</html>