WordPress.org

Make WordPress Core

Changeset 8566


Ignore:
Timestamp:
08/06/08 01:11:39 (6 years ago)
Author:
azaozz
Message:

Revert 8563

Location:
branches/2.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.6/wp-includes/pluggable.php

    r8563 r8566  
    15101510 */ 
    15111511function wp_text_diff( $left_string, $right_string, $args = null ) { 
    1512     if ( defined( 'WP_INCLUDE_PATH_DISABLED' ) ) 
    1513         return ''; 
    1514  
    15151512    $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' ); 
    15161513    $args = wp_parse_args( $args, $defaults ); 
     1514 
     1515    // PEAR Text_Diff is lame; it includes things from include_path rather than it's own path. 
     1516    // Not sure of the ramifications of disttributing modified code. 
     1517    ini_set('include_path', '.' . PATH_SEPARATOR . ABSPATH . WPINC ); 
    15171518 
    15181519    if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) ) 
     
    15341535    $diff = $renderer->render($text_diff); 
    15351536 
     1537    ini_restore('include_path'); 
     1538 
    15361539    if ( !$diff ) 
    15371540        return ''; 
  • branches/2.6/wp-settings.php

    r8563 r8566  
    182182 */ 
    183183define('WPINC', 'wp-includes'); 
    184  
    185 if ( constant('WP_POST_REVISIONS') ) { 
    186     /* 
    187      * PEAR Text_Diff depends on the include path matching its directory 
    188      * structure. This prevents modifying source code and maintaining the 
    189      * modifications when the package is updated. 
    190      */ 
    191     if ( function_exists( 'set_include_path' ) ) 
    192         set_include_path( get_include_path() . PATH_SEPARATOR . ABSPATH . WPINC ); 
    193     else if ( function_exists( 'ini_set' ) ) 
    194         ini_set( 'include_path',  ini_get('include_path') . PATH_SEPARATOR . ABSPATH . WPINC ); 
    195     else 
    196         define('WP_INCLUDE_PATH_DISABLED', true); 
    197 } 
    198184 
    199185if ( !defined('WP_LANG_DIR') ) { 
Note: See TracChangeset for help on using the changeset viewer.