<!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>[14365] trunk/wp-includes:
First pass of compatibility code for old themes which relied on using templates from the default theme without expressly identifying it as the parent theme
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14365">14365</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-05-03 09:57:24 +0000 (Mon, 03 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass of compatibility code for old themes which relied on using templates from the default theme without expressly identifying it as the parent theme.
Fixes <a href="http://trac.wordpress.org/ticket/12425">#12425</a> and <a href="http://trac.wordpress.org/ticket/13009">#13009</a>.
The fallback to these template files is now depreceated and will be removed in a future version.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/wp-includes/theme-compat/</li>
<li><a href="#trunkwpincludesthemecompatcommentspopupphp">trunk/wp-includes/theme-compat/comments-popup.php</a></li>
<li><a href="#trunkwpincludesthemecompatcommentsphp">trunk/wp-includes/theme-compat/comments.php</a></li>
<li><a href="#trunkwpincludesthemecompatfooterphp">trunk/wp-includes/theme-compat/footer.php</a></li>
<li><a href="#trunkwpincludesthemecompatheaderphp">trunk/wp-includes/theme-compat/header.php</a></li>
<li><a href="#trunkwpincludesthemecompatsidebarphp">trunk/wp-includes/theme-compat/sidebar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (14364 => 14365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-05-03 09:51:40 UTC (rev 14364)
+++ trunk/wp-includes/comment-template.php 2010-05-03 09:57:24 UTC (rev 14365)
</span><span class="lines">@@ -889,8 +889,8 @@
</span><span class="cx"> require( $include );
</span><span class="cx"> elseif ( file_exists( TEMPLATEPATH . $file ) )
</span><span class="cx"> require( TEMPLATEPATH . $file );
</span><del>- else
- require( get_theme_root() . '/'.WP_FALLBACK_THEME.'/comments.php');
</del><ins>+ else // Backward compat code will be removed in a future release
+ require( WPINC . '/theme-compat/comments.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (14364 => 14365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-05-03 09:51:40 UTC (rev 14364)
+++ trunk/wp-includes/general-template.php 2010-05-03 09:57:24 UTC (rev 14365)
</span><span class="lines">@@ -10,8 +10,7 @@
</span><span class="cx"> * Load header template.
</span><span class="cx"> *
</span><span class="cx"> * Includes the header template for a theme or if a name is specified then a
</span><del>- * specialised header will be included. If the theme contains no header.php file
- * then the header from the WP_FALLBACK_THEME theme will be included.
</del><ins>+ * specialised header will be included.
</ins><span class="cx"> *
</span><span class="cx"> * For the parameter, if the file is called "header-special.php" then specify
</span><span class="cx"> * "special".
</span><span class="lines">@@ -31,16 +30,16 @@
</span><span class="cx">
</span><span class="cx"> $templates[] = "header.php";
</span><span class="cx">
</span><ins>+ // Backward compat code will be removed in a future release
</ins><span class="cx"> if ('' == locate_template($templates, true))
</span><del>- load_template( get_theme_root() . '/'. WP_FALLBACK_THEME. '/header.php');
</del><ins>+ load_template( WPINC . '/theme-compat/header.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Load footer template.
</span><span class="cx"> *
</span><span class="cx"> * Includes the footer template for a theme or if a name is specified then a
</span><del>- * specialised footer will be included. If the theme contains no footer.php file
- * then the footer from the default theme will be included.
</del><ins>+ * specialised footer will be included.
</ins><span class="cx"> *
</span><span class="cx"> * For the parameter, if the file is called "footer-special.php" then specify
</span><span class="cx"> * "special".
</span><span class="lines">@@ -60,16 +59,16 @@
</span><span class="cx">
</span><span class="cx"> $templates[] = "footer.php";
</span><span class="cx">
</span><ins>+ // Backward compat code will be removed in a future release
</ins><span class="cx"> if ('' == locate_template($templates, true))
</span><del>- load_template( get_theme_root() . '/' . WP_FALLBACK_THEME . '/footer.php');
</del><ins>+ load_template( WPINC . '/theme-compat/footer.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Load sidebar template.
</span><span class="cx"> *
</span><span class="cx"> * Includes the sidebar template for a theme or if a name is specified then a
</span><del>- * specialised sidebar will be included. If the theme contains no sidebar.php
- * file then the sidebar from the default theme will be included.
</del><ins>+ * specialised sidebar will be included.
</ins><span class="cx"> *
</span><span class="cx"> * For the parameter, if the file is called "sidebar-special.php" then specify
</span><span class="cx"> * "special".
</span><span class="lines">@@ -89,8 +88,9 @@
</span><span class="cx">
</span><span class="cx"> $templates[] = "sidebar.php";
</span><span class="cx">
</span><ins>+ // Backward compat code will be removed in a future release
</ins><span class="cx"> if ('' == locate_template($templates, true))
</span><del>- load_template( get_theme_root() . '/' . WP_FALLBACK_THEME . '/sidebar.php');
</del><ins>+ load_template( WPINC . '/theme-compat/sidebar.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesthemecompatcommentspopupphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/theme-compat/comments-popup.php (0 => 14365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments-popup.php (rev 0)
+++ trunk/wp-includes/theme-compat/comments-popup.php 2010-05-03 09:57:24 UTC (rev 14365)
</span><span class="lines">@@ -0,0 +1,129 @@
</span><ins>+<?php
+/**
+ * @package WordPress
+ * @subpackage Theme_Compat
+ * @deprecated 3.0
+ *
+ * This file is here for Backwards compatibility with old themes and will be removed in a future version
+ *
+ */
+_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a comments-popup.php template in your theme.');
+?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title><?php echo get_option('blogname'); ?> - Comments on <?php the_title(); ?></title>
+
+ <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
+ <style type="text/css" media="screen">
+ @import url( <?php bloginfo('stylesheet_url'); ?> );
+ body { margin: 3px; }
+ </style>
+
+</head>
+<body id="commentspopup">
+
+<h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
+
+<?php
+/* Don't remove these lines. */
+add_filter('comment_text', 'popuplinks');
+if ( have_posts() ) :
+while ( have_posts() ) : the_post();
+?>
+<h2 id="comments">Comments</h2>
+
+<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
+
+<?php if ( pings_open() ) { ?>
+<p>The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
+<?php } ?>
+
+<?php
+// this line is WordPress' motor, do not delete it.
+$commenter = wp_get_current_commenter();
+extract($commenter);
+$comments = get_approved_comments($id);
+$post = get_post($id);
+if ( post_password_required($post) ) { // and it doesn't match the cookie
+ echo(get_the_password_form());
+} else { ?>
+
+<?php if ($comments) { ?>
+<ol id="commentlist">
+<?php foreach ($comments as $comment) { ?>
+ <li id="comment-<?php comment_ID() ?>">
+ <?php comment_text() ?>
+ <p><cite><?php comment_type('Comment', 'Trackback', 'Pingback'); ?> by <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
+ </li>
+
+<?php } // end for each comment ?>
+</ol>
+<?php } else { // this is displayed if there are no comments so far ?>
+ <p>No comments yet.</p>
+<?php } ?>
+
+<?php if ( comments_open() ) { ?>
+<h2>Leave a comment</h2>
+<p>Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
+
+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<?php if ( $user_ID ) : ?>
+ <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
+<?php else : ?>
+ <p>
+ <input type="text" name="author" id="author" class="textarea" value="<?php echo esc_attr($comment_author); ?>" size="28" tabindex="1" />
+ <label for="author">Name</label>
+ </p>
+
+ <p>
+ <input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="28" tabindex="2" />
+ <label for="email">E-mail</label>
+ </p>
+
+ <p>
+ <input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="28" tabindex="3" />
+ <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
+ </p>
+<?php endif; ?>
+
+ <p>
+ <label for="comment">Your Comment</label>
+ <br />
+ <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
+ </p>
+
+ <p>
+ <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
+ <input type="hidden" name="redirect_to" value="<?php echo esc_attr($_SERVER["REQUEST_URI"]); ?>" />
+ <input name="submit" type="submit" tabindex="5" value="Say It!" />
+ </p>
+ <?php do_action('comment_form', $post->ID); ?>
+</form>
+<?php } else { // comments are closed ?>
+<p>Sorry, the comment form is closed at this time.</p>
+<?php }
+} // end password check
+?>
+
+<div><strong><a href="javascript:window.close()">Close this window.</a></strong></div>
+
+<?php // if you delete this the sky will fall on your head
+endwhile; //endwhile have_posts()
+else: //have_posts()
+?>
+<p>Sorry, no posts matched your criteria.</p>
+<?php endif; ?>
+<!-- // this is just the end of the motor - don't touch that line either :) -->
+<?php //} ?>
+<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a></cite></p>
+<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
+<script type="text/javascript">
+<!--
+document.onkeypress = function esc(e) {
+ if(typeof(e) == "undefined") { e=event; }
+ if (e.keyCode == 27) { self.close(); }
+}
+// -->
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesthemecompatcommentsphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/theme-compat/comments.php (0 => 14365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments.php (rev 0)
+++ trunk/wp-includes/theme-compat/comments.php 2010-05-03 09:57:24 UTC (rev 14365)
</span><span class="lines">@@ -0,0 +1,101 @@
</span><ins>+<?php
+/**
+ * @package WordPress
+ * @subpackage Theme_Compat
+ * @deprecated 3.0
+ *
+ * This file is here for Backwards compatibility with old themes and will be removed in a future version
+ *
+ */
+_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a comments.php template in your theme.');
+
+// Do not delete these lines
+ if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+ die ('Please do not load this page directly. Thanks!');
+
+ if ( post_password_required() ) { ?>
+ <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
+ <?php
+ return;
+ }
+?>
+
+<!-- You can start editing here. -->
+
+<?php if ( have_comments() ) : ?>
+ <h3 id="comments"><?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
+
+ <div class="navigation">
+ <div class="alignleft"><?php previous_comments_link() ?></div>
+ <div class="alignright"><?php next_comments_link() ?></div>
+ </div>
+
+ <ol class="commentlist">
+ <?php wp_list_comments(); ?>
+ </ol>
+
+ <div class="navigation">
+ <div class="alignleft"><?php previous_comments_link() ?></div>
+ <div class="alignright"><?php next_comments_link() ?></div>
+ </div>
+ <?php else : // this is displayed if there are no comments so far ?>
+
+ <?php if ( comments_open() ) : ?>
+ <!-- If comments are open, but there are no comments. -->
+
+ <?php else : // comments are closed ?>
+ <!-- If comments are closed. -->
+ <p class="nocomments">Comments are closed.</p>
+
+ <?php endif; ?>
+<?php endif; ?>
+
+
+<?php if ( comments_open() ) : ?>
+
+<div id="respond">
+
+<h3><?php comment_form_title( 'Leave a Reply', 'Leave a Reply to %s' ); ?></h3>
+
+<div class="cancel-comment-reply">
+ <small><?php cancel_comment_reply_link(); ?></small>
+</div>
+
+<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
+<p>You must be <a href="<?php echo wp_login_url( get_permalink() ); ?>">logged in</a> to post a comment.</p>
+<?php else : ?>
+
+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+
+<?php if ( is_user_logged_in() ) : ?>
+
+<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
+
+<?php else : ?>
+
+<p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
+<label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
+
+<p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
+<label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
+
+<p><input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
+<label for="url"><small>Website</small></label></p>
+
+<?php endif; ?>
+
+<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
+
+<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
+
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
+<?php comment_id_fields(); ?>
+</p>
+<?php do_action('comment_form', $post->ID); ?>
+
+</form>
+
+<?php endif; // If registration required and not logged in ?>
+</div>
+
+<?php endif; // if you delete this the sky will fall on your head ?>
</ins></span></pre></div>
<a id="trunkwpincludesthemecompatfooterphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/theme-compat/footer.php (0 => 14365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/footer.php (rev 0)
+++ trunk/wp-includes/theme-compat/footer.php 2010-05-03 09:57:24 UTC (rev 14365)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<?php
+/**
+ * @package WordPress
+ * @subpackage Theme_Compat
+ * @deprecated 3.0
+ *
+ * This file is here for Backwards compatibility with old themes and will be removed in a future version
+ *
+ */
+_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a footer.php template in your theme.');
+?>
+
+<hr />
+<div id="footer" role="contentinfo">
+<!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. -->
+ <p>
+ <?php bloginfo('name'); ?> is proudly powered by
+ <a href="http://wordpress.org/">WordPress</a>
+ <br /><a href="<?php bloginfo('rss2_url'); ?>">Entries (RSS)</a>
+ and <a href="<?php bloginfo('comments_rss2_url'); ?>">Comments (RSS)</a>.
+ <!-- <?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds. -->
+ </p>
+</div>
+</div>
+
+<!-- Gorgeous design by Michael Heilemann - http://binarybonsai.com/kubrick/ -->
+<?php /* "Just what do you think you're doing Dave?" */ ?>
+
+ <?php wp_footer(); ?>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkwpincludesthemecompatheaderphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/theme-compat/header.php (0 => 14365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/header.php (rev 0)
+++ trunk/wp-includes/theme-compat/header.php 2010-05-03 09:57:24 UTC (rev 14365)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<?php
+/**
+ * @package WordPress
+ * @subpackage Theme_Compat
+ * @deprecated 3.0
+ *
+ * This file is here for Backwards compatibility with old themes and will be removed in a future version
+ *
+ */
+_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a header.php template in your theme.');
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+
+<head profile="http://gmpg.org/xfn/11">
+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
+
+<title><?php wp_title('&laquo;', true, 'right'); ?> <?php bloginfo('name'); ?></title>
+
+<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
+<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
+
+<style type="text/css" media="screen">
+
+<?php
+// Checks to see whether it needs a sidebar
+if ( empty($withcomments) && !is_single() ) {
+?>
+ #page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg-<?php bloginfo('text_direction'); ?>.jpg") repeat-y top; border: none; }
+<?php } else { // No sidebar ?>
+ #page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbgwide.jpg") repeat-y top; border: none; }
+<?php } ?>
+
+</style>
+
+<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
+
+<?php wp_head(); ?>
+</head>
+<body <?php body_class(); ?>>
+<div id="page">
+
+
+<div id="header" role="banner">
+ <div id="headerimg">
+ <h1><a href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a></h1>
+ <div class="description"><?php bloginfo('description'); ?></div>
+ </div>
+</div>
+<hr />
</ins></span></pre></div>
<a id="trunkwpincludesthemecompatsidebarphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/theme-compat/sidebar.php (0 => 14365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/sidebar.php (rev 0)
+++ trunk/wp-includes/theme-compat/sidebar.php 2010-05-03 09:57:24 UTC (rev 14365)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+<?php
+/**
+ * @package WordPress
+ * @subpackage Theme_Compat
+ * @deprecated 3.0
+ *
+ * This file is here for Backwards compatibility with old themes and will be removed in a future version
+ *
+ */
+_deprecated_file( 'Theme without ' . basename(__FILE__), '3.0', null, 'Please include a sidebar.php template in your theme.');
+?>
+ <div id="sidebar" role="complementary">
+ <ul>
+ <?php /* Widgetized sidebar, if you have the plugin installed. */
+ if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
+ <li>
+ <?php get_search_form(); ?>
+ </li>
+
+ <!-- Author information is disabled per default. Uncomment and fill in your details if you want to use it.
+ <li><h2>Author</h2>
+ <p>A little something about you, the author. Nothing lengthy, just an overview.</p>
+ </li>
+ -->
+
+ <?php if ( is_404() || is_category() || is_day() || is_month() ||
+ is_year() || is_search() || is_paged() ) {
+ ?> <li>
+
+ <?php /* If this is a 404 page */ if (is_404()) { ?>
+ <?php /* If this is a category archive */ } elseif (is_category()) { ?>
+ <p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
+
+ <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
+ for the day <?php the_time('l, F jS, Y'); ?>.</p>
+
+ <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
+ for <?php the_time('F, Y'); ?>.</p>
+
+ <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
+ for the year <?php the_time('Y'); ?>.</p>
+
+ <?php /* If this is a search result */ } elseif (is_search()) { ?>
+ <p>You have searched the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
+ for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
+
+ <?php /* If this set is paginated */ } elseif ( !empty($_GET['paged']) ) { ?>
+ <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives.</p>
+
+ <?php } ?>
+
+ </li>
+ <?php }?>
+ </ul>
+ <ul role="navigation">
+ <?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
+
+ <li><h2>Archives</h2>
+ <ul>
+ <?php wp_get_archives(array('type' => 'monthly')); ?>
+ </ul>
+ </li>
+
+ <?php wp_list_categories(array('show_count' => 1, 'title_li' => '<h2>Categories</h2>')); ?>
+ </ul>
+ <ul>
+ <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
+ <?php wp_list_bookmarks(); ?>
+
+ <li><h2>Meta</h2>
+ <ul>
+ <?php wp_register(); ?>
+ <li><?php wp_loginout(); ?></li>
+ <li><a href="http://validator.w3.org/check/referer" title="This page validates as XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a></li>
+ <li><a href="http://gmpg.org/xfn/"><abbr title="XHTML Friends Network">XFN</abbr></a></li>
+ <li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li>
+ <?php wp_meta(); ?>
+ </ul>
+ </li>
+ <?php } ?>
+
+ <?php endif; ?>
+ </ul>
+ </div>
+
</ins></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (14364 => 14365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-05-03 09:51:40 UTC (rev 14364)
+++ trunk/wp-includes/theme.php 2010-05-03 09:57:24 UTC (rev 14365)
</span><span class="lines">@@ -983,9 +983,7 @@
</span><span class="cx"> * Retrieve path of comment popup template in current or parent template.
</span><span class="cx"> *
</span><span class="cx"> * Checks for comment popup template in current template, if it exists or in the
</span><del>- * parent template. If it doesn't exist, then it retrieves the comment-popup.php
- * file from the WP_FALLBACK_THEME theme. The WP_FALLBACK_THEME theme must then exist for it to
- * work.
</del><ins>+ * parent template.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> * @uses apply_filters() Calls 'comments_popup_template' filter on path.
</span><span class="lines">@@ -994,8 +992,10 @@
</span><span class="cx"> */
</span><span class="cx"> function get_comments_popup_template() {
</span><span class="cx"> $template = locate_template(array("comments-popup.php"));
</span><ins>+
+ // Backward compat code will be removed in a future release
</ins><span class="cx"> if ('' == $template)
</span><del>- $template = get_theme_root() . '/' . WP_FALLBACK_THEME . '/comments-popup.php';
</del><ins>+ $template = WPINC . '/theme-compat/comments-popup.php';
</ins><span class="cx">
</span><span class="cx"> return apply_filters('comments_popup_template', $template);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>