<!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>[13747] trunk/wp-links-opml.php: Clean up OPML link export script.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13747">13747</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-18 08:39:01 +0000 (Thu, 18 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up OPML link export script.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwplinksopmlphp">trunk/wp-links-opml.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwplinksopmlphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-links-opml.php (13746 => 13747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-links-opml.php 2010-03-18 07:58:53 UTC (rev 13746)
+++ trunk/wp-links-opml.php 2010-03-18 08:39:01 UTC (rev 13747)
</span><span class="lines">@@ -12,54 +12,51 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><span class="cx">
</span><del>-if (empty($wp)) {
</del><ins>+if ( empty($wp) ) {
</ins><span class="cx"> require_once('./wp-load.php');
</span><span class="cx"> wp();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
</span><del>-$link_cat = $_GET['link_cat'];
-if ((empty ($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) {
- $link_cat = '';
-} else { // be safe
- $link_cat = '' . urldecode($link_cat) . '';
- $link_cat = intval($link_cat);
</del><ins>+$link_cat = '';
+if ( !empty($_GET['link_cat']) ) {
+ $link_cat = $_GET['link_cat'];
+ if ( !in_array($link_cat, array('all', '0')) )
+ $link_cat = absint( (string)urldecode($link_cat) );
</ins><span class="cx"> }
</span><del>-?><?php echo '<?xml version="1.0"?'.">\n"; ?>
</del><ins>+
+echo '<?xml version="1.0"?'.">\n";
+?>
</ins><span class="cx"> <opml version="1.0">
</span><span class="cx"> <head>
</span><del>- <title>Links for <?php echo esc_attr(get_bloginfo('name', 'display').$cat_name); ?></title>
</del><ins>+ <title><?php printf( __('Links for %s'), esc_attr(get_bloginfo('name', 'display')) ); ?></title>
</ins><span class="cx"> <dateCreated><?php echo gmdate("D, d M Y H:i:s"); ?> GMT</dateCreated>
</span><span class="cx"> <?php do_action('opml_head'); ?>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <?php
</span><del>-
-if (empty ($link_cat))
</del><ins>+if ( empty($link_cat) )
</ins><span class="cx"> $cats = get_categories(array('type' => 'link', 'hierarchical' => 0));
</span><span class="cx"> else
</span><span class="cx"> $cats = get_categories(array('type' => 'link', 'hierarchical' => 0, 'include' => $link_cat));
</span><span class="cx">
</span><del>-foreach ((array) $cats as $cat) {
</del><ins>+foreach ( (array)$cats as $cat ) :
</ins><span class="cx"> $catname = apply_filters('link_category', $cat->name);
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <outline type="category" title="<?php echo esc_attr($catname); ?>">
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> $bookmarks = get_bookmarks(array("category" => $cat->term_id));
</span><del>- foreach ((array) $bookmarks as $bookmark) {
- $title = esc_attr(apply_filters('link_title', $bookmark->link_name));
</del><ins>+ foreach ( (array)$bookmarks as $bookmark ) :
+ $title = apply_filters('link_title', $bookmark->link_name);
</ins><span class="cx"> ?>
</span><del>- <outline text="<?php echo $title; ?>" type="link" xmlUrl="<?php echo esc_attr($bookmark->link_rss); ?>" htmlUrl="<?php echo esc_attr($bookmark->link_url); ?>" updated="<?php if ('0000-00-00 00:00:00' != $bookmark->link_updated) echo $bookmark->link_updated; ?>" />
</del><ins>+ <outline text="<?php echo esc_attr($title); ?>" type="link" xmlUrl="<?php echo esc_attr($bookmark->link_rss); ?>" htmlUrl="<?php echo esc_attr($bookmark->link_url); ?>" updated="<?php if ('0000-00-00 00:00:00' != $bookmark->link_updated) echo $bookmark->link_updated; ?>" />
</ins><span class="cx"> <?php
</span><del>-
- }
</del><ins>+ endforeach; // $bookmarks
</ins><span class="cx"> ?>
</span><span class="cx"> </outline>
</span><span class="cx"> <?php
</span><del>-
-}
</del><ins>+endforeach; // $cats
</ins><span class="cx"> ?>
</span><span class="cx"> </body>
</span><span class="cx"> </opml>
</span></span></pre>
</div>
</div>
</body>
</html>