<!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>[29044] trunk/src: Revert [28563].</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/29044">29044</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-09 18:06:54 +0000 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://core.trac.wordpress.org/changeset/28563">[28563]</a>. See <a href="http://core.trac.wordpress.org/ticket/18298">#18298</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludesdefaultconstantsphp">trunk/src/wp-includes/default-constants.php</a></li>
<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/comment-template.php (29043 => 29044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/comment-template.php 2014-07-09 18:05:00 UTC (rev 29043)
+++ trunk/src/wp-includes/comment-template.php 2014-07-09 18:06:54 UTC (rev 29044)
</span><span class="lines">@@ -1063,7 +1063,7 @@
</span><span class="cx"> * and the post ID respectively.
</span><span class="cx"> *
</span><span class="cx"> * The $file path is passed through a filter hook called, 'comments_template'
</span><del>- * which includes the template path and $file combined. Tries the $filtered path
</del><ins>+ * which includes the TEMPLATEPATH and $file combined. Tries the $filtered path
</ins><span class="cx"> * first and if it fails it will require the default comment template from the
</span><span class="cx"> * default theme. If either does not exist, then the WordPress process will be
</span><span class="cx"> * halted. It is advised for that reason, that the default theme is not deleted.
</span><span class="lines">@@ -1148,7 +1148,7 @@
</span><span class="cx"> if ( !defined('COMMENTS_TEMPLATE') )
</span><span class="cx"> define('COMMENTS_TEMPLATE', true);
</span><span class="cx">
</span><del>- $theme_template = get_stylesheet_directory() . $file;
</del><ins>+ $theme_template = STYLESHEETPATH . $file;
</ins><span class="cx"> /**
</span><span class="cx"> * Filter the path to the theme template file used for the comments template.
</span><span class="cx"> *
</span><span class="lines">@@ -1159,8 +1159,8 @@
</span><span class="cx"> $include = apply_filters( 'comments_template', $theme_template );
</span><span class="cx"> if ( file_exists( $include ) )
</span><span class="cx"> require( $include );
</span><del>- elseif ( file_exists( get_template_directory() . $file ) )
- require( get_template_directory() . $file );
</del><ins>+ elseif ( file_exists( TEMPLATEPATH . $file ) )
+ require( TEMPLATEPATH . $file );
</ins><span class="cx"> else // Backward compat code will be removed in a future release
</span><span class="cx"> require( ABSPATH . WPINC . '/theme-compat/comments.php');
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/default-constants.php (29043 => 29044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/default-constants.php 2014-07-09 18:05:00 UTC (rev 29043)
+++ trunk/src/wp-includes/default-constants.php 2014-07-09 18:06:54 UTC (rev 29044)
</span><span class="lines">@@ -302,16 +302,12 @@
</span><span class="cx"> /**
</span><span class="cx"> * Filesystem path to the current active template directory
</span><span class="cx"> * @since 1.5.0
</span><del>- * @deprecated 4.0.0
- * @deprecated Use get_template_directory()
</del><span class="cx"> */
</span><span class="cx"> define('TEMPLATEPATH', get_template_directory());
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filesystem path to the current active template stylesheet directory
</span><span class="cx"> * @since 2.1.0
</span><del>- * @deprecated 4.0.0
- * @deprecated Use get_stylesheet_directory()
</del><span class="cx"> */
</span><span class="cx"> define('STYLESHEETPATH', get_stylesheet_directory());
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/template.php (29043 => 29044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/template.php 2014-07-09 18:05:00 UTC (rev 29043)
+++ trunk/src/wp-includes/template.php 2014-07-09 18:06:54 UTC (rev 29044)
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve the name of the highest priority template file that exists.
</span><span class="cx"> *
</span><del>- * Searches in the stylesheet path before template path so that themes which
</del><ins>+ * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
</ins><span class="cx"> * inherit from a parent theme can just overload one file.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="lines">@@ -464,11 +464,11 @@
</span><span class="cx"> foreach ( (array) $template_names as $template_name ) {
</span><span class="cx"> if ( !$template_name )
</span><span class="cx"> continue;
</span><del>- if ( file_exists( get_stylesheet_directory() . '/' . $template_name ) ) {
- $located = get_stylesheet_directory() . '/' . $template_name;
</del><ins>+ if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
+ $located = STYLESHEETPATH . '/' . $template_name;
</ins><span class="cx"> break;
</span><del>- } else if ( file_exists( get_template_directory() . '/' . $template_name ) ) {
- $located = get_template_directory() . '/' . $template_name;
</del><ins>+ } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
+ $located = TEMPLATEPATH . '/' . $template_name;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/theme.php (29043 => 29044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/theme.php 2014-07-09 18:05:00 UTC (rev 29043)
+++ trunk/src/wp-includes/theme.php 2014-07-09 18:06:54 UTC (rev 29044)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> * @return bool true if a child theme is in use, false otherwise.
</span><span class="cx"> **/
</span><span class="cx"> function is_child_theme() {
</span><del>- return get_template_directory() !== get_stylesheet_directory();
</del><ins>+ return ( TEMPLATEPATH !== STYLESHEETPATH );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-settings.php (29043 => 29044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-settings.php 2014-07-09 18:05:00 UTC (rev 29043)
+++ trunk/src/wp-settings.php 2014-07-09 18:06:54 UTC (rev 29044)
</span><span class="lines">@@ -322,12 +322,10 @@
</span><span class="cx">
</span><span class="cx"> // Load the functions for the active theme, for both parent and child theme if applicable.
</span><span class="cx"> if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
</span><del>- if ( is_child_theme() && file_exists( get_stylesheet_directory() . '/functions.php' ) ) {
- include get_stylesheet_directory() . '/functions.php';
- }
- if ( file_exists( get_template_directory() . '/functions.php' ) ) {
- include get_template_directory() . '/functions.php';
- }
</del><ins>+ if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
+ include( STYLESHEETPATH . '/functions.php' );
+ if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
+ include( TEMPLATEPATH . '/functions.php' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>