Ticket #6368: gallery-improvements-r7493-2.patch

wp-includes/shortcodes.php

@@ -118 +118 @@
-}
-
-function shortcode_atts($pairs, $atts) {
+        $atts = (array)$atts;
-        $out = array();
-        foreach($pairs as $name => $default) {
-                if ( array_key_exists($name, $atts) )

wp-includes/media.php

@@ -339 +339 @@
-        $output = apply_filters('post_gallery', '', $attr);
-        if ( $output != '' )
-                return $output;
+                
+        extract(shortcode_atts(array(
+                'orderby'    => 'menu_order ASC, ID ASC',
+                'id'         => $post->ID,
+                'itemtag'    => 'dl',
+                'icontag'    => 'dt',
+                'captiontag' => 'dd',
+                'columns'    => 3,
+                'size'       => 'thumbnail',
+        ), $attr));
-
-
+
+
+
-
-        if ( empty($attachments) )
-                return '';
@@ -348 +360 @@
-        if ( is_feed() ) {
-                $output = "\n";
-                foreach ( $attachments as $id => $attachment )
-'thumbnail'
+$size
-                return $output;
-        }
-
+        $listtag = tag_escape($listtag);
+        $itemtag = tag_escape($itemtag);
+        $captiontag = tag_escape($captiontag);
+        $columns = intval($columns);
+        
-        $output = apply_filters('gallery_style', "
-                <style type='text/css'>
-                        .gallery {
-                                margin: auto;
-                        }
- div
+-item
-                                float: left;
-                                margin-top: 10px;
-                                text-align: center;
@@ -365 +382 @@
-                        .gallery img {
-                                border: 2px solid #cfcfcf;
-                        }
+                        .gallery-caption {
+                                margin-left: 0;
+                        }
-                </style>
-                <!-- see gallery_shortcode() in wp-includes/media.php -->
-                <div class='gallery'>");
-
-        foreach ( $attachments as $id => $attachment ) {
-
+
+
-                $output .= "
-div
+{$icontag} class='gallery-icon'
-                                $link
-
-
+
+
+
+
+
+
+
+
+
-                        $output .= '<br style="clear: both" />';
-        }
-

wp-admin/includes/media.php

@@ -460 +460 @@
-function image_attachment_fields_to_edit($form_fields, $post) {
-        if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
-                $form_fields['post_title']['required'] = true;
-Descri
+Ca
-                $form_fields['post_excerpt']['helps'][] = __('Alternate text, e.g. "The Mona Lisa"');
-
-Long 
+
-
-                $thumb = wp_get_attachment_thumb_url($post->ID);
-
@@ -554 +554 @@
-                        'value'      => $edit_post->post_title,
-                ),
-                'post_excerpt' => array(
-Descri
+Ca
-                        'value'      => $edit_post->post_excerpt,
-                ),
-                'post_content' => array(
-Long d
+D
-                        'value'      => $edit_post->post_content,
-                        'input'      => 'textarea',
-                ),

wp-includes/formatting.php

@@ -1182 +1182 @@
-        $safe_text = wp_specialchars($text, true);
-        return apply_filters('attribute_escape', $safe_text, $text);
-}
+
+// Escape a HTML tag name
+function tag_escape($tag_name) {
+        $safe_tag = strtolower( preg_replace('[^a-zA-Z_:]', '', $tag_name) );
+        return apply_filters('tag_escape', $safe_tag, $tag_name);
+}
+
-/**
- * Escapes text for SQL LIKE special characters % and _
- *