Changeset 8566
- Timestamp:
- 08/06/2008 01:11:39 AM (17 years ago)
- Location:
- branches/2.6
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.6/wp-includes/pluggable.php
r8563 r8566 1510 1510 */ 1511 1511 function wp_text_diff( $left_string, $right_string, $args = null ) { 1512 if ( defined( 'WP_INCLUDE_PATH_DISABLED' ) )1513 return '';1514 1515 1512 $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' ); 1516 1513 $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 ); 1517 1518 1518 1519 if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) ) … … 1534 1535 $diff = $renderer->render($text_diff); 1535 1536 1537 ini_restore('include_path'); 1538 1536 1539 if ( !$diff ) 1537 1540 return ''; -
branches/2.6/wp-settings.php
r8563 r8566 182 182 */ 183 183 define('WPINC', 'wp-includes'); 184 185 if ( constant('WP_POST_REVISIONS') ) {186 /*187 * PEAR Text_Diff depends on the include path matching its directory188 * structure. This prevents modifying source code and maintaining the189 * 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 else196 define('WP_INCLUDE_PATH_DISABLED', true);197 }198 184 199 185 if ( !defined('WP_LANG_DIR') ) {
Note: See TracChangeset
for help on using the changeset viewer.