Changeset 10495

Timestamp:

02/04/2009 03:12:24 PM (16 years ago)

Author:

azaozz

Message:

wp_get_attachment_link() variable upgrade, props noel, fixes #9036

Location:

trunk/wp-includes

Files:

• media.php (modified) (4 diffs)
• post-template.php (modified) (3 diffs)

trunk/wp-includes/media.php

@@ -690 +690 @@
  *
  * @since 2.5.0
- */
-function previous_image_link() {
-    adjacent_image_link(true);
+ * @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($size = 'thumbnail', $text = false) {
+    adjacent_image_link(true, $size, $text);
 }
 
@@ -699 +702 @@
  *
  * @since 2.5.0
- */
-function next_image_link() {
-    adjacent_image_link(false);
+ * @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($size = 'thumbnail', $text = false) {
+    adjacent_image_link(false, $size, $text);
 }
 
@@ -713 +719 @@
  * @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);
@@ -725 +731 @@
 
     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);
 }
 

trunk/wp-includes/post-template.php

@@ -909 +909 @@
  *
  * @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 );
@@ -925 +926 @@
 
     $post_title = attribute_escape($_post->post_title);
-
-    $link_text = wp_get_attachment_image($id, $size, $icon);
-    if ( !$link_text )
+    
+    if ( $text ) {
+        $link_text = attribute_escape($text);
+    } elseif ( ( is_int($size) && $size != 0 ) or ( is_string($size) && $size != 'none' ) or $size != false ) {
+        $link_text = wp_get_attachment_image($id, $size, $icon);
+    } else {
         $link_text = $_post->post_title;
-
+    }
+    
     return apply_filters( 'wp_get_attachment_link', "<a href='$url' title='$post_title'>$link_text</a>", $id, $size, $permalink, $icon );
 }
@@ -1192 +1197 @@
     $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>";