+ $group_number)
+{
+?>
+
-
+
+
+
+
+
+
+
-
+
Index: wp-admin/includes/schema.php
===================================================================
--- wp-admin/includes/schema.php (revision 8796)
+++ wp-admin/includes/schema.php (working copy)
@@ -119,6 +119,8 @@
post_content_filtered text NOT NULL,
post_parent bigint(20) NOT NULL default '0',
guid varchar(255) NOT NULL default '',
+ groups varchar(255) NOT NULL default '0',
+ group_number int(11) NOT NULL default '0',
menu_order int(11) NOT NULL default '0',
post_type varchar(20) NOT NULL default 'post',
post_mime_type varchar(100) NOT NULL default '',
Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php (revision 8796)
+++ wp-admin/includes/upgrade.php (working copy)
@@ -764,6 +764,9 @@
function upgrade_270() {
if ( $wp_current_db_version < 8530 )
populate_roles_270();
+
+ add_clean_index($wpdb->posts, 'groups');
+ add_clean_index($wpdb->posts, 'group_number');
}
Index: wp-admin/js/gallery.js
===================================================================
--- wp-admin/js/gallery.js (revision 8796)
+++ wp-admin/js/gallery.js (working copy)
@@ -1,22 +1,44 @@
jQuery(function($) {
var gallerySortable;
+
var gallerySortableInit = function() {
gallerySortable = $('#media-items').sortable( {
items: '.media-item',
placeholder: 'sorthelper',
axis: 'y',
distance: 2,
- update: galleryReorder
+ update: galleryHandle,
} );
}
-
- // When an update has occurred, adjust the order for each item
+
+ var galleryHandle = function (e, sort) {
+ galleryReorder(e, sort);
+ gallerySortGroups();
+ }
+
+ // @todo: fix me!
+ // When an update has occurred, adjust the order for each item..
var galleryReorder = function(e, sort) {
+ var o = 0;
jQuery.each(sort['element'].sortable('toArray'), function(i, id) {
- jQuery('#' + id + ' .menu_order input')[0].value = (1+i);
+ if (id)
+ {
+ o++;
+ jQuery('#' + id + ' .menu_order input')[0].value = o;
+ }
});
}
-
+
+ var gallerySortGroups = function () {
+ var mediaGroups = jQuery(".media-groups").length;
+ for (g = 0; g < mediaGroups; g++)
+ {
+ jQuery.each(jQuery("#media-group-" + g + " .media-item input.group-value"), function(i, id) {
+ jQuery(id)[0].value = g;
+ });
+ }
+ }
+
// initialize sortable
gallerySortableInit();
});
Index: wp-admin/post.php
===================================================================
--- wp-admin/post.php (revision 8796)
+++ wp-admin/post.php (working copy)
@@ -83,6 +83,10 @@
check_admin_referer('add-post');
if ( 'post-quickpress-publish' == $action )
+
+ $_POST['comment_status'] = get_option('default_comment_status');
+ $_POST['ping_status'] = get_option('default_ping_status');
+
$_POST['publish'] = 'publish'; // tell write_post() to publish
if ( !empty( $_POST['quickpress_post_ID'] ) ) {
Index: wp-includes/js/swfupload/handlers.js
===================================================================
--- wp-includes/js/swfupload/handlers.js (revision 8796)
+++ wp-includes/js/swfupload/handlers.js (working copy)
@@ -125,16 +125,23 @@
}
// Only show Save buttons when there is at least one file.
- if ( jQuery('#media-items>*').not('.media-blank').length > 0 )
+ if ( jQuery('#media-items .media-item').not('.media-no-items').length > 0 )
jQuery('.savebutton').show();
else
jQuery('.savebutton').hide();
+ // Only show new Gallery button when there are at least two files.
+ if ( jQuery('#media-items .media-item').not('.media-no-items').length > 1 )
+ jQuery('.new-gallery').show();
+ else
+ jQuery('.new-gallery').hide();
+
// Only show Gallery button when there are at least two files.
- if ( jQuery('#media-items>*').length > 1 )
+ if ( jQuery('#media-items .media-groups').length > 1 )
jQuery('.insert-gallery').show();
else
jQuery('.insert-gallery').hide();
+
}
function uploadSuccess(fileObj, serverData) {
Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php (revision 8796)
+++ wp-includes/media.php (working copy)
@@ -487,6 +487,7 @@
'icontag' => 'dt',
'captiontag' => 'dd',
'columns' => 3,
+ 'group' => null,
'size' => 'thumbnail',
), $attr));
@@ -508,7 +509,7 @@
$captiontag = tag_escape($captiontag);
$columns = intval($columns);
$itemwidth = $columns > 0 ? floor(100/$columns) : 100;
-
+
$output = apply_filters('gallery_style', "
");
-
+
foreach ( $attachments as $id => $attachment ) {
- $link = wp_get_attachment_link($id, $size, true);
- $output .= "<{$itemtag} class='gallery-item'>";
- $output .= "
- <{$icontag} class='gallery-icon'>
- $link
- ";
- if ( $captiontag && trim($attachment->post_excerpt) ) {
+
+ if (!is_null($group)) {
+ if ($attachment->group_number != $group) {
+ continue;
+ }
+ } else {
+ if ($attachment->group_number == 0) {
+ continue;
+ }
+ }
+
+ $link = wp_get_attachment_link($id, $size, true);
+ $output .= "<{$itemtag} class='gallery-item'>";
$output .= "
- <{$captiontag} class='gallery-caption'>
- {$attachment->post_excerpt}
- ";
- }
- $output .= "";
- if ( $columns > 0 && ++$i % $columns == 0 )
- $output .= '
';
+ <{$icontag} class='gallery-icon'>
+ $link
+ ";
+ if ( $captiontag && trim($attachment->post_excerpt) ) {
+ $output .= "
+ <{$captiontag} class='gallery-caption'>
+ {$attachment->post_excerpt}
+ ";
+ }
+ $output .= "";
+ if ( $columns > 0 && ++$i % $columns == 0 )
+ $output .= '
';
}
$output .= "
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php (revision 8796)
+++ wp-includes/post.php (working copy)
@@ -1440,7 +1440,7 @@
}
// expected_slashed (everything!)
- $data = compact( array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'guid' ) );
+ $data = compact( array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'guid', 'groups' ) );
$data = apply_filters('wp_insert_post_data', $data, $postarr);
$data = stripslashes_deep( $data );
$where = array( 'ID' => $post_ID );
@@ -1513,6 +1513,74 @@
}
/**
+ * Insert a new gallery into the post.
+ *
+ * @since 2.7.0
+ *
+ * @param array $postarr post data
+ */
+function wp_new_gallery($postarr = array())
+{
+ if ( is_object($postarr) )
+ $postarr = get_object_vars($postarr);
+
+ // First, get all of the original fields
+ $post = wp_get_single_post($postarr['post_parent'], ARRAY_A);
+
+ // create new group
+ $last_group = split(",", $post['groups']);
+ $new_groups = array(count($last_group) => count($last_group));
+ $post_newgroup['groups'] = implode(",", array_merge($last_group, $new_groups));
+
+ // Merge old and new fields with new fields overwriting old ones.
+ $postarr = array_merge($post, $post_newgroup);
+
+ // update the post
+ wp_update_post($postarr);
+
+}
+
+/**
+ *
+ * Delete a gallery and reset the gallery numbers of those items inside the gallery.
+ *
+ * @since 2.7.0
+ *
+ * @param array $postarr post data
+ * @param int $gallery_number data
+ */
+function wp_delete_gallery($postarr = array(), $gallery_number)
+{
+ global $wpdb;
+
+ if ( is_object($postarr) )
+ $postarr = get_object_vars($postarr);
+
+ // First, get all of the original fields
+ $post = wp_get_single_post($postarr['post_parent'], ARRAY_A);
+
+ // groups
+ $current_groups = split(",", $post['groups']);
+ $i = 0;
+ foreach ($current_groups as $item => $value)
+ {
+ if ($gallery_number != $value) {
+ $new_groupnumber = $i;
+ $newgroup[] = $new_groupnumber;
+ $wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET group_number = %d WHERE post_parent = %d AND group_number = %d", $new_groupnumber, $post['ID'], $value));
+ $i++;
+ }
+ }
+ $new_groups_update = array("groups" => implode(",", $newgroup));
+
+ // Merge old and new fields with new fields overwriting old ones.
+ $postarr = array_merge($post, $new_groups_update);
+
+ // update the post
+ wp_update_post($postarr);
+}
+
+/**
* Update a post with new post data.
*
* The date does not have to be set for drafts. You can set the date and it will
@@ -2316,7 +2384,7 @@
$pinged = '';
// expected_slashed (everything!)
- $data = compact( array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid' ) );
+ $data = compact( array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid', 'group_number' ) );
$data = stripslashes_deep( $data );
if ( $update ) {