<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[12548] trunk: Swap out ;; for ;.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12548">12548</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-26 16:53:17 +0000 (Sat, 26 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Swap out ;; for ;. Fixes <a href="http://trac.wordpress.org/ticket/11618">#11618</a> props demetris and nacin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclassftpphp">trunk/wp-admin/includes/class-ftp.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludespomopophp">trunk/wp-includes/pomo/po.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclassftpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-ftp.php (12547 => 12548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-ftp.php 2009-12-26 16:48:24 UTC (rev 12547)
+++ trunk/wp-admin/includes/class-ftp.php 2009-12-26 16:53:17 UTC (rev 12548)
</span><span class="lines">@@ -495,7 +495,7 @@
</span><span class="cx"> $this->_features=array();
</span><span class="cx"> foreach($f as $k=>$v) {
</span><span class="cx"> $v=explode(" ", trim($v));
</span><del>- $this->_features[array_shift($v)]=$v;;
</del><ins>+ $this->_features[array_shift($v)]=$v;
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (12547 => 12548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2009-12-26 16:48:24 UTC (rev 12547)
+++ trunk/wp-includes/link-template.php 2009-12-26 16:53:17 UTC (rev 12548)
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx"> break;
</span><span class="cx"> default :
</span><span class="cx"> if ( !current_user_can( 'edit_post', $post->ID ) )
</span><del>- return apply_filters( 'get_edit_post_link', '', $post->ID, $context );;
</del><ins>+ return apply_filters( 'get_edit_post_link', '', $post->ID, $context );
</ins><span class="cx"> $file = 'post';
</span><span class="cx"> $var = 'post';
</span><span class="cx"> break;
</span><span class="lines">@@ -777,7 +777,7 @@
</span><span class="cx"> break;
</span><span class="cx"> default :
</span><span class="cx"> if ( !current_user_can( 'edit_post', $post->ID ) )
</span><del>- return apply_filters( 'get_delete_post_link', '', $post->ID, $context );;
</del><ins>+ return apply_filters( 'get_delete_post_link', '', $post->ID, $context );
</ins><span class="cx"> $file = 'post';
</span><span class="cx"> $var = 'post';
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpincludespomopophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/po.php (12547 => 12548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/po.php 2009-12-26 16:48:24 UTC (rev 12547)
+++ trunk/wp-includes/pomo/po.php 2009-12-26 16:53:17 UTC (rev 12548)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> // add comment
</span><del>- $this->add_comment_to_entry($entry, $line);;
</del><ins>+ $this->add_comment_to_entry($entry, $line);
</ins><span class="cx"> } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
</span><span class="cx"> if ($is_final($context)) {
</span><span class="cx"> PO::read_line($f, 'put-back');
</span></span></pre>
</div>
</div>
</body>
</html>