Changeset 8620 for branches/crazyhorse/wp-admin/edit-attachment-rows.php

Timestamp:

08/11/2008 10:52:43 PM (16 years ago)

Author:

ryan

Message:

crazyhorse: merge with log:trunk@8334:8619 , merge arrows unresolved

File:

• branches/crazyhorse/wp-admin/edit-attachment-rows.php (modified) (2 diffs)

branches/crazyhorse/wp-admin/edit-attachment-rows.php

@@ -64 +64 @@
     case 'media':
         ?>
-        <td><strong><a href="media.php?action=edit&amp;attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br />
+        <td><strong><a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br />
         <?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?>
         <p>
@@ -128 +128 @@
             }
             ?>
+<<<<<<< .working
             <td><strong><a href="post.php?action=edit&amp;post=<?php echo $post->post_parent; ?>"><?php echo $title ?></a></strong>, <?php echo get_the_time(__('Y/m/d')); ?></td>
+=======
+            <td><strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>"><?php echo $title ?></a></strong></td>
+>>>>>>> .merge-right.r8619
             <?php
         } else {