<!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>[28472] trunk/src/wp-includes/pomo/mo.php: Eliminate the use of `extract()` in `MO::import_from_reader()`.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28472">28472</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-17 17:20:26 +0000 (Sat, 17 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate the use of `extract()` in `MO::import_from_reader()`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespomomophp">trunk/src/wp-includes/pomo/mo.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespomomophp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/pomo/mo.php (28471 => 28472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/pomo/mo.php 2014-05-17 17:11:23 UTC (rev 28471)
+++ trunk/src/wp-includes/pomo/mo.php 2014-05-17 17:20:26 UTC (rev 28472)
</span><span class="lines">@@ -155,46 +155,49 @@
</span><span class="cx"> if (!is_array($header))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- extract( $header );
-
</del><span class="cx"> // support revision 0 of MO format specs, only
</span><del>- if ($revision != 0)
</del><ins>+ if ( $header['revision'] != 0 ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // seek to data blocks
</span><del>- $reader->seekto($originals_lenghts_addr);
</del><ins>+ $reader->seekto( $header['originals_lenghts_addr'] );
</ins><span class="cx">
</span><span class="cx"> // read originals' indices
</span><del>- $originals_lengths_length = $translations_lenghts_addr - $originals_lenghts_addr;
- if ( $originals_lengths_length != $total * 8 )
</del><ins>+ $originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
+ if ( $originals_lengths_length != $header['total'] * 8 ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $originals = $reader->read($originals_lengths_length);
</span><del>- if ( $reader->strlen( $originals ) != $originals_lengths_length )
</del><ins>+ if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // read translations' indices
</span><del>- $translations_lenghts_length = $hash_addr - $translations_lenghts_addr;
- if ( $translations_lenghts_length != $total * 8 )
</del><ins>+ $translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
+ if ( $translations_lenghts_length != $header['total'] * 8 ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $translations = $reader->read($translations_lenghts_length);
</span><del>- if ( $reader->strlen( $translations ) != $translations_lenghts_length )
</del><ins>+ if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // transform raw data into set of indices
</span><span class="cx"> $originals = $reader->str_split( $originals, 8 );
</span><span class="cx"> $translations = $reader->str_split( $translations, 8 );
</span><span class="cx">
</span><span class="cx"> // skip hash table
</span><del>- $strings_addr = $hash_addr + $hash_length * 4;
</del><ins>+ $strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
</ins><span class="cx">
</span><span class="cx"> $reader->seekto($strings_addr);
</span><span class="cx">
</span><span class="cx"> $strings = $reader->read_all();
</span><span class="cx"> $reader->close();
</span><span class="cx">
</span><del>- for ( $i = 0; $i < $total; $i++ ) {
</del><ins>+ for ( $i = 0; $i < $header['total']; $i++ ) {
</ins><span class="cx"> $o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
</span><span class="cx"> $t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
</span><span class="cx"> if ( !$o || !$t ) return false;
</span></span></pre>
</div>
</div>
</body>
</html>