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

Revert [7054]. No idea how I managed that. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@7055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-02-27 00:36:33 +00:00
parent fb02817dfc
commit 03b47d4ddc
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-admin/includes/file.php
View File

@ -42,20 +42,6 @@ function get_real_file_to_edit( $file ) {
return $real_file;
}
function get_temp_dir() {
if ( defined('WP_TEMP_DIR') )
return trailingslashit(WP_TEMP_DIR);
$temp = ABSPATH . 'wp-content/';
if ( is_dir($temp) && is_writable($temp) )
return $temp;
if ( function_exists('sys_get_temp_dir') )
return trailingslashit(sys_get_temp_dir());
return '/tmp/';
}
function validate_file( $file, $allowed_files = '' ) {
if ( false !== strpos( $file, '..' ))
return 1;
@ -196,7 +182,7 @@ function download_url( $url ) {
if( ! $url )
return false;
$tmpfname = tempnam(get_temp_dir(), 'wpupdate');
$tmpfname = tempnam('/tmp', 'wpupdate');
if( ! $tmpfname )
return false;
@ -302,7 +288,7 @@ function WP_Filesystem( $args = false, $preference = false ) {
}
function get_filesystem_method() {
$tempFile = tempnam(get_temp_dir(), 'WPU');
$tempFile = tempnam('/tmp', 'WPU');
if ( getmyuid() == fileowner($tempFile) ) {
unlink($tempFile);

2
wp-includes/formatting.php
View File

@ -83,7 +83,7 @@ function wpautop($pee, $br = 1) {
$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
if ($br) {
$pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', create_function('$matches', 'str_replace("\n", "<WPPreserveNewline />", $matches[1])'), $pee);
$pee = preg_replace('/<(script|style).*?<\/\\1>/se', 'str_replace("\n", "<WPPreserveNewline />", "\\0")', $pee);
$pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee); // optionally make line breaks
$pee = str_replace('<WPPreserveNewline />', "\n", $pee);
}