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

Timestamp:

08/19/2008 11:01:36 PM (17 years ago)

Author:

ryan

Message:

Merge cleanup

File:

• branches/crazyhorse/wp-admin/edit-attachment-rows.php (modified) (1 diff)

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

@@ -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
+            <td><strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>"><?php echo $title ?></a></strong>, <?php echo get_the_time(__('Y/m/d')); ?></td>
             <?php
         } else {