WordPress.org

Make WordPress Core

Changeset 8564


Ignore:
Timestamp:
08/06/2008 12:44:40 AM (10 years ago)
Author:
azaozz
Message:

Revert 8562

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/pluggable.php

    r8562 r8564  
    15281528 */
    15291529function wp_text_diff( $left_string, $right_string, $args = null ) {
    1530     if ( defined( 'WP_INCLUDE_PATH_DISABLED' ) )
    1531         return '';
    1532 
    15331530    $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
    15341531    $args = wp_parse_args( $args, $defaults );
     1532
     1533    // PEAR Text_Diff is lame; it includes things from include_path rather than it's own path.
     1534    // Not sure of the ramifications of disttributing modified code.
     1535    ini_set('include_path', '.' . PATH_SEPARATOR . ABSPATH . WPINC );
    15351536
    15361537    if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
     
    15521553    $diff = $renderer->render($text_diff);
    15531554
     1555    ini_restore('include_path');
     1556
    15541557    if ( !$diff )
    15551558        return '';
  • trunk/wp-settings.php

    r8562 r8564  
    195195    else
    196196        define('WP_INCLUDE_PATH_DISABLED', true);
    197 }
    198 
    199 if ( !defined('WP_LANG_DIR') ) {
    200     /**
    201      * Stores the location of the language directory. First looks for language folder in WP_CONTENT_DIR
    202      * and uses that folder if it exists. Or it uses the "languages" folder in WPINC.
    203      *
    204      * @since 2.1.0
    205      */
    206     if ( file_exists(WP_CONTENT_DIR . '/languages') && @is_dir(WP_CONTENT_DIR . '/languages') ) {
    207         define('WP_LANG_DIR', WP_CONTENT_DIR . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
    208         if (!defined('LANGDIR')) {
    209             // Old static relative path maintained for limited backwards compatibility - won't work in some cases
    210             define('LANGDIR', 'wp-content/languages');
    211         }
    212     } else {
    213         define('WP_LANG_DIR', ABSPATH . WPINC . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
    214         if (!defined('LANGDIR')) {
    215             // Old relative path maintained for backwards compatibility
    216             define('LANGDIR', WPINC . '/languages');
    217         }
    218     }
    219197}
    220198
Note: See TracChangeset for help on using the changeset viewer.