From 631c9bb4d60d242432052f56c00768392f42a392 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 24 Jun 2008 17:00:10 +0000
Subject: WP Merge to revision 8180

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1336 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/rewrite.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'wp-includes/rewrite.php')

diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 176eee0..d4a5864 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -31,7 +31,8 @@ function add_feed($feedname, $function) {
 		$wp_rewrite->feeds[] = $feedname;
 	}
 	$hook = 'do_feed_' . $feedname;
-	remove_action($hook, $function, 10, 1);
+	// Remove default function hook
+	remove_action($hook, $hook, 10, 1);
 	add_action($hook, $function, 10, 1);
 	return $hook;
 }
-- 
cgit