WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert 8562 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-08-06 00:44:40 +00:00
parent 0c6394a0b9
commit dc9f3139a1
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/pluggable.php
View File

@ -1527,12 +1527,13 @@ if ( !function_exists( 'wp_text_diff' ) ) :
* @return string Empty string if strings are equivalent or HTML with differences. * @return string Empty string if strings are equivalent or HTML with differences.
*/ */
function wp_text_diff( $left_string, $right_string, $args = null ) { function wp_text_diff( $left_string, $right_string, $args = null ) {
if ( defined( 'WP_INCLUDE_PATH_DISABLED' ) )
return '';
$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' ); $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
$args = wp_parse_args( $args, $defaults ); $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' ) ) if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
require( ABSPATH . WPINC . '/wp-diff.php' ); require( ABSPATH . WPINC . '/wp-diff.php' );
@ -1551,6 +1552,8 @@ function wp_text_diff( $left_string, $right_string, $args = null ) {
$renderer = new WP_Text_Diff_Renderer_Table(); $renderer = new WP_Text_Diff_Renderer_Table();
$diff = $renderer->render($text_diff); $diff = $renderer->render($text_diff);
ini_restore('include_path');
if ( !$diff ) if ( !$diff )
return ''; return '';

22
wp-settings.php
View File

@ -196,28 +196,6 @@ if ( constant('WP_POST_REVISIONS') ) {
define('WP_INCLUDE_PATH_DISABLED', true); 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');
}
}
}
require (ABSPATH . WPINC . '/compat.php'); require (ABSPATH . WPINC . '/compat.php');
require (ABSPATH . WPINC . '/functions.php'); require (ABSPATH . WPINC . '/functions.php');
require (ABSPATH . WPINC . '/classes.php'); require (ABSPATH . WPINC . '/classes.php');