Changeset 203588

Timestamp:

02/09/2010 10:08:59 PM (16 years ago)

Author:

achmafooma

Message:

Re-sync with WP 2.9 code for GSSTH 1.3

Location:

gallery-shortcode-style-to-head/trunk

Files:

• gallery-shortcode-style-to-head.php (modified) (7 diffs)
• readme.txt (modified) (2 diffs)

gallery-shortcode-style-to-head/trunk/gallery-shortcode-style-to-head.php

@@ -6 +6 @@
 Author: Scott Bradford
 Author URI: http://www.scottbradford.us/
-Version: 1.2
+Version: 1.3
 
         Copyright (c) 2008 Matt Martz (http://sivel.net) (original author)
-        Copyright (c) 2009 Scott Bradford (http://www.scottbradford.us) (current maintainer)
+        Copyright (c) 2009-2010 Scott Bradford (http://www.scottbradford.us) (current maintainer)
         
     Gallery Shortcode Style to Head is released under the GNU General Public License (GPL)
@@ -18 +18 @@
 // http://trac.wordpress.org/attachment/ticket/6380/6380-style.diff
 function gallery_shortcode_style_out ( $attr ) {
-    global $post;
+    global $post, $wp_locale;
+
+    static $instance = 0;
+    $instance++;
 
     // Allow plugins/themes to override the default gallery template.
-    $output = apply_filters ( 'post_gallery' , '' , $attr );
+    $output = apply_filters('post_gallery', '', $attr);
     if ( $output != '' )
         return $output;
@@ -32 +35 @@
     }
 
-    extract ( shortcode_atts ( apply_filters ( 'gallery_defaults' , array(
+    extract(shortcode_atts(array(
         'order'      => 'ASC',
         'orderby'    => 'menu_order ID',
@@ -41 +44 @@
         'columns'    => 3,
         'size'       => 'thumbnail',
-    ) ) , $attr ) );
+        'include'    => '',
+        'exclude'    => ''
+    ), $attr));
 
-    $id = intval ( $id );
-    $attachments = get_children ( array ( 'post_parent' => $id , 'post_status' => 'inherit' , 'post_type' => 'attachment' , 'post_mime_type' => 'image' , 'order' => $order , 'orderby' => $orderby ) );
+    $id = intval($id);
+    if ( 'RAND' == $order )
+        $orderby = 'none';
 
-    if ( empty( $attachments ) )
+    if ( !empty($include) ) {
+        $include = preg_replace( '/[^0-9,]+/', '', $include );
+        $_attachments = get_posts( array('include' => $include, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
+
+        $attachments = array();
+        foreach ( $_attachments as $key => $val ) {
+            $attachments[$val->ID] = $_attachments[$key];
+        }
+    } elseif ( !empty($exclude) ) {
+        $exclude = preg_replace( '/[^0-9,]+/', '', $exclude );
+        $attachments = get_children( array('post_parent' => $id, 'exclude' => $exclude, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
+    } else {
+        $attachments = get_children( array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
+    }
+
+    if ( empty($attachments) )
         return '';
 
     if ( is_feed() ) {
         $output = "\n";
-        foreach ( $attachments as $id => $attachment )
-            $output .= wp_get_attachment_link( $id, $size, false ) . "\n";
+        foreach ( $attachments as $att_id => $attachment )
+            $output .= wp_get_attachment_link($att_id, $size, true) . "\n";
         return $output;
     }
 
-    $listtag = tag_escape ( $listtag );
-    $itemtag = tag_escape ( $itemtag );
-    $captiontag = tag_escape ( $captiontag );
-    $columns = intval ( $columns );
-    $itemwidth = $columns > 0 ? floor ( 100/$columns ) : 100;
+    $itemtag = tag_escape($itemtag);
+    $captiontag = tag_escape($captiontag);
+    $columns = intval($columns);
+    $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
     
-    $output = "
-        <!-- see gallery_shortcode() in wp-includes/media.php -->
-        <div class='gallery'>";
+    $selector = "gallery-{$instance}";
 
+    $output = "<!-- see gallery_shortcode() in wp-includes/media.php -->
+        <div id='$selector' class='gallery galleryid-{$id}'>";
+
+    $i = 0;
     foreach ( $attachments as $id => $attachment ) {
         $link = isset($attr['link']) && 'file' == $attr['link'] ? wp_get_attachment_link($id, $size, false, false) : wp_get_attachment_link($id, $size, true, false);
+
         $output .= "<{$itemtag} class='gallery-item' style='width:{$itemwidth}%'>";
         $output .= "
@@ -73 +96 @@
                 $link
             </{$icontag}>";
-        if ( $captiontag && trim ( $attachment->post_excerpt ) ) {
+        if ( $captiontag && trim($attachment->post_excerpt) ) {
             $output .= "
                 <{$captiontag} class='gallery-caption'>
@@ -95 +118 @@
 function gallery_style () { 
 
-$output = apply_filters('gallery_style', "
-<!-- [gallery] shortcode style -->
+$float = $wp_locale->text_direction == 'rtl' ? 'right' : 'left'; 
+$output = apply_filters('gallery_style', "<!-- [gallery] shortcode style -->
 <style type='text/css'>
-       .gallery {
-                margin: auto;
-        }
-        .gallery-item {
-                float: left;
-                margin-top: 10px;
-                text-align: center;
+    .gallery {
+        margin: auto;
     }
-        .gallery img {
-                border: 2px solid #cfcfcf;
-        }
-        .gallery-caption {
-                margin-left: 0;
-        }
-</style>
-");
+    .gallery .gallery-item {
+        float: {$float};
+        margin-top: 10px;
+        text-align: center;
+    }
+    .gallery img {
+        border: 2px solid #cfcfcf;
+    }
+    .gallery-caption {
+        margin-left: 0;
+    }
+</style>");
  
 echo $output;
@@ -136 +158 @@
 // Tell WordPress what to do
 remove_shortcode ( 'gallery_shortcode' );           // Remove included WordPress [gallery] shortcode function
-add_shortcode ( 'gallery' , 'gallery_shortcode_style_out' );    // Add not [gallery] shortcode function
+add_shortcode ( 'gallery' , 'gallery_shortcode_style_out' );    // Add new [gallery] shortcode function
 add_action ( 'template_redirect' , 'gallery_scan' );        // Add look ahead for [gallery] shortcode
 ?>

gallery-shortcode-style-to-head/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 2.6
 Tested up to: 2.9
-Stable tag: 1.2
+Stable tag: 1.3
 
 Moves the gallery shortcode styles to the head so it doesn't break XHTML
@@ -49 +49 @@
 == Changelog ==
 
-= 1.2.1 (2009-12-16): =
-* Iterated the supported WordPress version to 2.9.
+= 1.3 (2010-02-09): =
+* Re-Sync with WordPress 2.9 gallery code for support of the new 'include' and 'exclude' options.
 
 = 1.2 (2009-09-20): =