<!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>[28743] trunk/src/wp-admin/link-parse-opml.php: OPML:</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/28743">28743</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-11 19:30:26 +0000 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>OPML:
* Learn how OPML works, cry.
* Remove unused globals in `startElement()`
* Stop using variable variables in `startElement()`
Tested with the OPML importer plugin
See <a href="http://core.trac.wordpress.org/ticket/27881">#27881</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminlinkparseopmlphp">trunk/src/wp-admin/link-parse-opml.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminlinkparseopmlphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/link-parse-opml.php (28742 => 28743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/link-parse-opml.php 2014-06-11 18:55:00 UTC (rev 28742)
+++ trunk/src/wp-admin/link-parse-opml.php 2014-06-11 19:30:26 UTC (rev 28743)
</span><span class="lines">@@ -13,7 +13,8 @@
</span><span class="cx">
</span><span class="cx"> // columns we wish to find are: link_url, link_name, link_target, link_description
</span><span class="cx"> // we need to map XML attribute names to our columns
</span><del>-$opml_map = array('URL' => 'link_url',
</del><ins>+$opml_map = array(
+ 'URL' => 'link_url',
</ins><span class="cx"> 'HTMLURL' => 'link_url',
</span><span class="cx"> 'TEXT' => 'link_name',
</span><span class="cx"> 'TITLE' => 'link_name',
</span><span class="lines">@@ -44,24 +45,29 @@
</span><span class="cx"> * @param array $attrs XML element attributes.
</span><span class="cx"> */
</span><span class="cx"> function startElement($parser, $tagName, $attrs) {
</span><del>- global $updated_timestamp, $all_links, $map;
</del><span class="cx"> global $names, $urls, $targets, $descriptions, $feeds;
</span><span class="cx">
</span><del>- if ($tagName == 'OUTLINE') {
- foreach (array_keys($map) as $key) {
- if (isset($attrs[$key])) {
- $$map[$key] = $attrs[$key];
- }
</del><ins>+ if ( 'OUTLINE' === $tagName ) {
+ $name = '';
+ if ( isset( $attrs['TEXT'] ) ) {
+ $name = $attrs['TEXT'];
</ins><span class="cx"> }
</span><del>-
- //echo("got data: link_url = [$link_url], link_name = [$link_name], link_target = [$link_target], link_description = [$link_description]<br />\n");
-
</del><ins>+ if ( isset( $attrs['TITLE'] ) ) {
+ $name = $attrs['TITLE'];
+ }
+ $url = '';
+ if ( isset( $attrs['URL'] ) ) {
+ $url = $attrs['URL'];
+ }
+ if ( isset( $attrs['HTMLURL'] ) ) {
+ $url = $attrs['HTMLURL'];
+ }
</ins><span class="cx"> // save the data away.
</span><del>- $names[] = $link_name;
- $urls[] = $link_url;
- $targets[] = $link_target;
- $feeds[] = $link_rss;
- $descriptions[] = $link_description;
</del><ins>+ $names[] = $name;
+ $urls[] = $url;
+ $targets[] = isset( $attrs['TARGET'] ) ? $attrs['TARGET'] : '';
+ $feeds[] = isset( $attrs['XMLURL'] ) ? $attrs['XMLURL'] : '';
+ $descriptions[] = isset( $attrs['DESCRIPTION'] ) ? $attrs['DESCRIPTION'] : '';
</ins><span class="cx"> } // end if outline
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>