Merge with WP revision 8635

git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1421 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 0 insertions, 6 deletions

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 8041f28..0007633 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1518,10 +1518,6 @@ function wp_text_diff( $left_string, $right_string, $args = null ) {
 	$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
 	$args = wp_parse_args( $args, $defaults );
 
-	// PEAR Text_Diff is lame; it includes things from include_path rather than it's own path.
-	// Not sure of the ramifications of disttributing modified code.
-	ini_set('include_path', '.' . PATH_SEPARATOR . ABSPATH . WPINC );
-
 	if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
 		require( ABSPATH . WPINC . '/wp-diff.php' );
 
@@ -1540,8 +1536,6 @@ function wp_text_diff( $left_string, $right_string, $args = null ) {
 	$renderer  = new WP_Text_Diff_Renderer_Table();
 	$diff = $renderer->render($text_diff);
 
-	ini_restore('include_path');
-
 	if ( !$diff )
 		return '';