Ticket #7391: 7391.r8579.diff

wp-includes/wp-diff.php

@@ -1 +1 @@
 <?php
 
 if ( !class_exists( 'Text_Diff' ) ) {
-        require( 'Text/Diff.php' );
-        require( 'Text/Diff/Renderer.php' );
-        require( 'Text/Diff/Renderer/inline.php' );
+        require( dirname(__FILE__).'/Text/Diff.php' );
+        require( dirname(__FILE__).'/Text/Diff/Renderer.php' );
+        require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' );
 }
 
 

wp-includes/Text/Diff/Renderer/inline.php

@@ -14 +14 @@
  */
 
 /** Text_Diff_Renderer */
-require_once 'Text/Diff/Renderer.php';
 
+// WP #7391
+require_once dirname(__FILE__).'/../Renderer.php';
+
 /**
  * "Inline" diff renderer.
  *

wp-includes/Text/Diff.php

@@ -49 +49 @@
             $engine = basename($engine);
         }
 
-        require_once 'Text/Diff/Engine/' . $engine . '.php';
+        // WP #7391
+        require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
         $class = 'Text_Diff_Engine_' . $engine;
         $diff_engine = new $class();
 

wp-includes/pluggable.php

@@ -1530 +1530 @@
         $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' );
 
@@ -1552 +1548 @@
         $renderer  = new WP_Text_Diff_Renderer_Table();
         $diff = $renderer->render($text_diff);
 
-        ini_restore('include_path');
-
         if ( !$diff )
                 return '';