Changeset 8562

Timestamp:

08/05/2008 11:56:52 PM (16 years ago)

Author:

azaozz

Message:

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

Location:

trunk

Files:

• wp-includes/pluggable.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -1528 +1528 @@
  */
 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' ) )
@@ -1553 +1552 @@
     $diff = $renderer->render($text_diff);
 
-    ini_restore('include_path');
-
     if ( !$diff )
         return '';

trunk/wp-settings.php

@@ -182 +182 @@
  */
 define('WPINC', 'wp-includes');
+
+if ( constant('WP_POST_REVISIONS') ) {
+    /*
+     * PEAR Text_Diff depends on the include path matching its directory
+     * structure. This prevents modifying source code and maintaining the
+     * modifications when the package is updated.
+     */
+    if ( function_exists( 'set_include_path' ) )
+        set_include_path( get_include_path() . PATH_SEPARATOR . ABSPATH . WPINC );
+    else if ( function_exists( 'ini_set' ) )
+        ini_set( 'include_path',  ini_get('include_path') . PATH_SEPARATOR . ABSPATH . WPINC );
+    else
+        define('WP_INCLUDE_PATH_DISABLED', true);
+}
 
 if ( !defined('WP_LANG_DIR') ) {