<!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>[35714] trunk/src/wp-includes/pomo: Merge the changes to GlotPress's POMO from upstream to WordPress's copy.</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/35714">35714</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/35714","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>2015-11-20 04:33:12 +0000 (Fri, 20 Nov 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'>Merge the changes to GlotPress's POMO from upstream to WordPress's copy.
Fixes <a href="https://core.trac.wordpress.org/ticket/34748">#34748</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespomoentryphp">trunk/src/wp-includes/pomo/entry.php</a></li>
<li><a href="#trunksrcwpincludespomomophp">trunk/src/wp-includes/pomo/mo.php</a></li>
<li><a href="#trunksrcwpincludespomopophp">trunk/src/wp-includes/pomo/po.php</a></li>
<li><a href="#trunksrcwpincludespomostreamsphp">trunk/src/wp-includes/pomo/streams.php</a></li>
<li><a href="#trunksrcwpincludespomotranslationsphp">trunk/src/wp-includes/pomo/translations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespomoentryphp"></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/pomo/entry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/entry.php 2015-11-20 03:31:17 UTC (rev 35713)
+++ trunk/src/wp-includes/pomo/entry.php 2015-11-20 04:33:12 UTC (rev 35714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Contains Translation_Entry class
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version $Id: entry.php 718 2012-10-31 00:32:02Z nbachiyski $
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version $Id: entry.php 1157 2015-11-20 04:30:11Z dd32 $
</ins><span class="cx" style="display: block; padding: 0 10px"> * @package pomo
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage entry
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($args as $varname => $value) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->$varname = $value;
</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 (isset($args['plural'])) $this->is_plural = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (isset($args['plural']) && $args['plural']) $this->is_plural = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> if (!is_array($this->translations)) $this->translations = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (!is_array($this->references)) $this->references = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (!is_array($this->flags)) $this->flags = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,10 +68,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|bool the key or false if the entry is empty
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (is_null($this->singular)) return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null === $this->singular || '' === $this->singular ) return false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepend context and EOT, like in MO files
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = !$this->context? $this->singular : $this->context.chr(4).$this->singular;
</ins><span class="cx" style="display: block; padding: 0 10px"> // Standardize on \n line endings
</span><span class="cx" style="display: block; padding: 0 10px"> $key = str_replace( array( "\r\n", "\r" ), "\n", $key );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludespomomophp"></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/pomo/mo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/mo.php 2015-11-20 03:31:17 UTC (rev 35713)
+++ trunk/src/wp-includes/pomo/mo.php 2015-11-20 04:33:12 UTC (rev 35714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Class for working with MO files
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version $Id: mo.php 718 2012-10-31 00:32:02Z nbachiyski $
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version $Id: mo.php 1157 2015-11-20 04:30:11Z dd32 $
</ins><span class="cx" style="display: block; padding: 0 10px"> * @package pomo
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage mo
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //TODO: warnings for control characters
</span><span class="cx" style="display: block; padding: 0 10px"> $exported = $entry->singular;
</span><span class="cx" style="display: block; padding: 0 10px"> if ($entry->is_plural) $exported .= chr(0).$entry->plural;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($entry->context) $exported = $entry->context . chr(4) . $exported;
</ins><span class="cx" style="display: block; padding: 0 10px"> return $exported;
</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">@@ -134,7 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function export_translations($entry) {
</span><span class="cx" style="display: block; padding: 0 10px"> //TODO: warnings for control characters
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return implode(chr(0), $entry->translations);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $entry->is_plural ? implode(chr(0), $entry->translations) : $entry->translations[0];
</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="trunksrcwpincludespomopophp"></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/pomo/po.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/po.php 2015-11-20 03:31:17 UTC (rev 35713)
+++ trunk/src/wp-includes/pomo/po.php 2015-11-20 04:33:12 UTC (rev 35714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,14 +2,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Class for working with PO files
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version $Id: po.php 718 2012-10-31 00:32:02Z nbachiyski $
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version $Id: po.php 1158 2015-11-20 04:31:23Z dd32 $
</ins><span class="cx" style="display: block; padding: 0 10px"> * @package pomo
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage po
</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"> require_once dirname(__FILE__) . '/translations.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define('PO_MAX_LINE_LEN', 79);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! defined( 'PO_MAX_LINE_LEN' ) ) {
+ define('PO_MAX_LINE_LEN', 79);
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ini_set('auto_detect_line_endings', 1);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $string the string to format
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string the poified string
</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 poify($string) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function poify($string) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $quote = '"';
</span><span class="cx" style="display: block; padding: 0 10px"> $slash = '\\';
</span><span class="cx" style="display: block; padding: 0 10px"> $newline = "\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,8 +130,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $string PO-formatted string
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string enascaped string
</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 unpoify($string) {
- $escapes = array('t' => "\t", 'n' => "\n", '\\' => '\\');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function unpoify($string) {
+ $escapes = array('t' => "\t", 'n' => "\n", 'r' => "\r", '\\' => '\\');
</ins><span class="cx" style="display: block; padding: 0 10px"> $lines = array_map('trim', explode("\n", $string));
</span><span class="cx" style="display: block; padding: 0 10px"> $lines = array_map(array('PO', 'trim_quotes'), $lines);
</span><span class="cx" style="display: block; padding: 0 10px"> $unpoified = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,6 +151,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"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Standardise the line endings on imported content, technically PO files shouldn't contain \r
+ $unpoified = str_replace( array( "\r\n", "\r" ), "\n", $unpoified );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $unpoified;
</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">@@ -160,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $string prepend lines in this string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $with prepend lines with this string
</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 prepend_each_line($string, $with) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function prepend_each_line($string, $with) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $php_with = var_export($with, true);
</span><span class="cx" style="display: block; padding: 0 10px"> $lines = explode("\n", $string);
</span><span class="cx" style="display: block; padding: 0 10px"> // do not prepend the string on the last empty line, artefact by explode
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $char character to denote a special PO comment,
</span><span class="cx" style="display: block; padding: 0 10px"> * like :, default is a space
</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 comment_block($text, $char=' ') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function comment_block($text, $char=' ') {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = wordwrap($text, PO_MAX_LINE_LEN - 3);
</span><span class="cx" style="display: block; padding: 0 10px"> return PO::prepend_each_line($text, "#$char ");
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,28 +199,59 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false|string PO-style formatted string for the entry or
</span><span class="cx" style="display: block; padding: 0 10px"> * false if the entry is 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 export_entry(&$entry) {
- if (is_null($entry->singular)) return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function export_entry(&$entry) {
+ if ( null === $entry->singular || '' === $entry->singular ) return false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
</span><span class="cx" style="display: block; padding: 0 10px"> if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
</span><span class="cx" style="display: block; padding: 0 10px"> if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
</span><span class="cx" style="display: block; padding: 0 10px"> if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!is_null($entry->context)) $po[] = 'msgctxt '.PO::poify($entry->context);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context);
</ins><span class="cx" style="display: block; padding: 0 10px"> $po[] = 'msgid '.PO::poify($entry->singular);
</span><span class="cx" style="display: block; padding: 0 10px"> if (!$entry->is_plural) {
</span><span class="cx" style="display: block; padding: 0 10px"> $translation = empty($entry->translations)? '' : $entry->translations[0];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation = PO::match_begin_and_end_newlines( $translation, $entry->singular );
</ins><span class="cx" style="display: block; padding: 0 10px"> $po[] = 'msgstr '.PO::poify($translation);
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $po[] = 'msgid_plural '.PO::poify($entry->plural);
</span><span class="cx" style="display: block; padding: 0 10px"> $translations = empty($entry->translations)? array('', '') : $entry->translations;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach($translations as $i => $translation) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation = PO::match_begin_and_end_newlines( $translation, $entry->plural );
</ins><span class="cx" style="display: block; padding: 0 10px"> $po[] = "msgstr[$i] ".PO::poify($translation);
</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"> return implode("\n", $po);
</span><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">+ public static function match_begin_and_end_newlines( $translation, $original ) {
+ if ( '' === $translation ) {
+ return $translation;
+ }
+
+ $original_begin = "\n" === substr( $original, 0, 1 );
+ $original_end = "\n" === substr( $original, -1 );
+ $translation_begin = "\n" === substr( $translation, 0, 1 );
+ $translation_end = "\n" === substr( $translation, -1 );
+
+ if ( $original_begin ) {
+ if ( ! $translation_begin ) {
+ $translation = "\n" . $translation;
+ }
+ } elseif ( $translation_begin ) {
+ $translation = ltrim( $translation, "\n" );
+ }
+
+ if ( $original_end ) {
+ if ( ! $translation_end ) {
+ $translation .= "\n";
+ }
+ } elseif ( $translation_end ) {
+ $translation = rtrim( $translation, "\n" );
+ }
+
+ return $translation;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $filename
</span><span class="cx" style="display: block; padding: 0 10px"> * @return boolean
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $s
</span><span class="cx" style="display: block; padding: 0 10px"> * @return sring
</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 trim_quotes($s) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function trim_quotes($s) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
</span><span class="cx" style="display: block; padding: 0 10px"> return $s;
</span></span></pre></div>
<a id="trunksrcwpincludespomostreamsphp"></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/pomo/streams.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/streams.php 2015-11-20 03:31:17 UTC (rev 35713)
+++ trunk/src/wp-includes/pomo/streams.php 2015-11-20 04:33:12 UTC (rev 35714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Classes, which help reading streams of data from files.
</span><span class="cx" style="display: block; padding: 0 10px"> * Based on the classes from Danilo Segan <danilo@kvota.net>
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version $Id: streams.php 718 2012-10-31 00:32:02Z nbachiyski $
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version $Id: streams.php 1157 2015-11-20 04:30:11Z dd32 $
</ins><span class="cx" style="display: block; padding: 0 10px"> * @package pomo
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage streams
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludespomotranslationsphp"></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/pomo/translations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/translations.php 2015-11-20 03:31:17 UTC (rev 35713)
+++ trunk/src/wp-includes/pomo/translations.php 2015-11-20 04:33:12 UTC (rev 35714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Class for a set of entries for translation and their associated headers
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version $Id: translations.php 718 2012-10-31 00:32:02Z nbachiyski $
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version $Id: translations.php 1157 2015-11-20 04:30:11Z dd32 $
</ins><span class="cx" style="display: block; padding: 0 10px"> * @package pomo
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage translations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>