Ticket #9036: media-links-upgrade.patch

wp-includes/post-template.php

@@ -908 +908 @@
  * @uses apply_filters() Calls 'wp_get_attachment_link' filter on HTML content with same parameters as function.
  *
  * @param int $id Optional. Post ID.
- * @param string $size Optional. Image size.
+ * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string.
  * @param bool $permalink Optional, default is false. Whether to add permalink to image.
  * @param bool $icon Optional, default is false. Whether to include icon.
+ * @param string $text Optional, default is false. If string, then will be link text.
  * @return string HTML content.
  */
-function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false) {
+function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false) {
         $id = intval($id);
         $_post = & get_post( $id );
 
@@ -924 +925 @@
                 $url = get_attachment_link($_post->ID);
 
         $post_title = attribute_escape($_post->post_title);
+                
+        if( ( is_int($size) && $size != 0 ) or ( is_string($size) && $size != 'none' ) or $size != false)
+                $link_text = wp_get_attachment_image($id, $size, $icon);
 
-        $link_text = wp_get_attachment_image($id, $size, $icon);
+        if($text)
+                $link_text = attribute_escape($text);
+                                
         if ( !$link_text )
                 $link_text = $_post->post_title;
 
@@ -1191 +1197 @@
         $autosavef = __( '%s [Autosave]' );
         $currentf  = __( '%s [Current Revision]' );
 
-        $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
+        $date = date_i18n( $datef, strtotime( $revision->post_modified_gmt . ' +0000' ) );
         if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
                 $date = "<a href='$link'>$date</a>";
 

wp-includes/media.php

@@ -689 +689 @@
  * Display previous image link that has the same post parent.
  *
  * @since 2.5.0
+ * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string. 0 or 'none' will default to post_title or $text;
+ * @param string $text Optional, default is false. If included, link will reflect $text variable.
+ * @return string HTML content.
  */
-function previous_image_link() {
-        adjacent_image_link(true);
+function previous_image_link($size = 'thumbnail', $text = false) {
+        adjacent_image_link(true, $size, $text);
 }
 
 /**
  * Display next image link that has the same post parent.
  *
  * @since 2.5.0
+ * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string. 0 or 'none' will default to post_title or $text;
+ * @param string $text Optional, default is false. If included, link will reflect $text variable.
+ * @return string HTML content.
  */
-function next_image_link() {
-        adjacent_image_link(false);
+function next_image_link($size = 'thumbnail', $text = false) {
+        adjacent_image_link(false, $size, $text);
 }
 
 /**
@@ -712 +718 @@
  *
  * @param bool $prev Optional. Default is true to display previous link, true for next.
  */
-function adjacent_image_link($prev = true) {
+function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) {
         global $post;
         $post = get_post($post);
         $attachments = array_values(get_children( array('post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID') ));
@@ -724 +730 @@
         $k = $prev ? $k - 1 : $k + 1;
 
         if ( isset($attachments[$k]) )
-                echo wp_get_attachment_link($attachments[$k]->ID, 'thumbnail', true);
+                echo wp_get_attachment_link($attachments[$k]->ID, $size, true, false, $text);
 }
 
 /**