<!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>[35848] trunk/src: Comments: The year is 2003.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35848">35848</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35848","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-12-10 03:05:34 +0000 (Thu, 10 Dec 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Comments: The year is 2003. Permalinks are a new thing and everyone's using Blogger. It's a time when opening a modal window in JavaScript to view a section of a website is not a completely weird thing, although many users get annoyed by it. b2 has recently become WordPress, and with it comes a bunch of functionality that will become stale over the next decade, remnants of simpler times.
Twelve years later, after no fewer than three themes have intentionally implemented popup comments in their functionality, before being abandoned for at least the last six years, we've reached a time where we can put this era behind us. A time when we can remove comment popup functionality from WordPress.
If this breaks the internet, I'll eat my hat.
Fixes <a href="https://core.trac.wordpress.org/ticket/28617">#28617</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunksrcwpincludestemplateloaderphp">trunk/src/wp-includes/template-loader.php</a></li>
<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesthemecompatcommentspopupphp">trunk/src/wp-includes/theme-compat/comments-popup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-admin/includes/file.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'editor-style-rtl.css' => __( 'Visual Editor RTL Stylesheet' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'rtl.css' => __( 'RTL Stylesheet' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments.php' => __( 'Comments' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comments-popup.php' => __( 'Popup Comments' ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'footer.php' => __( 'Theme Footer' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'header.php' => __( 'Theme Header' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sidebar.php' => __( 'Sidebar' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,6 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-layout.css' => __( 'Stylesheet' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-comments.php' => __( 'Comments Template' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-comments-popup.php' => __( 'Popup Comments Template' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comments-popup.php' => __( 'Popup Comments' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-admin/includes/update-core.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -700,6 +700,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/js/wp-fullscreen.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/tinymce/wp-mce-help.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/tinymce/plugins/wpfullscreen',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// 4.5
+'wp-includes/theme-compat/comments-popup.php',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludescanonicalphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-includes/canonical.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * prevents penalty for duplicate content by redirecting all incoming links to
</span><span class="cx" style="display: block; padding: 0 10px"> * one or the other.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Prevents redirection for feeds, trackbacks, searches, comment popup, and
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Prevents redirection for feeds, trackbacks, searches, and
</ins><span class="cx" style="display: block; padding: 0 10px"> * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7+,
</span><span class="cx" style="display: block; padding: 0 10px"> * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
</span><span class="cx" style="display: block; padding: 0 10px"> * requests.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || is_preview() || is_robots() || ( $is_IIS && !iis7_supports_permalinks() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || ( $is_IIS && !iis7_supports_permalinks() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-includes/class-wp.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'title', 'embed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'title', 'embed' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Private query variables.
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-includes/comment-template.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1388,48 +1388,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Display the JS popup script to show a comment.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Displays the link to the comments for the current post ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If the $file parameter is empty, then the home page is assumed. The defaults
- * for the window are 400px by 400px.
- *
- * For the comment link popup to work, this function has to be called or the
- * normal comment link will be assumed.
- *
- * @global string $wpcommentspopupfile The URL to use for the popup window.
- * @global int $wpcommentsjavascript Whether to use JavaScript. Set when function is called.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $width Optional. The width of the popup window. Default 400.
- * @param int $height Optional. The height of the popup window. Default 400.
- * @param string $file Optional. Sets the location of the popup window.
- */
-function comments_popup_script( $width = 400, $height = 400, $file = '' ) {
- global $wpcommentspopupfile, $wpcommentsjavascript;
-
- if (empty ($file)) {
- $wpcommentspopupfile = ''; // Use the index.
- } else {
- $wpcommentspopupfile = $file;
- }
-
- $wpcommentsjavascript = 1;
- $javascript = "<script type='text/javascript'>\nfunction wpopen (macagna) {\n window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";
- echo $javascript;
-}
-
-/**
- * Displays the link to the comments popup window for the current post ID.
- *
- * Is not meant to be displayed on single posts and pages. Should be used
- * on the lists of posts
- *
- * @global string $wpcommentspopupfile The URL to use for the popup window.
- * @global int $wpcommentsjavascript Whether to use JavaScript. Set when function is called.
- *
- * @since 0.71
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $zero Optional. String to display when no comments. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $one Optional. String to display when only one comment is available.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1440,8 +1402,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpcommentspopupfile, $wpcommentsjavascript;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $id = get_the_ID();
</span><span class="cx" style="display: block; padding: 0 10px"> $title = get_the_title();
</span><span class="cx" style="display: block; padding: 0 10px"> $number = get_comments_number( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1478,31 +1438,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<a href="';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wpcommentsjavascript ) {
- if ( empty( $wpcommentspopupfile ) )
- $home = home_url();
- else
- $home = get_option('siteurl');
- echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id;
- echo '" onclick="wpopen(this.href); return false"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $number ) {
+ $respond_link = get_permalink() . '#respond';
+ /**
+ * Filter the respond link when a post has no comments.
+ *
+ * @since 4.4.0
+ *
+ * @param string $respond_link The default response link.
+ * @param integer $id The post ID.
+ */
+ echo apply_filters( 'respond_link', $respond_link, $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // if comments_popup_script() is not in the template, display simple comment link
- if ( 0 == $number ) {
- $respond_link = get_permalink() . '#respond';
- /**
- * Filter the respond link when a post has no comments.
- *
- * @since 4.4.0
- *
- * @param string $respond_link The default response link.
- * @param integer $id The post ID.
- */
- echo apply_filters( 'respond_link', $respond_link, $id );
- } else {
- comments_link();
- }
- echo '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ comments_link();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '"';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $css_class ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo ' class="'.$css_class.'" ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1510,11 +1460,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes = '';
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filter the comments popup link attributes for display.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter the comments link attributes for display.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $attributes The comments popup link attributes. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $attributes The comments link attributes. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> echo apply_filters( 'comments_popup_link_attributes', $attributes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-includes/deprecated.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3635,3 +3635,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '4.4', 'force_ssl_admin()' );
</span><span class="cx" style="display: block; padding: 0 10px"> return force_ssl_admin( $force );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Retrieve path of comment popup template in current or parent template.
+ *
+ * @since 1.5.0
+ * @deprecated 4.5.0
+ *
+ * @return string Full path to comments popup template file.
+ */
+function get_comments_popup_template() {
+ _deprecated_function( __FUNCTION__, '4.5' );
+
+ return '';
+}
+
+/**
+ * Whether the current URL is within the comments popup window.
+ *
+ * @since 1.5.0
+ * @deprecated 4.5.0
+ *
+ * @return bool
+ */
+function is_comments_popup() {
+ _deprecated_function( __FUNCTION__, '4.5' );
+
+ return false;
+}
+
+/**
+ * Display the JS popup script to show a comment.
+ *
+ * @since 0.71
+ * @deprecated 4.5.0
+ */
+function comments_popup_script() {
+ _deprecated_function( __FUNCTION__, '4.5' );
+}
+
+/**
+ * Adds element attributes to open links in new windows.
+ *
+ * @since 0.71
+ * @deprecated 4.5.0
+ *
+ * @param string $text Content to replace links to open in a new window.
+ * @return string Content that has filtered links.
+ */
+function popuplinks( $text ) {
+ _deprecated_function( __FUNCTION__, '4.5' );
+ $text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
+ return $text;
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-includes/formatting.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2692,23 +2692,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Adds a element attributes to open links in new windows.
- *
- * Comment text in popup windows should be filtered through this. Right now it's
- * a moderately dumb function, ideally it would detect whether a target or rel
- * attribute was already there and adjust its actions accordingly.
- *
- * @since 0.71
- *
- * @param string $text Content to replace links to open in a new window.
- * @return string Content that has filtered links.
- */
-function popuplinks( $text ) {
- $text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
- return $text;
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Strips out all characters that are not allowable in an email.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-includes/query.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,26 +297,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whether the current URL is within the comments popup window.
- *
- * @since 1.5.0
- *
- * @global WP_Query $wp_query Global WP_Query instance.
- *
- * @return bool
- */
-function is_comments_popup() {
- global $wp_query;
-
- if ( ! isset( $wp_query ) ) {
- _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
- return false;
- }
-
- return $wp_query->is_comments_popup();
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Is the query for an existing date archive?
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,6 +842,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @link https://codex.wordpress.org/Function_Reference/WP_Query Codex page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.5.0 Removed the `$comments_popup` property.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Query {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1230,15 +1211,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $is_embed = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Set if query is within comments popup window.
- *
- * @since 1.5.0
- * @access public
- * @var bool
- */
- public $is_comments_popup = false;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Set if query is paged
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1389,7 +1361,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_trackback = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_home = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_404 = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->is_comments_popup = false;
</del><span class="cx" style="display: block; padding: 0 10px"> $this->is_paged = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_admin = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_attachment = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1441,6 +1412,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fills in the query variables, which do not exist within the parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.4.0 Removed the `comments_popup` public query variable.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $array Defined query variables.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1476,7 +1448,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> , 'feed'
</span><span class="cx" style="display: block; padding: 0 10px"> , 'tb'
</span><span class="cx" style="display: block; padding: 0 10px"> , 'paged'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- , 'comments_popup'
</del><span class="cx" style="display: block; padding: 0 10px"> , 'meta_key'
</span><span class="cx" style="display: block; padding: 0 10px"> , 'meta_value'
</span><span class="cx" style="display: block; padding: 0 10px"> , 'preview'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1511,6 +1482,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * array key to `$orderby`.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0 Introduced `$post_name__in` and `$title` parameters. `$s` was updated to support excluded
</span><span class="cx" style="display: block; padding: 0 10px"> * search terms, by prepending a hyphen.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.5.0 Removed the `$comments_popup` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $query {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1529,7 +1501,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $category_name Use category slug (not name, this or any children).
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $comments_per_page The number of comments to return per page.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'comments_per_page' option.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type int|string $comments_popup Whether the query is within the comments popup. Default empty.
</del><span class="cx" style="display: block; padding: 0 10px"> * @type array $date_query An associative array of WP_Date_Query arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * {@see WP_Date_Query::__construct()}
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $day Day of the month. Default empty. Accepts numbers 1-31.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1791,9 +1762,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_paged = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $qv['comments_popup'] )
- $this->is_comments_popup = true;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // if we're previewing inside the write screen
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' != $qv['preview'] )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_preview = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1811,7 +1779,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_comment_feed = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup || $this->is_robots ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_home = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Correct is_* for page_on_front and page_for_posts
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2771,9 +2739,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND $wpdb->posts.post_name IN ('" . implode( "' ,'", $q['post_name__in'] ) . "')";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval($q['comments_popup']) )
- $q['p'] = absint($q['comments_popup']);
-
</del><span class="cx" style="display: block; padding: 0 10px"> // If an attachment is requested by number, let it supersede any post number.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['attachment_id'] )
</span><span class="cx" style="display: block; padding: 0 10px"> $q['p'] = absint($q['attachment_id']);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4384,11 +4349,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Whether the current URL is within the comments popup window.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 4.5.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_comments_popup() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return (bool) $this->is_comments_popup;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_function( __FUNCTION__, '4.5' );
+
+ return false;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludestemplateloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/template-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template-loader.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-includes/template-loader.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( is_author() && $template = get_author_template() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( is_date() && $template = get_date_template() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( is_archive() && $template = get_archive_template() ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( is_comments_popup() && $template = get_comments_popup_template() ) :
</del><span class="cx" style="display: block; padding: 0 10px"> elseif ( is_paged() && $template = get_paged_template() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> $template = get_index_template();
</span></span></pre></div>
<a id="trunksrcwpincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-includes/template.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,31 +466,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieve path of comment popup template in current or parent template.
- *
- * Checks for comment popup template in current template, if it exists or in the
- * parent template.
- *
- * The template path is filterable via the dynamic {@see '$type_template'} hook,
- * e.g. 'commentspopup_template'.
- *
- * @since 1.5.0
- *
- * @see get_query_template()
- *
- * @return string Full path to comments popup template file.
- */
-function get_comments_popup_template() {
- $template = get_query_template( 'comments_popup', array( 'comments-popup.php' ) );
-
- // Backward compat code will be removed in a future release.
- if ('' == $template)
- $template = ABSPATH . WPINC . '/theme-compat/comments-popup.php';
-
- return $template;
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Retrieve the name of the highest priority template file that exists.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
</span></span></pre></div>
<a id="trunksrcwpincludesthemecompatcommentspopupphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/theme-compat/comments-popup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/comments-popup.php 2015-12-09 23:54:24 UTC (rev 35847)
+++ trunk/src/wp-includes/theme-compat/comments-popup.php 2015-12-10 03:05:34 UTC (rev 35848)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,133 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?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(
- /* translators: %s: template name */
- sprintf( __( 'Theme without %s' ), basename( __FILE__ ) ),
- '3.0',
- null,
- /* translators: %s: template name */
- sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) )
-);
-?><!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title><?php printf(__('%1$s - Comments on %2$s'), get_option('blogname'), the_title('','',false)); ?></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"><?php _e('Comments'); ?></h2>
-
-<p><a href="<?php echo esc_url( get_post_comments_feed_link($post->ID) ); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'); ?></a></p>
-
-<?php
-// this line is WordPress' motor, do not delete it.
-$commenter = wp_get_current_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(); ?> <?php printf(__('by %1$s — %2$s @ <a href="#comment-%3$s">%4$s</a>'), get_comment_author_link( $comment ), get_comment_date( '', $comment ), get_comment_ID(), get_comment_time()); ?></cite></p>
- </li>
-
-<?php } // end for each comment ?>
-</ol>
-<?php } else { // this is displayed if there are no comments so far ?>
- <p><?php _e('No comments yet.'); ?></p>
-<?php } ?>
-
-<?php if ( comments_open() ) { ?>
-<h2><?php _e('Leave a comment'); ?></h2>
-
-<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
-<?php if ( $user_ID ) : ?>
- <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out »</a>'), get_edit_user_link(), $user_identity, wp_logout_url(get_permalink())); ?></p>
-<?php else : ?>
- <p>
- <input type="text" name="author" id="author" class="textarea" value="<?php echo esc_attr( $commenter['comment_author'] ); ?>" size="28" tabindex="1" />
- <label for="author"><?php _e('Name'); ?></label>
- </p>
-
- <p>
- <input type="text" name="email" id="email" value="<?php echo esc_attr( $commenter['comment_author_email'] ); ?>" size="28" tabindex="2" />
- <label for="email"><?php _e('Email'); ?></label>
- </p>
-
- <p>
- <input type="text" name="url" id="url" value="<?php echo esc_attr( $commenter['comment_author_url'] ); ?>" size="28" tabindex="3" />
- <label for="url"><?php _e('<abbr title="Universal Resource Locator">URL</abbr>'); ?></label>
- </p>
-<?php endif; ?>
-
- <p>
- <label for="comment"><?php _e('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="<?php esc_attr_e('Say It!' ); ?>" />
- </p>
- <?php
- /** This filter is documented in wp-includes/comment-template.php */
- do_action( 'comment_form', $post->ID );
- ?>
-</form>
-<?php } else { // comments are closed ?>
-<p><?php _e('Sorry, the comment form is closed at this time.'); ?></p>
-<?php }
-} // end password check
-?>
-
-<div><strong><a href="javascript:window.close()"><?php _e('Close this window.'); ?></a></strong></div>
-
-<?php // if you delete this the sky will fall on your head
-endwhile; // have_posts()
-else: // have_posts()
-?>
-<p><?php _e('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><?php printf(__('Powered by <a href="%s" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a>'), 'https://wordpress.org/'); ?></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>
</del></span></pre>
</div>
</div>
</body>
</html>