Changeset 8563 for branches/2.6/wp-includes/pluggable.php

Timestamp:

08/05/2008 11:57:25 PM (18 years ago)

Author:

azaozz

Message:

Stop fatal error in post revisions when setting the include path is disabled. Props santosj, for 2.6

File:

• branches/2.6/wp-includes/pluggable.php (modified) (2 diffs)

branches/2.6/wp-includes/pluggable.php

@@ -1510 +1510 @@
  */
 function wp_text_diff( $left_string, $right_string, $args = null ) {
+    if ( defined( 'WP_INCLUDE_PATH_DISABLED' ) )
+        return '';
+
     $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' ) )
@@ -1535 +1534 @@
     $diff = $renderer->render($text_diff);
 
-    ini_restore('include_path');
-
     if ( !$diff )
         return '';