Changeset 8582

Timestamp:

08/07/2008 09:03:11 PM (16 years ago)

Author:

ryan

Message:

Fix Text/Diff includes. Props codestyling. fixes #7391 for 2.6

Location:

branches/2.6/wp-includes

Files:

• Text/Diff.php (modified) (1 diff)
• Text/Diff/Renderer/inline.php (modified) (1 diff)
• pluggable.php (modified) (2 diffs)
• wp-diff.php (modified) (1 diff)

branches/2.6/wp-includes/Text/Diff.php

@@ -50 +50 @@
         }
 
-        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();

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

@@ -15 +15 @@
 
 /** Text_Diff_Renderer */
-require_once 'Text/Diff/Renderer.php';
+
+// WP #7391
+require_once dirname(dirname(__FILE__)) . '/Renderer.php';
 
 /**

branches/2.6/wp-includes/pluggable.php

@@ -1513 +1513 @@
     $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' );
@@ -1535 +1531 @@
     $diff = $renderer->render($text_diff);
 
-    ini_restore('include_path');
-
     if ( !$diff )
         return '';

branches/2.6/wp-includes/wp-diff.php

@@ -2 +2 @@
 
 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' );
 }