<!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>[12705] trunk/wp-includes: Safely include class-json.php, class-simplepie.
php and class-snoopy.php, props alexkingorg, fixes #11827</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12705">12705</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2010-01-12 13:22:43 +0000 (Tue, 12 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Safely include class-json.php, class-simplepie.php and class-snoopy.php, props alexkingorg, fixes <a href="http://trac.wordpress.org/ticket/11827">#11827</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassjsonphp">trunk/wp-includes/class-json.php</a></li>
<li><a href="#trunkwpincludesclasssimplepiephp">trunk/wp-includes/class-simplepie.php</a></li>
<li><a href="#trunkwpincludesclasssnoopyphp">trunk/wp-includes/class-snoopy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassjsonphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-json.php (12704 => 12705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-json.php 2010-01-12 00:18:31 UTC (rev 12704)
+++ trunk/wp-includes/class-json.php 2010-01-12 13:22:43 UTC (rev 12705)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> <?php
</span><ins>+if ( !class_exists( 'Services_JSON' ) ) :
</ins><span class="cx"> /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
</span><span class="cx"> /**
</span><span class="cx"> * Converts to and from JSON format.
</span><span class="lines">@@ -858,3 +859,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+endif;
+?>
</ins></span></pre></div>
<a id="trunkwpincludesclasssimplepiephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-simplepie.php (12704 => 12705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-simplepie.php 2010-01-12 00:18:31 UTC (rev 12704)
+++ trunk/wp-includes/class-simplepie.php 2010-01-12 13:22:43 UTC (rev 12705)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> <?php
</span><ins>+if ( !class_exists( 'SimplePie' ) ) :
</ins><span class="cx"> /**
</span><span class="cx"> * SimplePie
</span><span class="cx"> *
</span><span class="lines">@@ -14997,5 +14998,5 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+endif;
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesclasssnoopyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-snoopy.php (12704 => 12705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-snoopy.php 2010-01-12 00:18:31 UTC (rev 12704)
+++ trunk/wp-includes/class-snoopy.php 2010-01-12 13:22:43 UTC (rev 12705)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?php
</span><del>-if ( !in_array('Snoopy', get_declared_classes() ) ) :
</del><ins>+if ( !class_exists( 'Snoopy' ) ) :
</ins><span class="cx"> /*************************************************
</span><span class="cx">
</span><span class="cx"> Snoopy - the PHP net client
</span></span></pre>
</div>
</div>
</body>
</html>