<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[11906] trunk/wp-includes/link-template.php:
  Fix Press This bookmarklet for Safari 4.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11906">11906</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-09-08 20:06:52 +0000 (Tue, 08 Sep 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix Press This bookmarklet for Safari 4. Props noel. fixes <a href="http://trac.wordpress.org/ticket/10749">#10749</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (11905 => 11906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php        2009-09-08 15:25:29 UTC (rev 11905)
+++ trunk/wp-includes/link-template.php        2009-09-08 20:06:52 UTC (rev 11906)
</span><span class="lines">@@ -1648,28 +1648,20 @@
</span><span class="cx">  */
</span><span class="cx"> function get_shortcut_link() {
</span><span class="cx">         $link = &quot;javascript:
</span><del>-                        var d=document,
-                        w=window,
-                        e=w.getSelection,
-                        k=d.getSelection,
</del><ins>+                        var d=document, 
+                        w=window, 
+                        e=w.getSelection, 
+                        k=d.getSelection, 
</ins><span class="cx">                         x=d.selection,
</span><span class="cx">                         s=(e?e():(k)?k():(x?x.createRange().text:0)),
</span><span class="cx">                         f='&quot; . admin_url('press-this.php') . &quot;',
</span><span class="cx">                         l=d.location,
</span><span class="cx">                         e=encodeURIComponent,
</span><del>-                        g=f+'?u='+e(l.href)+'&amp;t='+e(d.title)+'&amp;s='+e(s)+'&amp;v=2';
-                        function a(){
-                                if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=720,height=570')){
-                                        l.href=g;
-                                }
-                        }&quot;;
-                        if (strpos($_SERVER['HTTP_USER_AGENT'], 'Firefox') !== false)
-                                $link .= 'setTimeout(a,0);';
-                        else
-                                $link .= 'a();';
</del><ins>+                        u=f+'?u='+e(l.href)+'&amp;t='+e(d.title)+'&amp;s='+e(s)+'&amp;v=4';
+                        a=function(){if(!w.open(u,'t','toolbar=0,resizable=0,status=1,width=720,height=570'))l.href=u;};
+                        if (/Firefox/.test(navigator.userAgent)) setTimeout(a, 0); else a();
+                        void(0)&quot;;
</ins><span class="cx"> 
</span><del>-                        $link .= &quot;void(0);&quot;;
-
</del><span class="cx">         $link = str_replace(array(&quot;\r&quot;, &quot;\n&quot;, &quot;\t&quot;),  '', $link);
</span><span class="cx"> 
</span><span class="cx">         return apply_filters('shortcut_link', $link);
</span></span></pre>
</div>
</div>

</body>
</html>