Changeset 7054

Timestamp:

02/27/08 00:25:08 (9 months ago)

Author:

ryan

Message:

Fix users query

Files:

• trunk/wp-admin/includes/file.php (modified) (3 diffs)
• trunk/wp-includes/formatting.php (modified) (1 diff)

trunk/wp-admin/includes/file.php

@@ -41 +41 @@
-
-    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/';
-}
-
@@ -183 +197 @@
-        return false;
-
-'/tmp'
+get_temp_dir()
-    if( ! $tmpfname )
-        return false;
@@ -289 +303 @@
-
-function get_filesystem_method() {
-'/tmp'
+get_temp_dir()
-
-    if ( getmyuid() == fileowner($tempFile) ) {

trunk/wp-includes/formatting.php

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