From f129cef6b9a78add12e8d25ff60af102cfe6c6f3 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 2 Oct 2006 18:03:34 +0000
Subject: [PATCH] Don't use deprecated functions.  Props Nazgul.  fixes #3186

git-svn-id: http://svn.automattic.com/wordpress/trunk@4264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/import/dotclear.php             | 2 +-
 wp-admin/import/textpattern.php          | 2 +-
 wp-content/themes/default/attachment.php | 2 +-
 wp-content/themes/default/page.php       | 2 +-
 wp-content/themes/default/single.php     | 2 +-
 wp-includes/feed.php                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php
index ba988f6fa4..48db7218d6 100644
--- a/wp-admin/import/dotclear.php
+++ b/wp-admin/import/dotclear.php
@@ -408,7 +408,7 @@ class Dotclear_Import {
 				$cats = array();
 				if($cat1 = get_catbynicename($post_cat_name)) { $cats[1] = $cat1; }
 
-				if(!empty($cats)) { wp_set_post_cats('', $ret_id, $cats); }
+				if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
 			}
 		}
 		// Store ID translation for later use
diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php
index 6af31aae29..f9937ff6c9 100644
--- a/wp-admin/import/textpattern.php
+++ b/wp-admin/import/textpattern.php
@@ -338,7 +338,7 @@ class Textpattern_Import {
 				if($cat1 = get_catbynicename($Category1)) { $cats[1] = $cat1; }
 				if($cat2 = get_catbynicename($Category2)) { $cats[2] = $cat2; }
 
-				if(!empty($cats)) { wp_set_post_cats('', $ret_id, $cats); }
+				if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
 			}
 		}
 		// Store ID translation for later use
diff --git a/wp-content/themes/default/attachment.php b/wp-content/themes/default/attachment.php
index 0d606db623..7839b6ccca 100644
--- a/wp-content/themes/default/attachment.php
+++ b/wp-content/themes/default/attachment.php
@@ -17,7 +17,7 @@
 
 				<?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
 
-				<?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
+				<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
 
 				<p class="postmetadata alt">
 					<small>
diff --git a/wp-content/themes/default/page.php b/wp-content/themes/default/page.php
index 33820f59d5..9d918a276d 100644
--- a/wp-content/themes/default/page.php
+++ b/wp-content/themes/default/page.php
@@ -8,7 +8,7 @@
 			<div class="entry">
 				<?php the_content('<p class="serif">Read the rest of this page &raquo;</p>'); ?>
 
-				<?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
+				<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
 
 			</div>
 		</div>
diff --git a/wp-content/themes/default/single.php b/wp-content/themes/default/single.php
index fb071b1b73..ee040d5bf3 100644
--- a/wp-content/themes/default/single.php
+++ b/wp-content/themes/default/single.php
@@ -15,7 +15,7 @@
 			<div class="entry">
 				<?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
 
-				<?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
+				<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
 
 				<p class="postmetadata alt">
 					<small>
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index f93a54b0a9..83fd965d98 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -102,7 +102,7 @@ function get_author_rss_link($echo = false, $author_id, $author_nicename) {
        if ('' == $permalink_structure) {
 				 $link = get_option('home') . '?feed=rss2&amp;author=' . $author_id;
        } else {
-				 $link = get_author_link(0, $author_id, $author_nicename);
+				 $link = get_author_posts_url($author_id, $author_nicename);
 				 $link = $link . "feed/";
        }