-post_mime_type);
- switch ( $type[0] ) {
- case 'image' :
- $meta = get_post_meta($post->ID, '_wp_attachment_metadata', true);
- if ($meta['width'] > 450) : ?>
-
-
-
-
-
guid); ?>
-
+
ID, true, array(450, 800)); ?>
guid); ?>
+
Read the rest of this entry »'); ?>
Pages: ', '', 'number'); ?>
diff --git a/wp-content/themes/default/images/audio.jpg b/wp-content/themes/default/images/audio.jpg
new file mode 100644
index 000000000..b02e1c86e
Binary files /dev/null and b/wp-content/themes/default/images/audio.jpg differ
diff --git a/wp-content/themes/default/style.css b/wp-content/themes/default/style.css
index 820c99308..8d5a73044 100644
--- a/wp-content/themes/default/style.css
+++ b/wp-content/themes/default/style.css
@@ -263,7 +263,23 @@ body {
.widecolumn .postmetadata {
margin: 30px 0;
}
-
+
+.widecolumn .smallattachment {
+ text-align: center;
+ float: left;
+ width: 128px;
+ margin: 5px 5px 5px 0px;
+}
+
+.widecolumn .attachment {
+ text-align: center;
+ margin: 5px 0px;
+}
+
+.postmetadata {
+ clear: left;
+}
+
#footer {
padding: 0 0 0 1px;
margin: 0 auto;
diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 3fc191d13..428cee6d2 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -97,12 +97,10 @@ class WP_Query {
if ( '' != $qv['subpost_id'] )
$qv['attachment_id'] = $qv['subpost_id'];
- if ( ('' != $qv['attachment']) || $qv['attachment_id'] ) {
+ if ( ('' != $qv['attachment']) || (int) $qv['attachment_id'] ) {
$this->is_single = true;
$this->is_attachment = true;
- }
-
- if ('' != $qv['name']) {
+ } elseif ('' != $qv['name']) {
$this->is_single = true;
} elseif ( $qv['p'] ) {
$this->is_single = true;
@@ -115,6 +113,14 @@ class WP_Query {
$this->is_single = false;
} elseif (!empty($qv['s'])) {
$this->is_search = true;
+ switch ($qv['show_post_type']) {
+ case 'page' :
+ $this->is_page = true;
+ break;
+ case 'attachment' :
+ $this->is_attachment = true;
+ break;
+ }
} else {
// Look for archive queries. Dates, categories, authors.
@@ -198,6 +204,10 @@ class WP_Query {
if ( ($this->is_date || $this->is_author || $this->is_category)) {
$this->is_archive = true;
}
+
+ if ( 'attachment' == $qv['show_post_type'] ) {
+ $this->is_attachment = true;
+ }
}
if ('' != $qv['feed']) {
@@ -1413,7 +1423,7 @@ class WP_Rewrite {
class WP {
var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id');
- var $private_query_vars = array('posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging');
+ var $private_query_vars = array('posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging', 'show_post_type');
var $query_vars;
var $query_string;
diff --git a/wp-includes/functions-post.php b/wp-includes/functions-post.php
index 91e1ac18c..38c754093 100644
--- a/wp-includes/functions-post.php
+++ b/wp-includes/functions-post.php
@@ -208,12 +208,12 @@ function wp_insert_post($postarr = array()) {
return $post_ID;
}
-function wp_insert_attachment($object, $file, $post_parent = 0) {
+function wp_insert_attachment($object, $file = false, $post_parent = 0) {
global $wpdb, $user_ID;
if ( is_object($object) )
$object = get_object_vars($object);
-
+
// Export array as variables
extract($object);
@@ -320,7 +320,8 @@ function wp_insert_attachment($object, $file, $post_parent = 0) {
wp_set_post_cats('', $post_ID, $post_category);
- add_post_meta($post_ID, '_wp_attached_file', $file);
+ if ( $file )
+ add_post_meta($post_ID, '_wp_attached_file', $file);
clean_post_cache($post_ID);
@@ -343,7 +344,7 @@ function wp_delete_attachment($postid) {
if ( 'attachment' != $post->post_status )
return false;
- $meta = get_post_meta($postid, 'imagedata', true);
+ $meta = get_post_meta($postid, '_wp_attachment_metadata', true);
$file = get_post_meta($postid, '_wp_attached_file', true);
$wpdb->query("DELETE FROM $wpdb->posts WHERE ID = $postid");
@@ -354,8 +355,11 @@ function wp_delete_attachment($postid) {
$wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = $postid");
- if ( ! empty($meta['file']) )
- @ unlink($meta['file']);
+ if ( ! empty($meta['thumb']) ) {
+ // Don't delete the thumb if another attachment uses it
+ if (! $foo = $wpdb->get_row("SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE '%".$wpdb->escape($meta['thumb'])."%' AND post_id <> $postid"))
+ @ unlink(str_replace(basename($file), $meta['thumb'], $file));
+ }
if ( ! empty($file) )
@ unlink($file);
@@ -429,6 +433,9 @@ function wp_update_post($postarr = array()) {
$postarr['post_date_gmt'] = '';
}
+ if ($postarr['post_status'] == 'attachment')
+ return wp_insert_attachment($postarr);
+
return wp_insert_post($postarr);
}
@@ -511,6 +518,9 @@ function wp_delete_post($postid = 0) {
if ( !$post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = $postid") )
return $post;
+ if ( 'attachment' == $post->post_status )
+ return wp_delete_attachment($postid);
+
do_action('delete_post', $postid);
if ( 'publish' == $post->post_status) {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index ff7d65900..4fb97351a 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -503,7 +503,7 @@ function update_post_meta($post_id, $key, $value, $prev_value = '') {
$original_prev = $prev_value;
if ( is_array($prev_value) || is_object($prev_value) )
- $prev_value = serialize($value);
+ $prev_value = $wpdb->escape(serialize($prev_value));
if (! $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key
= '$key' AND post_id = '$post_id'") ) {
diff --git a/wp-includes/template-functions-links.php b/wp-includes/template-functions-links.php
index b18a80172..4b7f86608 100644
--- a/wp-includes/template-functions-links.php
+++ b/wp-includes/template-functions-links.php
@@ -209,11 +209,16 @@ function edit_post_link($link = 'Edit This', $before = '', $after = '') {
get_currentuserinfo();
- if ( !user_can_edit_post($user_ID, $post->ID) || is_attachment() ) {
+ if ( !user_can_edit_post($user_ID, $post->ID) ) {
return;
}
- $location = get_settings('siteurl') . "/wp-admin/post.php?action=edit&post=$post->ID";
+ if ( is_attachment() )
+ $file = 'attachments';
+ else
+ $file = 'post';
+
+ $location = get_settings('siteurl') . "/wp-admin/{$file}.php?action=edit&post=$post->ID";
echo $before . "
$link" . $after;
}
diff --git a/wp-includes/template-functions-post.php b/wp-includes/template-functions-post.php
index be4d97776..c85194738 100644
--- a/wp-includes/template-functions-post.php
+++ b/wp-includes/template-functions-post.php
@@ -439,22 +439,126 @@ function _page_level_out($parent, $page_tree, $args, $depth = 0, $echo = true) {
return $output;
}
-function prepend_attachment($content) {
- global $post;
+function the_attachment_link($id = 0, $fullsize = false, $max_dims = false) {
+ echo get_the_attachment_link($id, $fullsize, $max_dims);
+}
- $p = '
';
+function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false) {
+ $id = (int) $id;
+ $_post = & get_post($id);
+
+ if ( ('attachment' != $_post->post_status) || ('' == $_post->guid) )
+ return __('Missing Attachment');
+
+ if (! empty($_post->guid) ) {
+ $innerHTML = get_attachment_innerHTML($_post->ID, $fullsize, $max_dims);
+
+ return "guid}\" title=\"{$_post->post_title}\" >{$innerHTML}";
- if ( '' != $post->guid ) {
- if ( substr($post->post_mime_type, 0, 6) == 'image/' )
- $p .= '
';
- else
- $p .= __('Attachment') . ' (' . $post->post_mime_type . ')';
} else {
$p .= __('Missing attachment');
}
+ return $p;
+}
+function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) {
+ $id = (int) $id;
+ $post = & get_post($id);
+
+ $mime = $post->post_mime_type;
+
+ $imagedata = get_post_meta($post->ID, '_wp_attachment_metadata', true);
+
+ $file = get_post_meta($post->ID, '_wp_attached_file', true);
+
+ if ( !$fullsize && !empty($imagedata['thumb'])
+ && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file))
+ && file_exists($thumbfile) ) {
+
+ // We have a thumbnail desired, specified and existing
+
+ $src = str_replace(basename($post->guid), $imagedata['thumb'], $post->guid);
+ $src_file = $thumbfile;
+ $class = 'attachmentthumb';
+
+ } elseif ( substr($mime, 0, 6) == 'image/'
+ && file_exists($file) ) {
+
+ // We have an image without a thumbnail
+
+ $src = $post->guid;
+ $src_file = & $file;
+ $class = 'attachmentimage';
+ } elseif (! empty($mime) ) {
+
+ // No thumb, no image. We'll look for a mime-related icon instead.
+ $icon_dir = apply_filters('icon_dir', get_template_directory().'/images');
+ $icon_dir_uri = apply_filters('icon_dir_uri', get_template_directory_uri().'/images');
+
+ $types = array(substr($mime, 0, strpos($mime, '/')), substr($mime, strpos($mime, '/') + 1), str_replace('/', '_', $mime));
+ $exts = array('jpg', 'gif', 'png');
+ foreach ($types as $type) {
+ foreach ($exts as $ext) {
+ $src_file = "$icon_dir/$type.$ext";
+ if ( file_exists($src_file) ) {
+ $src = "$icon_dir_uri/$type.$ext";
+ break 2;
+ }
+ }
+ }
+ }
+
+ if (! isset($src) )
+ return false;
+
+ // Do we need to constrain the image?
+ if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
+
+ $imagesize = getimagesize($src_file);
+
+ if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
+ $actual_aspect = $imagesize[0] / $imagesize[1];
+ $desired_aspect = $max_dims[0] / $max_dims[1];
+
+ if ( $actual_aspect >= $desired_aspect ) {
+ $height = $actual_aspect * $max_dims[0];
+ $constraint = "width=\"{$max_dims[0]}\" ";
+ $post->iconsize = array($max_dims[0], $height);
+ } else {
+ $width = $max_dims[1] / $actual_aspect;
+ $constraint = "height=\"{$max_dims[1]}\" ";
+ $post->iconsize = array($width, $max_dims[1]);
+ }
+ } else {
+ $post->iconsize = array($imagesize[0], $imagesize[1]);
+ }
+ }
+
+ $icon = "![](\"{$src}\" "\\"{$post-")
post_title}\" {$constraint}/>";
+
+ return apply_filters('attachment_icon', $icon, $post->ID);
+}
+
+function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
+ $id = (int) $id;
+
+ if ( $innerHTML = get_attachment_icon($id, $fullsize, $max_dims))
+ return $innerHTML;
+
+ $post = & get_post($id);
+
+ $innerHTML = $post->post_title;
+
+ return apply_filters('attachment_innerHTML', $innerHTML, $post->ID);
+}
+
+function prepend_attachment($content) {
+ $p = '
';
+ $p .= get_the_attachment_link(false, true, array(400, 300));
$p .= '
';
+ $p = apply_filters('prepend_attachment', $p);
return "$p\n$content";
}
+
?>