<!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>[12105] trunk/wp-includes/post-template.php:
Remove unused vars in get_the_content and wp_link_pages, props filosofo,
fixes #11028</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12105">12105</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-10-25 20:44:35 +0000 (Sun, 25 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused vars in get_the_content and wp_link_pages, props filosofo, fixes <a href="http://trac.wordpress.org/ticket/11028">#11028</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (12104 => 12105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2009-10-25 17:30:58 UTC (rev 12104)
+++ trunk/wp-includes/post-template.php 2009-10-25 20:44:35 UTC (rev 12105)
</span><span class="lines">@@ -160,10 +160,9 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $more_link_text Optional. Content for when there is more text.
</span><span class="cx"> * @param string $stripteaser Optional. Teaser content before the more text.
</span><del>- * @param string $more_file Optional. Not used.
</del><span class="cx"> */
</span><del>-function the_content($more_link_text = null, $stripteaser = 0, $more_file = '') {
- $content = get_the_content($more_link_text, $stripteaser, $more_file);
</del><ins>+function the_content($more_link_text = null, $stripteaser = 0) {
+ $content = get_the_content($more_link_text, $stripteaser);
</ins><span class="cx"> $content = apply_filters('the_content', $content);
</span><span class="cx"> $content = str_replace(']]>', ']]&gt;', $content);
</span><span class="cx"> echo $content;
</span><span class="lines">@@ -176,10 +175,9 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $more_link_text Optional. Content for when there is more text.
</span><span class="cx"> * @param string $stripteaser Optional. Teaser content before the more text.
</span><del>- * @param string $more_file Optional. Not used.
</del><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function get_the_content($more_link_text = null, $stripteaser = 0, $more_file = '') {
</del><ins>+function get_the_content($more_link_text = null, $stripteaser = 0) {
</ins><span class="cx"> global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow;
</span><span class="cx">
</span><span class="cx"> if ( null === $more_link_text )
</span><span class="lines">@@ -194,11 +192,6 @@
</span><span class="cx"> return $output;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $more_file != '' )
- $file = $more_file;
- else
- $file = $pagenow; //$_SERVER['PHP_SELF'];
-
</del><span class="cx"> if ( $page > count($pages) ) // if the requested page doesn't exist
</span><span class="cx"> $page = count($pages); // give them the highest numbered page that DOES exist
</span><span class="cx">
</span><span class="lines">@@ -549,8 +542,6 @@
</span><span class="cx"> * each bookmarks.
</span><span class="cx"> * 'after' - Default is '</p>' (string). The html or text to append to each
</span><span class="cx"> * bookmarks.
</span><del>- * 'more_file' - Default is '' (string) Page the links should point to. Defaults
- * to the current page.
</del><span class="cx"> * 'link_before' - Default is '' (string). The html or text to prepend to each
</span><span class="cx"> * Pages link inside the <a> tag.
</span><span class="cx"> * 'link_after' - Default is '' (string). The html or text to append to each
</span><span class="lines">@@ -568,17 +559,13 @@
</span><span class="cx"> 'link_before' => '', 'link_after' => '',
</span><span class="cx"> 'next_or_number' => 'number', 'nextpagelink' => __('Next page'),
</span><span class="cx"> 'previouspagelink' => __('Previous page'), 'pagelink' => '%',
</span><del>- 'more_file' => '', 'echo' => 1
</del><ins>+ 'echo' => 1
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> global $post, $page, $numpages, $multipage, $more, $pagenow;
</span><del>- if ( $more_file != '' )
- $file = $more_file;
- else
- $file = $pagenow;
</del><span class="cx">
</span><span class="cx"> $output = '';
</span><span class="cx"> if ( $multipage ) {
</span></span></pre>
</div>
</div>
</body>
</html>