Changeset 896

Timestamp:

02/22/07 14:24:41 (2 years ago)

Author:

donncha

Message:

WP Merge to 4914

Files:

• trunk/wp-admin/custom-header.php (modified) (1 diff)
• trunk/wp-admin/edit-pages.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (2 diffs)
• trunk/wp-includes/query.php (modified) (1 diff)
• trunk/xmlrpc.php (modified) (10 diffs)

trunk/wp-admin/custom-header.php

@@ -287 +287 @@
-                $file = get_attached_file( $_POST['attachment_id'] );
-                $medium = str_replace(basename($file), 'midsize-'.basename($file), $file);
-
-
+
-                wp_delete_attachment( $_POST['attachment_id'] );
-

trunk/wp-admin/edit-pages.php

@@ -20 +20 @@
-
-<?php
-
+&order=asc
-
-if ( $_GET['s'] )

trunk/wp-includes/functions.php

@@ -1114 +1114 @@
-}
-
-
+, $overwrite = false
-        if ( empty($name) )
-                return array('error' => __("Empty filename"));
@@ -1135 +1135 @@
-        else
-                $ext = ".$ext";
-
+&& !$overwrite 
-                if ( '' == "$number$ext" )
-                        $filename = $filename . ++$number . $ext;

trunk/wp-includes/query.php

@@ -766 +766 @@
-                        }
-                        $term = addslashes_gpc($q['s']); 
-
-
-
+
+
+
+
+
-                }
-

trunk/xmlrpc.php

@@ -80 +80 @@
-                        'wp.newCategory'                => 'this:wp_newCategory',
-                        'wp.suggestCategories'  => 'this:wp_suggestCategories',
+                        'wp.uploadFile'                 => 'this:mw_newMediaObject',    // Alias
-
-                        // Blogger API
@@ -423 +424 @@
-                        SELECT ID page_id,
-                                post_title page_title,
-
+
+
-                        FROM {$wpdb->posts}
-                        WHERE post_type = 'page'
-                        ORDER BY ID
-                ");
+
+                // The date needs to be formated properly.
+                $num_pages = count($page_list);
+                for($i = 0; $i < $num_pages; $i++) {
+                        $post_date = mysql2date("Ymd\TH:i:s", $page_list[$i]->post_date);
+                        $page_list[$i]->dateCreated = new IXR_Date($post_date);
+
+                        unset($page_list[$i]->post_date);
+                }
-
-                return($page_list);
@@ -487 +498 @@
-                // If no parent_id was provided make it empty
-                // so that it will be a top level page (no parent).
-empty
+!isset
-                        $category["parent_id"] = "";
-                }
@@ -948 +959 @@
-
-                // Only set a post parent if one was provided.
-!empty
+isset
-                        $post_parent = $content_struct["wp_page_parent_id"];
-                }
@@ -988 +999 @@
-          $post_more = $content_struct['mt_text_more'];
-
-empty
+!isset
-            get_option('default_comment_status')
-            : $content_struct['mt_allow_comments'];
-
-empty
+!isset
-            get_option('default_ping_status')
-            : $content_struct['mt_allow_pings'];
@@ -1000 +1011 @@
-          }
-
-
+
+
+
-
-          // Do some timestamp voodoo
@@ -1162 +1175 @@
-          }
-
-
-
-
+
+
+
+
+
-            get_option('default_comment_status')
-            : $content_struct['mt_allow_comments'];
@@ -1380 +1395 @@
-                $bits = $data['bits'];
-
+                // Default to new file, not over write.
+                $overwrite = false;
+                if(!empty($data["overwrite"]) && ($data["overwrite"] == true)) {
+                        $overwrite = true;
+                }
+
-                logIO('O', '(MW) Received '.strlen($bits).' bytes');
-
@@ -1395 +1416 @@
-                        return new IXR_Error(500, $upload_err);
-
-
+, $overwrite
-                if ( ! empty($upload['error']) ) {
-                        logIO('O', '(MW) Could not write file '.$name);
@@ -1411 +1432 @@
-                        'guid' => $upload[ 'url' ]
-                );
-
-
-
+
+
+
+
+
+
+
-
-                return apply_filters( 'wp_handle_upload', array( 'file' => $upload[ 'file' ], 'url' => $upload[ 'url' ], 'type' => $type ) );