Changeset 8564

Timestamp:

08/06/08 00:44:40 (4 months ago)

Author:

azaozz

Message:

Revert 8562

Files:

• trunk/wp-includes/pluggable.php (modified) (2 diffs)
• trunk/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' ) )
@@ -1552 +1553 @@
-    $diff = $renderer->render($text_diff);
-
+    ini_restore('include_path');
+
-    if ( !$diff )
-        return '';

trunk/wp-settings.php

@@ -195 +195 @@
-    else
-        define('WP_INCLUDE_PATH_DISABLED', true);
-}
-
-if ( !defined('WP_LANG_DIR') ) {
-    /**
-     * Stores the location of the language directory. First looks for language folder in WP_CONTENT_DIR
-     * and uses that folder if it exists. Or it uses the "languages" folder in WPINC.
-     *
-     * @since 2.1.0
-     */
-    if ( file_exists(WP_CONTENT_DIR . '/languages') && @is_dir(WP_CONTENT_DIR . '/languages') ) {
-        define('WP_LANG_DIR', WP_CONTENT_DIR . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
-        if (!defined('LANGDIR')) {
-            // Old static relative path maintained for limited backwards compatibility - won't work in some cases
-            define('LANGDIR', 'wp-content/languages');
-        }
-    } else {
-        define('WP_LANG_DIR', ABSPATH . WPINC . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
-        if (!defined('LANGDIR')) {
-            // Old relative path maintained for backwards compatibility
-            define('LANGDIR', WPINC . '/languages');
-        }
-    }
-}
-