<!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>[14151] trunk/wp-includes: Fix invalid paths in requires.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14151">14151</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-18 09:51:19 +0000 (Sun, 18 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix invalid paths in requires. See r14139. See <a href="http://trac.wordpress.org/ticket/12594">#12594</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescompatphp">trunk/wp-includes/compat.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescompatphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/compat.php (14150 => 14151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/compat.php 2010-04-18 09:44:07 UTC (rev 14150)
+++ trunk/wp-includes/compat.php 2010-04-18 09:51:19 UTC (rev 14151)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> global $wp_json;
</span><span class="cx">
</span><span class="cx"> if ( !is_a($wp_json, 'Services_JSON') ) {
</span><del>- require_once( './class-json.php' );
</del><ins>+ require_once( ABSPATH . WPINC . '/class-json.php' );
</ins><span class="cx"> $wp_json = new Services_JSON();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> global $wp_json;
</span><span class="cx">
</span><span class="cx"> if ( !is_a($wp_json, 'Services_JSON') ) {
</span><del>- require_once( './class-json.php' );
</del><ins>+ require_once( ABSPATH . WPINC . '/class-json.php' );
</ins><span class="cx"> $wp_json = new Services_JSON();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (14150 => 14151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-04-18 09:44:07 UTC (rev 14150)
+++ trunk/wp-includes/media.php 2010-04-18 09:51:19 UTC (rev 14151)
</span><span class="lines">@@ -1337,7 +1337,7 @@
</span><span class="cx"> * @return string The original URL on failure or the embed HTML on success.
</span><span class="cx"> */
</span><span class="cx"> function wp_oembed_get( $url, $args = '' ) {
</span><del>- require_once( './class-oembed.php' );
</del><ins>+ require_once( ABSPATH . WPINC . '/class-oembed.php' );
</ins><span class="cx"> $oembed = _wp_oembed_get_object();
</span><span class="cx"> return $oembed->get_html( $url, $args );
</span><span class="cx"> }
</span><span class="lines">@@ -1355,7 +1355,7 @@
</span><span class="cx"> * @param boolean $regex Whether the $format parameter is in a regex format.
</span><span class="cx"> */
</span><span class="cx"> function wp_oembed_add_provider( $format, $provider, $regex = false ) {
</span><del>- require_once( './class-oembed.php' );
</del><ins>+ require_once( ABSPATH . WPINC . '/class-oembed.php' );
</ins><span class="cx"> $oembed = _wp_oembed_get_object();
</span><span class="cx"> $oembed->providers[$format] = array( $provider, $regex );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>