Ticket #6380: 6380-style.diff

wp-includes/media.php

@@ -340 +340 @@
         if ( $output != '' )
                 return $output;
                 
-        extract(shortcode_atts(array(
+        extract(shortcode_atts(apply_filters('gallery_defaults', array(
                 'orderby'    => 'menu_order ASC, ID ASC',
                 'id'         => $post->ID,
                 'itemtag'    => 'dl',
@@ -348 +348 @@
                 'captiontag' => 'dd',
                 'columns'    => 3,
                 'size'       => 'thumbnail',
-        ), $attr));
+        )), $attr));
 
         $id = intval($id);
         $orderby = addslashes($orderby);
@@ -369 +369 @@
         $captiontag = tag_escape($captiontag);
         $columns = intval($columns);
         $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
-        
-        $output = apply_filters('gallery_style', "
-                <style type='text/css'>
-                        .gallery {
-                                margin: auto;
-                        }
-                        .gallery-item {
-                                float: left;
-                                margin-top: 10px;
-                                text-align: center;
-                                width: {$itemwidth}%;                   }
-                        .gallery img {
-                                border: 2px solid #cfcfcf;
-                        }
-                        .gallery-caption {
-                                margin-left: 0;
-                        }
-                </style>
+
+        $output = "
                 <!-- see gallery_shortcode() in wp-includes/media.php -->
-                <div class='gallery'>");
+                <div class='gallery'>";
 
         foreach ( $attachments as $id => $attachment ) {
                 $link = wp_get_attachment_link($id, $size, true);
-                $output .= "<{$itemtag} class='gallery-item'>";
+                $output .= "<{$itemtag} class='gallery-item' style='width:{$itemwidth}%'>";
                 $output .= "
                         <{$icontag} class='gallery-icon'>
                                 $link
@@ -415 +399 @@
         return $output;
 }
 
+function gallery_style() {
+?>
+
+<style type='text/css'>
+        .gallery {
+                margin: auto;
+        }
+        .gallery-item {
+                float: left;
+                margin-top: 10px;
+                text-align: center;
+        }
+        .gallery img {
+                border: 2px solid #cfcfcf;
+        }
+        .gallery-caption {
+                margin-left: 0;
+        }
+</style>
+
+<?php
+}
+
+function gallery_scan() {
+        global $posts;
+
+        if ( !is_array($posts) )
+                return;
+
+        foreach ( $posts as $post ) {
+                if ( false !== strpos($post->post_content, '[gallery') ) {
+                        add_action('wp_head', 'gallery_style');
+                        break;
+                }
+        }
+}
+
+add_action('template_redirect', 'gallery_scan');
+
 function previous_image_link() {
         adjacent_image_link(true);
 }