WordPress.org

Make WordPress Core

Changeset 8582


Ignore:
Timestamp:
08/07/2008 09:03:11 PM (11 years ago)
Author:
ryan
Message:

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

Location:
branches/2.6/wp-includes
Files:
4 edited

Legend:

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

    r7747 r8582  
    5050        }
    5151
    52         require_once 'Text/Diff/Engine/' . $engine . '.php';
     52        // WP #7391
     53        require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
    5354        $class = 'Text_Diff_Engine_' . $engine;
    5455        $diff_engine = new $class();
  • branches/2.6/wp-includes/Text/Diff/Renderer/inline.php

    r7747 r8582  
    1515
    1616/** Text_Diff_Renderer */
    17 require_once 'Text/Diff/Renderer.php';
     17
     18// WP #7391
     19require_once dirname(dirname(__FILE__)) . '/Renderer.php';
    1820
    1921/**
  • branches/2.6/wp-includes/pluggable.php

    r8566 r8582  
    15131513    $args = wp_parse_args( $args, $defaults );
    15141514
    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 );
    1518 
    15191515    if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
    15201516        require( ABSPATH . WPINC . '/wp-diff.php' );
     
    15351531    $diff = $renderer->render($text_diff);
    15361532
    1537     ini_restore('include_path');
    1538 
    15391533    if ( !$diff )
    15401534        return '';
  • branches/2.6/wp-includes/wp-diff.php

    r8264 r8582  
    22
    33if ( !class_exists( 'Text_Diff' ) ) {
    4     require( 'Text/Diff.php' );
    5     require( 'Text/Diff/Renderer.php' );
    6     require( 'Text/Diff/Renderer/inline.php' );
     4    require( dirname(__FILE__).'/Text/Diff.php' );
     5    require( dirname(__FILE__).'/Text/Diff/Renderer.php' );
     6    require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' );
    77}
    88
Note: See TracChangeset for help on using the changeset viewer.