Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused vars in get_the_content and wp_link_pages, props filosofo, fixes #11028

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-10-25 20:44:35 +00:00
parent 791cebe932
commit a980fad82a
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-includes/post-template.php
View File

@ -160,10 +160,9 @@ function get_the_guid( $id = 0 ) {
* *
* @param string $more_link_text Optional. Content for when there is more text. * @param string $more_link_text Optional. Content for when there is more text.
* @param string $stripteaser Optional. Teaser content before the more text. * @param string $stripteaser Optional. Teaser content before the more text.
* @param string $more_file Optional. Not used.
*/ */
function the_content($more_link_text = null, $stripteaser = 0, $more_file = '') { function the_content($more_link_text = null, $stripteaser = 0) {
$content = get_the_content($more_link_text, $stripteaser, $more_file); $content = get_the_content($more_link_text, $stripteaser);
$content = apply_filters('the_content', $content); $content = apply_filters('the_content', $content);
$content = str_replace(']]>', ']]>', $content); $content = str_replace(']]>', ']]>', $content);
echo $content; echo $content;
@ -176,10 +175,9 @@ function the_content($more_link_text = null, $stripteaser = 0, $more_file = '')
* *
* @param string $more_link_text Optional. Content for when there is more text. * @param string $more_link_text Optional. Content for when there is more text.
* @param string $stripteaser Optional. Teaser content before the more text. * @param string $stripteaser Optional. Teaser content before the more text.
* @param string $more_file Optional. Not used.
* @return string * @return string
*/ */
function get_the_content($more_link_text = null, $stripteaser = 0, $more_file = '') { function get_the_content($more_link_text = null, $stripteaser = 0) {
global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow; global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow;
if ( null === $more_link_text ) if ( null === $more_link_text )
@ -194,11 +192,6 @@ function get_the_content($more_link_text = null, $stripteaser = 0, $more_file =
return $output; return $output;
} }
if ( $more_file != '' )
$file = $more_file;
else
$file = $pagenow; //$_SERVER['PHP_SELF'];
if ( $page > count($pages) ) // if the requested page doesn't exist if ( $page > count($pages) ) // if the requested page doesn't exist
$page = count($pages); // give them the highest numbered page that DOES exist $page = count($pages); // give them the highest numbered page that DOES exist
@ -549,8 +542,6 @@ function sticky_class( $post_id = null ) {
* each bookmarks. * each bookmarks.
* 'after' - Default is '</p>' (string). The html or text to append to each * 'after' - Default is '</p>' (string). The html or text to append to each
* bookmarks. * bookmarks.
* 'more_file' - Default is '' (string) Page the links should point to. Defaults
* to the current page.
* 'link_before' - Default is '' (string). The html or text to prepend to each * 'link_before' - Default is '' (string). The html or text to prepend to each
* Pages link inside the <a> tag. * Pages link inside the <a> tag.
* 'link_after' - Default is '' (string). The html or text to append to each * 'link_after' - Default is '' (string). The html or text to append to each
@ -568,17 +559,13 @@ function wp_link_pages($args = '') {
'link_before' => '', 'link_after' => '', 'link_before' => '', 'link_after' => '',
'next_or_number' => 'number', 'nextpagelink' => __('Next page'), 'next_or_number' => 'number', 'nextpagelink' => __('Next page'),
'previouspagelink' => __('Previous page'), 'pagelink' => '%', 'previouspagelink' => __('Previous page'), 'pagelink' => '%',
'more_file' => '', 'echo' => 1 'echo' => 1
); );
$r = wp_parse_args( $args, $defaults ); $r = wp_parse_args( $args, $defaults );
extract( $r, EXTR_SKIP ); extract( $r, EXTR_SKIP );
global $post, $page, $numpages, $multipage, $more, $pagenow; global $post, $page, $numpages, $multipage, $more, $pagenow;
if ( $more_file != '' )
$file = $more_file;
else
$file = $pagenow;
$output = ''; $output = '';
if ( $multipage ) { if ( $multipage ) {